diff --git a/OpenMetaverse.Rendering.GPL/Face.cs b/OpenMetaverse.Rendering.GPL/Face.cs index 973b3075..a4eec4aa 100644 --- a/OpenMetaverse.Rendering.GPL/Face.cs +++ b/OpenMetaverse.Rendering.GPL/Face.cs @@ -87,7 +87,7 @@ namespace OpenMetaverse.Rendering baseVert.Normal = ((corners[1].Position - corners[0].Position) % (corners[2].Position - corners[1].Position)); - baseVert.Normal = LLVector3.Norm(baseVert.Normal); + baseVert.Normal = Vector3.Norm(baseVert.Normal); if ((face.Mask & FaceMask.Top) != 0) { @@ -96,7 +96,7 @@ namespace OpenMetaverse.Rendering else { // Swap the UVs on the U(X) axis for top face - LLVector2 swap; + Vector2 swap; swap = corners[0].TexCoord; corners[0].TexCoord = corners[3].TexCoord; @@ -173,7 +173,7 @@ namespace OpenMetaverse.Rendering int maxS = profile.Positions.Count; int maxT = path.Points.Count; - face.Center = LLVector3.Zero; + face.Center = Vector3.Zero; int offset = 0; if ((face.Mask & FaceMask.Top) != 0) @@ -183,9 +183,9 @@ namespace OpenMetaverse.Rendering // Figure out the normal, assume all caps are flat faces. // Cross product to get normals - LLVector2 cuv; - LLVector2 minUV = LLVector2.Zero; - LLVector2 maxUV = LLVector2.Zero; + Vector2 cuv; + Vector2 minUV = Vector2.Zero; + Vector2 maxUV = Vector2.Zero; // Copy the vertices into the array for (i = 0; i < numVertices; i++) @@ -223,16 +223,16 @@ namespace OpenMetaverse.Rendering face.Center = (face.MinExtent + face.MaxExtent) * 0.5f; cuv = (minUV + maxUV) * 0.5f; - LLVector3 binormal = CalcBinormalFromTriangle( + Vector3 binormal = CalcBinormalFromTriangle( face.Center, cuv, face.Vertices[0].Position, face.Vertices[0].TexCoord, face.Vertices[1].Position, face.Vertices[1].TexCoord); - binormal = LLVector3.Norm(binormal); + binormal = Vector3.Norm(binormal); - LLVector3 d0 = face.Center - face.Vertices[0].Position; - LLVector3 d1 = face.Center - face.Vertices[1].Position; - LLVector3 normal = ((face.Mask & FaceMask.Top) != 0) ? (d0 % d1) : (d1 % d0); - normal = LLVector3.Norm(normal); + Vector3 d0 = face.Center - face.Vertices[0].Position; + Vector3 d1 = face.Center - face.Vertices[1].Position; + Vector3 normal = ((face.Mask & FaceMask.Top) != 0) ? (d0 % d1) : (d1 % d0); + normal = Vector3.Norm(normal); // If not hollow and not open create a center point in the cap if ((face.Mask & FaceMask.Hollow) == 0 && (face.Mask & FaceMask.Open) == 0) @@ -339,7 +339,7 @@ namespace OpenMetaverse.Rendering int numVertices = face.NumS * face.NumT; int numIndices = (face.NumS - 1) * (face.NumT - 1) * 6; - face.Center = LLVector3.Zero; + face.Center = Vector3.Zero; int beginSTex = (int)Math.Floor(profile.Positions[face.BeginS].Z); int numS = @@ -380,9 +380,9 @@ namespace OpenMetaverse.Rendering Vertex vertex = new Vertex(); vertex.Position = primVertices[i].Position; - vertex.TexCoord = new LLVector2(ss, tt); - vertex.Normal = LLVector3.Zero; - vertex.Binormal = LLVector3.Zero; + vertex.TexCoord = new Vector2(ss, tt); + vertex.Normal = Vector3.Zero; + vertex.Binormal = Vector3.Zero; if (curVertex == 0) face.MinExtent = face.MaxExtent = primVertices[i].Position; @@ -416,9 +416,9 @@ namespace OpenMetaverse.Rendering Vertex vertex = new Vertex(); vertex.Position = primVertices[i].Position; - vertex.TexCoord = new LLVector2(ss, tt); - vertex.Normal = LLVector3.Zero; - vertex.Binormal = LLVector3.Zero; + vertex.TexCoord = new Vector2(ss, tt); + vertex.Normal = Vector3.Zero; + vertex.Binormal = Vector3.Zero; UpdateMinMax(ref face, vertex.Position); @@ -485,10 +485,10 @@ namespace OpenMetaverse.Rendering Vertex v2 = face.Vertices[face.Indices[i * 3 + 2]]; // Calculate triangle normal - LLVector3 norm = (v0.Position - v1.Position) % (v0.Position - v2.Position); + Vector3 norm = (v0.Position - v1.Position) % (v0.Position - v2.Position); // Calculate binormal - LLVector3 binorm = CalcBinormalFromTriangle(v0.Position, v0.TexCoord, v1.Position, v1.TexCoord, + Vector3 binorm = CalcBinormalFromTriangle(v0.Position, v0.TexCoord, v1.Position, v1.TexCoord, v2.Position, v2.TexCoord); // Add triangle normal to vertices @@ -519,12 +519,12 @@ namespace OpenMetaverse.Rendering // Adjust normals based on wrapping and stitching bool sBottomConverges = ( - LLVector3.MagSquared( + Vector3.MagSquared( face.Vertices[0].Position - face.Vertices[face.NumS * (face.NumT - 2)].Position ) < 0.000001f); bool sTopConverges = ( - LLVector3.MagSquared( + Vector3.MagSquared( face.Vertices[face.NumS - 1].Position - face.Vertices[face.NumS * (face.NumT - 2) + face.NumS - 1].Position @@ -538,7 +538,7 @@ namespace OpenMetaverse.Rendering // Wrap normals on T for (i = 0; i < face.NumS; i++) { - LLVector3 norm = face.Vertices[i].Normal + face.Vertices[face.NumS * (face.NumT - 1) + i].Normal; + Vector3 norm = face.Vertices[i].Normal + face.Vertices[face.NumS * (face.NumT - 1) + i].Normal; Vertex vertex = face.Vertices[i]; vertex.Normal = norm; @@ -555,7 +555,7 @@ namespace OpenMetaverse.Rendering // Wrap normals on S for (i = 0; i < face.NumT; i++) { - LLVector3 norm = face.Vertices[face.NumS * i].Normal + face.Vertices[face.NumS * i + face.NumS - 1].Normal; + Vector3 norm = face.Vertices[face.NumS * i].Normal + face.Vertices[face.NumS * i + face.NumS - 1].Normal; Vertex vertex = face.Vertices[face.NumS * i]; vertex.Normal = norm; @@ -573,7 +573,7 @@ namespace OpenMetaverse.Rendering if (sBottomConverges) { // All lower S have same normal - LLVector3 unitX = new LLVector3(1f, 0f, 0f); + Vector3 unitX = new Vector3(1f, 0f, 0f); for (i = 0; i < face.NumT; i++) { @@ -586,7 +586,7 @@ namespace OpenMetaverse.Rendering if (sTopConverges) { // All upper S have same normal - LLVector3 negUnitX = new LLVector3(-1f, 0f, 0f); + Vector3 negUnitX = new Vector3(-1f, 0f, 0f); for (i = 0; i < face.NumT; i++) { @@ -606,8 +606,8 @@ namespace OpenMetaverse.Rendering for (i = 0; i < face.Vertices.Count; i++) { Vertex vertex = face.Vertices[i]; - vertex.Normal = LLVector3.Norm(vertex.Normal); - vertex.Binormal = LLVector3.Norm(vertex.Binormal); + vertex.Normal = Vector3.Norm(vertex.Normal); + vertex.Binormal = Vector3.Norm(vertex.Binormal); face.Vertices[i] = vertex; } } @@ -620,7 +620,7 @@ namespace OpenMetaverse.Rendering vout.Binormal = v0.Binormal; } - private static void UpdateMinMax(ref Face face, LLVector3 position) + private static void UpdateMinMax(ref Face face, Vector3 position) { if (face.MinExtent.X > position.X) face.MinExtent.X = position.X; @@ -637,7 +637,7 @@ namespace OpenMetaverse.Rendering face.MaxExtent.Z = position.Z; } - private static void UpdateMinMax(ref LLVector2 min, ref LLVector2 max, LLVector2 current) + private static void UpdateMinMax(ref Vector2 min, ref Vector2 max, Vector2 current) { if (min.X > current.X) min.X = current.X; @@ -650,35 +650,35 @@ namespace OpenMetaverse.Rendering max.Y = current.Y; } - private static LLVector3 CalcBinormalFromTriangle(LLVector3 pos0, LLVector2 tex0, LLVector3 pos1, - LLVector2 tex1, LLVector3 pos2, LLVector2 tex2) + private static Vector3 CalcBinormalFromTriangle(Vector3 pos0, Vector2 tex0, Vector3 pos1, + Vector2 tex1, Vector3 pos2, Vector2 tex2) { - LLVector3 rx0 = new LLVector3(pos0.X, tex0.X, tex0.Y); - LLVector3 rx1 = new LLVector3(pos1.X, tex1.X, tex1.Y); - LLVector3 rx2 = new LLVector3(pos2.X, tex2.X, tex2.Y); + Vector3 rx0 = new Vector3(pos0.X, tex0.X, tex0.Y); + Vector3 rx1 = new Vector3(pos1.X, tex1.X, tex1.Y); + Vector3 rx2 = new Vector3(pos2.X, tex2.X, tex2.Y); - LLVector3 ry0 = new LLVector3(pos0.Y, tex0.X, tex0.Y); - LLVector3 ry1 = new LLVector3(pos1.Y, tex1.X, tex1.Y); - LLVector3 ry2 = new LLVector3(pos2.Y, tex2.X, tex2.Y); + Vector3 ry0 = new Vector3(pos0.Y, tex0.X, tex0.Y); + Vector3 ry1 = new Vector3(pos1.Y, tex1.X, tex1.Y); + Vector3 ry2 = new Vector3(pos2.Y, tex2.X, tex2.Y); - LLVector3 rz0 = new LLVector3(pos0.Z, tex0.X, tex0.Y); - LLVector3 rz1 = new LLVector3(pos1.Z, tex1.X, tex1.Y); - LLVector3 rz2 = new LLVector3(pos2.Z, tex2.X, tex2.Y); + Vector3 rz0 = new Vector3(pos0.Z, tex0.X, tex0.Y); + Vector3 rz1 = new Vector3(pos1.Z, tex1.X, tex1.Y); + Vector3 rz2 = new Vector3(pos2.Z, tex2.X, tex2.Y); - LLVector3 r0 = (rx0 - rx1) % (rx0 - rx2); - LLVector3 r1 = (ry0 - ry1) % (ry0 - ry2); - LLVector3 r2 = (rz0 - rz1) % (rz0 - rz2); + Vector3 r0 = (rx0 - rx1) % (rx0 - rx2); + Vector3 r1 = (ry0 - ry1) % (ry0 - ry2); + Vector3 r2 = (rz0 - rz1) % (rz0 - rz2); if (r0.X != 0f && r1.X != 0f && r2.X != 0f) { - return new LLVector3( + return new Vector3( -r0.Z / r0.X, -r1.Z / r1.X, -r2.Z / r2.X); } else { - return new LLVector3(0f, 1f, 0f); + return new Vector3(0f, 1f, 0f); } } } diff --git a/OpenMetaverse.Rendering.GPL/GPLRenderer.cs b/OpenMetaverse.Rendering.GPL/GPLRenderer.cs index 50f42967..495eaf0b 100644 --- a/OpenMetaverse.Rendering.GPL/GPLRenderer.cs +++ b/OpenMetaverse.Rendering.GPL/GPLRenderer.cs @@ -159,9 +159,9 @@ namespace OpenMetaverse.Rendering // Run along the path for (int s = 0; s < sizeS; ++s) { - LLVector2 scale = path.Points[s].Scale; - LLQuaternion rot = path.Points[s].Rotation; - LLVector3 pos = path.Points[s].Position; + Vector2 scale = path.Points[s].Scale; + Quaternion rot = path.Points[s].Rotation; + Vector3 pos = path.Points[s].Position; // Run along the profile for (int t = 0; t < sizeT; ++t) @@ -503,7 +503,7 @@ namespace OpenMetaverse.Rendering for (i = 0; i < profile.Positions.Count; i++) { // Scale by 4 to generate proper tex coords - LLVector3 point = profile.Positions[i]; + Vector3 point = profile.Positions[i]; point.Z *= 4f; profile.Positions[i] = point; } @@ -556,7 +556,7 @@ namespace OpenMetaverse.Rendering for (i = 0; i < profile.Positions.Count; i++) { // Scale by 3 to generate proper tex coords - LLVector3 point = profile.Positions[i]; + Vector3 point = profile.Positions[i]; point.Z *= 3f; profile.Positions[i] = point; } @@ -694,7 +694,7 @@ namespace OpenMetaverse.Rendering else if (hollow == 0f) { profile.Open = false; - LLVector3 first = profile.Positions[0]; + Vector3 first = profile.Positions[0]; profile.Positions.Add(first); } } @@ -735,7 +735,7 @@ namespace OpenMetaverse.Rendering // Apply the hollow scale modifier for (int i = 0; i < hole.Positions.Count; i++) { - LLVector3 point = hole.Positions[i]; + Vector3 point = hole.Positions[i]; point *= boxHollow; hole.Positions[i] = point; } @@ -770,15 +770,15 @@ namespace OpenMetaverse.Rendering step = 1f / (np - 1); - LLVector2 startScale = prim.PathBeginScale; - LLVector2 endScale = prim.PathEndScale; + Vector2 startScale = prim.PathBeginScale; + Vector2 endScale = prim.PathEndScale; for (int i = 0; i < np; i++) { PathPoint point = new PathPoint(); float t = Helpers.Lerp(prim.PathBegin, prim.PathEnd, (float)i * step); - point.Position = new LLVector3( + point.Position = new Vector3( Helpers.Lerp(0, prim.PathShearX, t), Helpers.Lerp(0, prim.PathShearY, t), t - 0.5f); @@ -846,12 +846,12 @@ namespace OpenMetaverse.Rendering { // Create a polygon by starting at (1, 0) and proceeding counterclockwise generating vectors Profile profile = new Profile(); - profile.Positions = new List(); + profile.Positions = new List(); profile.Faces = new List(); float scale = 0.5f; float t, tStep, tFirst, tFraction, ang, angStep; - LLVector3 pt1, pt2; + Vector3 pt1, pt2; float begin = prim.ProfileBegin; float end = prim.ProfileEnd; @@ -871,20 +871,20 @@ namespace OpenMetaverse.Rendering // Starting t and ang values for the first face t = tFirst; ang = 2f * F_PI * (t * angScale + offset); - pt1 = new LLVector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); + pt1 = new Vector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); // Increment to the next point. // pt2 is the end point on the fractional face t += tStep; ang += angStep; - pt2 = new LLVector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); + pt2 = new Vector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); tFraction = (begin - tFirst) * sides; // Only use if it's not almost exactly on an edge if (tFraction < 0.9999f) { - LLVector3 newPt = Helpers.Lerp(pt1, pt2, tFraction); + Vector3 newPt = Helpers.Lerp(pt1, pt2, tFraction); float ptX = newPt.X; if (ptX < profile.MinX) @@ -899,7 +899,7 @@ namespace OpenMetaverse.Rendering while (t < end) { // Iterate through all the integer steps of t. - pt1 = new LLVector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); + pt1 = new Vector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); float ptX = pt1.X; if (ptX < profile.MinX) @@ -915,13 +915,13 @@ namespace OpenMetaverse.Rendering // pt1 is the first point on the fractional face // pt2 is the end point on the fractional face - pt2 = new LLVector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); + pt2 = new Vector3((float)Math.Cos(ang) * scale, (float)Math.Sin(ang) * scale, t); // Find the fraction that we need to add to the end point tFraction = (end - (t - tStep)) * sides; if (tFraction > 0.0001f) { - LLVector3 newPt = Helpers.Lerp(pt1, pt2, tFraction); + Vector3 newPt = Helpers.Lerp(pt1, pt2, tFraction); float ptX = newPt.X; if (ptX < profile.MinX) @@ -944,7 +944,7 @@ namespace OpenMetaverse.Rendering // Put center point if not hollow if (prim.ProfileHollow == 0f) - profile.Positions.Add(LLVector3.Zero); + profile.Positions.Add(Vector3.Zero); } else { @@ -1018,10 +1018,10 @@ namespace OpenMetaverse.Rendering (Math.Abs(radiusEnd - radiusStart) > 0.001d)); float ang, c, s; - LLQuaternion twist = LLQuaternion.Identity; - LLQuaternion qang = LLQuaternion.Identity; + Quaternion twist = Quaternion.Identity; + Quaternion qang = Quaternion.Identity; PathPoint point; - LLVector3 pathAxis = new LLVector3(1f, 0f, 0f); + Vector3 pathAxis = new Vector3(1f, 0f, 0f); float twistBegin = prim.PathTwistBegin * twistScale; float twistEnd = prim.PathTwist * twistScale; @@ -1034,7 +1034,7 @@ namespace OpenMetaverse.Rendering c = (float)Math.Cos(ang) * Helpers.Lerp(radiusStart, radiusEnd, t); point = new PathPoint(); - point.Position = new LLVector3( + point.Position = new Vector3( 0 + Helpers.Lerp(0, prim.PathShearX, s) + 0 + Helpers.Lerp(-skew, skew, t) * 0.5f, c + Helpers.Lerp(0, prim.PathShearY, s), @@ -1064,7 +1064,7 @@ namespace OpenMetaverse.Rendering c = (float)Math.Cos(ang) * Helpers.Lerp(radiusStart, radiusEnd, t); s = (float)Math.Sin(ang) * Helpers.Lerp(radiusStart, radiusEnd, t); - point.Position = new LLVector3( + point.Position = new Vector3( 0 + Helpers.Lerp(0, prim.PathShearX, s) + 0 + Helpers.Lerp(-skew, skew, t) * 0.5f, c + Helpers.Lerp(0, prim.PathShearY, s), @@ -1091,7 +1091,7 @@ namespace OpenMetaverse.Rendering c = (float)Math.Cos(ang) * Helpers.Lerp(radiusStart, radiusEnd, t); s = (float)Math.Sin(ang) * Helpers.Lerp(radiusStart, radiusEnd, t); - point.Position = new LLVector3( + point.Position = new Vector3( Helpers.Lerp(0, prim.PathShearX, s) + Helpers.Lerp(-skew, skew, t) * 0.5f, c + Helpers.Lerp(0, prim.PathShearY, s), s); @@ -1138,10 +1138,10 @@ namespace OpenMetaverse.Rendering { // Use the profile points instead of the mesh, since you want // the un-transformed profile distances - LLVector3 p1 = profilePoints.Positions[pt1]; - LLVector3 p2 = profilePoints.Positions[pt2]; - LLVector3 pa = profilePoints.Positions[pt1 + 1]; - LLVector3 pb = profilePoints.Positions[pt2 - 1]; + Vector3 p1 = profilePoints.Positions[pt1]; + Vector3 p2 = profilePoints.Positions[pt2]; + Vector3 pa = profilePoints.Positions[pt1 + 1]; + Vector3 pb = profilePoints.Positions[pt2 - 1]; p1.Z = 0f; p2.Z = 0f; @@ -1194,10 +1194,10 @@ namespace OpenMetaverse.Rendering } else { - LLVector3 d1 = p1 - pa; - LLVector3 d2 = p2 - pb; + Vector3 d1 = p1 - pa; + Vector3 d2 = p2 - pb; - if (LLVector3.MagSquared(d1) < LLVector3.MagSquared(d2)) + if (Vector3.MagSquared(d1) < Vector3.MagSquared(d2)) use_tri_1a2 = true; else use_tri_1a2 = false; diff --git a/OpenMetaverse.Rendering.GPL/Texture.cs b/OpenMetaverse.Rendering.GPL/Texture.cs index 60670f9c..fe03a29b 100644 --- a/OpenMetaverse.Rendering.GPL/Texture.cs +++ b/OpenMetaverse.Rendering.GPL/Texture.cs @@ -23,7 +23,7 @@ namespace OpenMetaverse.Rendering { public partial class GPLRenderer : IRendering { - public void TransformTexCoords(List vertices, LLVector3 center, LLObject.TextureEntryFace teFace) + public void TransformTexCoords(List vertices, Vector3 center, LLObject.TextureEntryFace teFace) { float r = teFace.Rotation; float os = teFace.OffsetU; @@ -43,7 +43,7 @@ namespace OpenMetaverse.Rendering } else if (teFace.TexMapType == MappingType.Planar) { - LLVector3 vec = vertex.Position; + Vector3 vec = vertex.Position; vec.X *= vec.X; vec.Y *= vec.Y; vec.Z *= vec.Z; @@ -55,7 +55,7 @@ namespace OpenMetaverse.Rendering } } - private static void TransformTexCoord(ref LLVector2 texCoord, float cosAng, float sinAng, float offsetS, + private static void TransformTexCoord(ref Vector2 texCoord, float cosAng, float sinAng, float offsetS, float offsetT, float magS, float magT) { float s = texCoord.X; @@ -82,14 +82,14 @@ namespace OpenMetaverse.Rendering texCoord.Y = t; } - private static void TransformPlanarTexCoord(ref LLVector2 texCoord, Vertex vertex, LLVector3 center, - LLVector3 vec) + private static void TransformPlanarTexCoord(ref Vector2 texCoord, Vertex vertex, Vector3 center, + Vector3 vec) { - LLVector3 binormal; - float d = LLVector3.Dot(vertex.Normal, LLVector3.Fwd); + Vector3 binormal; + float d = Vector3.Dot(vertex.Normal, Vector3.Fwd); if (d >= 0.5f || d <= -0.5f) { - binormal = new LLVector3(0f, 1f, 0f); + binormal = new Vector3(0f, 1f, 0f); if (vertex.Normal.X < 0f) { @@ -100,7 +100,7 @@ namespace OpenMetaverse.Rendering } else { - binormal = new LLVector3(1f, 0f, 0f); + binormal = new Vector3(1f, 0f, 0f); if (vertex.Normal.Y > 0f) { @@ -110,10 +110,10 @@ namespace OpenMetaverse.Rendering } } - LLVector3 tangent = binormal % vertex.Normal; + Vector3 tangent = binormal % vertex.Normal; - texCoord.Y = -(LLVector3.Dot(tangent, vec) * 2f - 0.5f); - texCoord.X = 1f + (LLVector3.Dot(binormal, vec) * 2f - 0.5f); + texCoord.Y = -(Vector3.Dot(tangent, vec) * 2f - 0.5f); + texCoord.X = 1f + (Vector3.Dot(binormal, vec) * 2f - 0.5f); } } } diff --git a/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs b/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs index 7aba9b22..9c33b0b9 100644 --- a/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs +++ b/OpenMetaverse.Rendering.Simple/SimpleRenderer.cs @@ -61,7 +61,7 @@ namespace OpenMetaverse.Rendering return mesh; } - public void TransformTexCoords(List vertices, LLVector3 center, LLObject.TextureEntryFace teFace) + public void TransformTexCoords(List vertices, Vector3 center, LLObject.TextureEntryFace teFace) { // Lalala... } @@ -77,7 +77,7 @@ namespace OpenMetaverse.Rendering { Profile profile = new Profile(); profile.Faces = new List(); - profile.Positions = new List(); + profile.Positions = new List(); return profile; } @@ -88,25 +88,25 @@ namespace OpenMetaverse.Rendering Vertex v = new Vertex(); // FIXME: Implement these - v.Binormal = LLVector3.Zero; - v.Normal = LLVector3.Zero; - v.TexCoord = LLVector2.Zero; + v.Binormal = Vector3.Zero; + v.Normal = Vector3.Zero; + v.TexCoord = Vector2.Zero; - v.Position = new LLVector3(0.5f, 0.5f, -0.5f); + v.Position = new Vector3(0.5f, 0.5f, -0.5f); vertices.Add(v); - v.Position = new LLVector3(0.5f, -0.5f, -0.5f); + v.Position = new Vector3(0.5f, -0.5f, -0.5f); vertices.Add(v); - v.Position = new LLVector3(-0.5f, -0.5f, -0.5f); + v.Position = new Vector3(-0.5f, -0.5f, -0.5f); vertices.Add(v); - v.Position = new LLVector3(-0.5f, 0.5f, -0.5f); + v.Position = new Vector3(-0.5f, 0.5f, -0.5f); vertices.Add(v); - v.Position = new LLVector3(0.5f, 0.5f, 0.5f); + v.Position = new Vector3(0.5f, 0.5f, 0.5f); vertices.Add(v); - v.Position = new LLVector3(0.5f, -0.5f, 0.5f); + v.Position = new Vector3(0.5f, -0.5f, 0.5f); vertices.Add(v); - v.Position = new LLVector3(-0.5f, -0.5f, 0.5f); + v.Position = new Vector3(-0.5f, -0.5f, 0.5f); vertices.Add(v); - v.Position = new LLVector3(-0.5f, 0.5f, 0.5f); + v.Position = new Vector3(-0.5f, 0.5f, 0.5f); vertices.Add(v); return vertices; diff --git a/OpenMetaverse.Tests/BinaryLLSDTests.cs b/OpenMetaverse.Tests/BinaryLLSDTests.cs index 08126671..724d2419 100644 --- a/OpenMetaverse.Tests/BinaryLLSDTests.cs +++ b/OpenMetaverse.Tests/BinaryLLSDTests.cs @@ -224,11 +224,11 @@ namespace OpenMetaverse.Tests [Test()] public void SerializeUUID() { - LLSD llsdAUUID = LLSD.FromUUID(new LLUUID("97f4aeca-88a1-42a1-b385-b97b18abb255")); + LLSD llsdAUUID = LLSD.FromUUID(new UUID("97f4aeca-88a1-42a1-b385-b97b18abb255")); byte[] binaryAUUIDSerialized = LLSDParser.SerializeBinary(llsdAUUID); Assert.AreEqual(binaryAUUID, binaryAUUIDSerialized); - LLSD llsdZeroUUID = LLSD.FromUUID(new LLUUID("00000000-0000-0000-0000-000000000000")); + LLSD llsdZeroUUID = LLSD.FromUUID(new UUID("00000000-0000-0000-0000-000000000000")); byte[] binaryZeroUUIDSerialized = LLSDParser.SerializeBinary(llsdZeroUUID); Assert.AreEqual(binaryZeroUUID, binaryZeroUUIDSerialized); } diff --git a/OpenMetaverse.Tests/NetworkTests.cs b/OpenMetaverse.Tests/NetworkTests.cs index 1814e029..c770acec 100644 --- a/OpenMetaverse.Tests/NetworkTests.cs +++ b/OpenMetaverse.Tests/NetworkTests.cs @@ -45,7 +45,7 @@ namespace OpenMetaverse.Tests ulong HooperRegionHandle = 1106108697797888; bool DetectedObject = false; - LLUUID LookupKey1 = new LLUUID("25472683cb324516904a6cd0ecabf128"); + UUID LookupKey1 = new UUID("25472683cb324516904a6cd0ecabf128"); //string LookupName1 = "Bot Ringo"; public NetworkTests() @@ -115,7 +115,7 @@ namespace OpenMetaverse.Tests // test in-sim teleports Assert.IsTrue(CapsQueueRunning(), "CAPS Event queue is not running in " + Client.Network.CurrentSim.Name); string localSimName = Client.Network.CurrentSim.Name; - Assert.IsTrue(Client.Self.Teleport(Client.Network.CurrentSim.Handle, new LLVector3(121, 13, 41)), + Assert.IsTrue(Client.Self.Teleport(Client.Network.CurrentSim.Handle, new Vector3(121, 13, 41)), "Teleport In-Sim Failed " + Client.Network.CurrentSim.Name); //// Assert that we really did make it to our scheduled destination @@ -124,7 +124,7 @@ namespace OpenMetaverse.Tests ". Possibly region full or offline?"); Assert.IsTrue(CapsQueueRunning(), "CAPS Event queue is not running in " + Client.Network.CurrentSim.Name); - Assert.IsTrue(Client.Self.Teleport(DoreRegionHandle, new LLVector3(128, 128, 32)), + Assert.IsTrue(Client.Self.Teleport(DoreRegionHandle, new Vector3(128, 128, 32)), "Teleport to Dore failed"); // Assert that we really did make it to our scheduled destination @@ -133,7 +133,7 @@ namespace OpenMetaverse.Tests ". Possibly region full or offline?"); Assert.IsTrue(CapsQueueRunning(), "CAPS Event queue is not running in " + Client.Network.CurrentSim.Name); - Assert.IsTrue(Client.Self.Teleport(HooperRegionHandle, new LLVector3(179, 18, 32)), + Assert.IsTrue(Client.Self.Teleport(HooperRegionHandle, new Vector3(179, 18, 32)), "Teleport to Hooper failed"); // Assert that we really did make it to our scheduled destination diff --git a/OpenMetaverse.Tests/NotationLLSDTests.cs b/OpenMetaverse.Tests/NotationLLSDTests.cs index d7bf8d8c..7655564b 100644 --- a/OpenMetaverse.Tests/NotationLLSDTests.cs +++ b/OpenMetaverse.Tests/NotationLLSDTests.cs @@ -285,13 +285,13 @@ namespace OpenMetaverse.Tests [Test()] public void SerializeUUID() { - LLSD llsdOne = LLSD.FromUUID(new LLUUID("97f4aeca-88a1-42a1-b385-b97b18abb255")); + LLSD llsdOne = LLSD.FromUUID(new UUID("97f4aeca-88a1-42a1-b385-b97b18abb255")); string sOne = LLSDParser.SerializeNotation(llsdOne); LLSD llsdOneDS = LLSDParser.DeserializeNotation(sOne); Assert.AreEqual(LLSDType.UUID, llsdOneDS.Type); Assert.AreEqual("97f4aeca-88a1-42a1-b385-b97b18abb255", llsdOneDS.AsString()); - LLSD llsdTwo = LLSD.FromUUID(new LLUUID("00000000-0000-0000-0000-000000000000")); + LLSD llsdTwo = LLSD.FromUUID(new UUID("00000000-0000-0000-0000-000000000000")); string sTwo = LLSDParser.SerializeNotation(llsdTwo); LLSD llsdTwoDS = LLSDParser.DeserializeNotation(sTwo); Assert.AreEqual(LLSDType.UUID, llsdTwoDS.Type); diff --git a/OpenMetaverse.Tests/PrimObjectTests.cs b/OpenMetaverse.Tests/PrimObjectTests.cs index fde5869f..c595d0c6 100644 --- a/OpenMetaverse.Tests/PrimObjectTests.cs +++ b/OpenMetaverse.Tests/PrimObjectTests.cs @@ -132,7 +132,7 @@ namespace OpenMetaverse.Tests [Test] public void TextureEntry() { - LLObject.TextureEntry te = new LLObject.TextureEntry(LLUUID.Random()); + LLObject.TextureEntry te = new LLObject.TextureEntry(UUID.Random()); LLObject.TextureEntryFace face = te.CreateFace(0); face.Bump = Bumpiness.Concrete; face.Fullbright = true; @@ -141,11 +141,11 @@ namespace OpenMetaverse.Tests face.OffsetV = -0.5f; face.RepeatU = 3.0f; face.RepeatV = 4.0f; - face.RGBA = new LLColor(0f, 0.25f, 0.75f, 1f); + face.RGBA = new Color4(0f, 0.25f, 0.75f, 1f); face.Rotation = 1.5f; face.Shiny = Shininess.Medium; face.TexMapType = MappingType.Planar; - face.TextureID = LLUUID.Random(); + face.TextureID = UUID.Random(); byte[] teBytes = te.ToBytes(); diff --git a/OpenMetaverse.Tests/TypeTests.cs b/OpenMetaverse.Tests/TypeTests.cs index f43070e1..9e9d89d1 100644 --- a/OpenMetaverse.Tests/TypeTests.cs +++ b/OpenMetaverse.Tests/TypeTests.cs @@ -41,25 +41,25 @@ namespace OpenMetaverse.Tests public void LLUUIDs() { // Creation - LLUUID a = new LLUUID(); + UUID a = new UUID(); byte[] bytes = a.GetBytes(); for (int i = 0; i < 16; i++) Assert.IsTrue(bytes[i] == 0x00); // Comparison - a = new LLUUID(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, + a = new UUID(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0xFF, 0xFF }, 0); - LLUUID b = new LLUUID(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, + UUID b = new UUID(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F }, 0); Assert.IsTrue(a == b, "LLUUID comparison operator failed, " + a.ToString() + " should equal " + b.ToString()); // From string - a = new LLUUID(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, + a = new UUID(new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F }, 0); string zeroonetwo = "00010203-0405-0607-0809-0a0b0c0d0e0f"; - b = new LLUUID(zeroonetwo); + b = new UUID(zeroonetwo); Assert.IsTrue(a == b, "LLUUID hyphenated string constructor failed, should have " + a.ToString() + " but we got " + b.ToString()); @@ -79,28 +79,28 @@ namespace OpenMetaverse.Tests [Test] public void Quaternions() { - LLQuaternion a = new LLQuaternion(1, 0, 0, 0); - LLQuaternion b = new LLQuaternion(1, 0, 0, 0); + Quaternion a = new Quaternion(1, 0, 0, 0); + Quaternion b = new Quaternion(1, 0, 0, 0); Assert.IsTrue(a == b, "LLQuaternion comparison operator failed"); - LLQuaternion expected = new LLQuaternion(0, 0, 0, -1); - LLQuaternion result = a * b; + Quaternion expected = new Quaternion(0, 0, 0, -1); + Quaternion result = a * b; Assert.IsTrue(result == expected, a.ToString() + " * " + b.ToString() + " produced " + result.ToString() + " instead of " + expected.ToString()); - a = new LLQuaternion(1, 0, 0, 0); - b = new LLQuaternion(0, 1, 0, 0); - expected = new LLQuaternion(0, 0, 1, 0); + a = new Quaternion(1, 0, 0, 0); + b = new Quaternion(0, 1, 0, 0); + expected = new Quaternion(0, 0, 1, 0); result = a * b; Assert.IsTrue(result == expected, a.ToString() + " * " + b.ToString() + " produced " + result.ToString() + " instead of " + expected.ToString()); - a = new LLQuaternion(0, 0, 1, 0); - b = new LLQuaternion(0, 1, 0, 0); - expected = new LLQuaternion(-1, 0, 0, 0); + a = new Quaternion(0, 0, 1, 0); + b = new Quaternion(0, 1, 0, 0); + expected = new Quaternion(-1, 0, 0, 0); result = a * b; Assert.IsTrue(result == expected, a.ToString() + " * " + b.ToString() + " produced " + result.ToString() + diff --git a/OpenMetaverse.Tests/XmlLLSDTests.cs b/OpenMetaverse.Tests/XmlLLSDTests.cs index 54f8313b..11d6304e 100644 --- a/OpenMetaverse.Tests/XmlLLSDTests.cs +++ b/OpenMetaverse.Tests/XmlLLSDTests.cs @@ -95,7 +95,7 @@ namespace OpenMetaverse.Tests Assert.IsTrue(tempLLSD is LLSDUUID); Assert.IsTrue(tempLLSD.Type == LLSDType.UUID); tempUUID = (LLSDUUID)tempLLSD; - Assert.AreEqual(new LLUUID("67153d5b-3659-afb4-8510-adda2c034649"), tempUUID.AsUUID()); + Assert.AreEqual(new UUID("67153d5b-3659-afb4-8510-adda2c034649"), tempUUID.AsUUID()); tempLLSD = map["scale"]; Assert.IsNotNull(tempLLSD); @@ -326,11 +326,11 @@ namespace OpenMetaverse.Tests Assert.AreEqual(LLSDType.UUID, array[0].Type); tempUUID = (LLSDUUID)array[0]; - Assert.AreEqual(new LLUUID("d7f4aeca-88f1-42a1-b385-b9db18abb255"), tempUUID.AsUUID()); + Assert.AreEqual(new UUID("d7f4aeca-88f1-42a1-b385-b9db18abb255"), tempUUID.AsUUID()); Assert.AreEqual(LLSDType.UUID, array[1].Type); tempUUID = (LLSDUUID)array[1]; - Assert.AreEqual(LLUUID.Zero, tempUUID.AsUUID()); + Assert.AreEqual(UUID.Zero, tempUUID.AsUUID()); } /// diff --git a/OpenMetaverse.Utilities/RegistrationApi.cs b/OpenMetaverse.Utilities/RegistrationApi.cs index 162a7e88..c81e7b71 100644 --- a/OpenMetaverse.Utilities/RegistrationApi.cs +++ b/OpenMetaverse.Utilities/RegistrationApi.cs @@ -71,8 +71,8 @@ namespace OpenMetaverse // optional: public Nullable LimitedToEstate; public string StartRegionName; - public Nullable StartLocation; - public Nullable StartLookAt; + public Nullable StartLocation; + public Nullable StartLookAt; } private UserInfo _userInfo; @@ -275,7 +275,7 @@ namespace OpenMetaverse /// /// New user account to create /// The UUID of the new user account - public LLUUID CreateUser(CreateUserParam user) + public UUID CreateUser(CreateUserParam user) { if (Initializing) throw new InvalidOperationException("still initializing"); @@ -319,7 +319,7 @@ namespace OpenMetaverse request.StartRequest(); // FIXME: Block - return LLUUID.Zero; + return UUID.Zero; } private void CreateUserResponse(CapsClient client, LLSD response, Exception error) diff --git a/OpenMetaverse.Utilities/Utilities.cs b/OpenMetaverse.Utilities/Utilities.cs index cf7ea434..cb45361b 100644 --- a/OpenMetaverse.Utilities/Utilities.cs +++ b/OpenMetaverse.Utilities/Utilities.cs @@ -56,7 +56,7 @@ namespace OpenMetaverse.Utilities /// /// Target to shoot at /// - public static bool Shoot(GridClient client, LLVector3 target) + public static bool Shoot(GridClient client, Vector3 target) { if (client.Self.Movement.TurnToward(target)) return Shoot(client); @@ -164,7 +164,7 @@ namespace OpenMetaverse.Utilities { private GridClient Client; private ulong SimHandle; - private LLVector3 Position = LLVector3.Zero; + private Vector3 Position = Vector3.Zero; private System.Timers.Timer CheckTimer; public ConnectionManager(GridClient client, int timerFrequency) @@ -240,7 +240,7 @@ namespace OpenMetaverse.Utilities } } - public void StayInSim(ulong handle, LLVector3 desiredPosition) + public void StayInSim(ulong handle, Vector3 desiredPosition) { SimHandle = handle; Position = desiredPosition; @@ -381,7 +381,7 @@ namespace OpenMetaverse.Utilities // Terrain at this point hasn't been downloaded, move the camera to this spot // and try again - LLVector3 position = new LLVector3((float)(x * 4 + x1), (float)(y * 4 + y1), + Vector3 position = new Vector3((float)(x * 4 + x1), (float)(y * 4 + y1), Client.Self.SimPosition.Z); Client.Self.Movement.Camera.Position = position; @@ -471,7 +471,7 @@ namespace OpenMetaverse.Utilities // Terrain at this point hasn't been downloaded, move the camera to this spot // and try again - LLVector3 position = new LLVector3((float)(x * 4 + x1), (float)(y * 4 + y1), + Vector3 position = new Vector3((float)(x * 4 + x1), (float)(y * 4 + y1), Client.Self.SimPosition.Z); Client.Self.Movement.Camera.Position = position; @@ -505,7 +505,7 @@ namespace OpenMetaverse.Utilities } } - public int GetRectangularDeviation(LLVector3 aabbmin, LLVector3 aabbmax, int area) + public int GetRectangularDeviation(Vector3 aabbmin, Vector3 aabbmax, int area) { int xlength = (int)(aabbmax.X - aabbmin.X); int ylength = (int)(aabbmax.Y - aabbmin.Y); diff --git a/OpenMetaverse.Utilities/VoiceManager.cs b/OpenMetaverse.Utilities/VoiceManager.cs index 0ec61b7e..1d010bf4 100644 --- a/OpenMetaverse.Utilities/VoiceManager.cs +++ b/OpenMetaverse.Utilities/VoiceManager.cs @@ -216,13 +216,13 @@ namespace OpenMetaverse.Utilities return new List(_RenderDevices); } - public string VoiceAccountFromUUID(LLUUID id) + public string VoiceAccountFromUUID(UUID id) { string result = "x" + Convert.ToBase64String(id.GetBytes()); return result.Replace('+', '-').Replace('/', '_'); } - public LLUUID UUIDFromVoiceAccount(string accountName) + public UUID UUIDFromVoiceAccount(string accountName) { if (accountName.Length == 25 && accountName[0] == 'x' && accountName[23] == '=' && accountName[24] == '=') { @@ -230,13 +230,13 @@ namespace OpenMetaverse.Utilities byte[] idBytes = Convert.FromBase64String(accountName); if (idBytes.Length == 16) - return new LLUUID(idBytes, 0); + return new UUID(idBytes, 0); else - return LLUUID.Zero; + return UUID.Zero; } else { - return LLUUID.Zero; + return UUID.Zero; } } diff --git a/OpenMetaverse/AgentManager.cs b/OpenMetaverse/AgentManager.cs index b65374bb..c7ff91ab 100644 --- a/OpenMetaverse/AgentManager.cs +++ b/OpenMetaverse/AgentManager.cs @@ -511,23 +511,23 @@ namespace OpenMetaverse public struct InstantMessage { /// Key of sender - public LLUUID FromAgentID; + public UUID FromAgentID; /// Name of sender public string FromAgentName; /// Key of destination avatar - public LLUUID ToAgentID; + public UUID ToAgentID; /// ID of originating estate public uint ParentEstateID; /// Key of originating region - public LLUUID RegionID; + public UUID RegionID; /// Coordinates in originating region - public LLVector3 Position; + public Vector3 Position; /// Instant message type public InstantMessageDialog Dialog; /// Group IM session toggle public bool GroupIM; /// Key of IM session, for Group Messages, the groups UUID - public LLUUID IMSessionID; + public UUID IMSessionID; /// Timestamp of the instant message public DateTime Timestamp; /// Instant message text @@ -690,7 +690,7 @@ namespace OpenMetaverse /// Key of the sender /// Senders position public delegate void ChatCallback(string message, ChatAudibleLevel audible, ChatType type, - ChatSourceType sourceType, string fromName, LLUUID id, LLUUID ownerid, LLVector3 position); + ChatSourceType sourceType, string fromName, UUID id, UUID ownerid, Vector3 position); /// /// Triggered when a script pops up a dialog box @@ -703,8 +703,8 @@ namespace OpenMetaverse /// Last name of the object owner /// Chat channel that the object is communicating on /// List of button labels - public delegate void ScriptDialogCallback(string message, string objectName, LLUUID imageID, - LLUUID objectID, string firstName, string lastName, int chatChannel, List buttons); + public delegate void ScriptDialogCallback(string message, string objectName, UUID imageID, + UUID objectID, string firstName, string lastName, int chatChannel, List buttons); /// /// Triggered when a script asks for permissions @@ -715,7 +715,7 @@ namespace OpenMetaverse /// Name of the object containing the script /// Name of the object's owner /// Bitwise value representing the requested permissions - public delegate void ScriptQuestionCallback(Simulator simulator, LLUUID taskID, LLUUID itemID, string objectName, string objectOwner, ScriptPermission questions); + public delegate void ScriptQuestionCallback(Simulator simulator, UUID taskID, UUID itemID, string objectName, string objectOwner, ScriptPermission questions); /// /// Triggered when a script displays a URL via llLoadURL @@ -726,7 +726,7 @@ namespace OpenMetaverse /// Whether or not ownerID is a group /// Message displayed along with URL /// Offered URL - public delegate void LoadURLCallback( string objectName, LLUUID objectID, LLUUID ownerID, bool ownerIsGroup, string message, string URL); + public delegate void LoadURLCallback( string objectName, UUID objectID, UUID ownerID, bool ownerIsGroup, string message, string URL); /// /// Triggered when the L$ account balance for this avatar changes @@ -743,7 +743,7 @@ namespace OpenMetaverse /// Land use credits you have /// Tier committed to group(s) /// Description of the transaction - public delegate void MoneyBalanceReplyCallback(LLUUID transactionID, bool transactionSuccess, int balance, int metersCredit, int metersCommitted, string description); + public delegate void MoneyBalanceReplyCallback(UUID transactionID, bool transactionSuccess, int balance, int metersCredit, int metersCommitted, string description); /// /// Triggered on incoming instant messages @@ -765,20 +765,20 @@ namespace OpenMetaverse /// /// The group we attempted to join /// Whether we joined the group or not - public delegate void JoinGroupCallback(LLUUID groupID, bool success); + public delegate void JoinGroupCallback(UUID groupID, bool success); /// /// Reply to a request to leave a group, informs whether it was successful or not /// /// The group we attempted to leave /// Whether we left the group or not - public delegate void LeaveGroupCallback(LLUUID groupID, bool success); + public delegate void LeaveGroupCallback(UUID groupID, bool success); /// /// Informs the avatar that it is no longer a member of a group /// /// The group Key we are no longer a member of - public delegate void GroupDroppedCallback(LLUUID groupID); + public delegate void GroupDroppedCallback(UUID groupID); /// /// Reply to an AgentData request @@ -789,7 +789,7 @@ namespace OpenMetaverse /// Avatars Active Title /// Powers Avatar has in group /// Name of the Group - public delegate void AgentDataCallback(string firstName, string lastName, LLUUID activeGroupID, + public delegate void AgentDataCallback(string firstName, string lastName, UUID activeGroupID, string groupTitle, GroupPowers groupPowers, string groupName); /// @@ -797,7 +797,7 @@ namespace OpenMetaverse /// /// A convenience reference to the /// SignaledAnimations collection - public delegate void AnimationsChangedCallback(InternalDictionary agentAnimations); + public delegate void AnimationsChangedCallback(InternalDictionary agentAnimations); /// /// Triggered when an object or avatar forcefully collides with our @@ -808,7 +808,7 @@ namespace OpenMetaverse /// Victim ID, should be our own AgentID /// Velocity or total force of the collision /// Time the collision occurred - public delegate void MeanCollisionCallback(MeanCollisionType type, LLUUID perp, LLUUID victim, + public delegate void MeanCollisionCallback(MeanCollisionType type, UUID perp, UUID victim, float magnitude, DateTime time); /// @@ -824,11 +824,11 @@ namespace OpenMetaverse /// Temporary session Key /// if session start successful, /// otherwise - public delegate void GroupChatJoined(LLUUID groupChatSessionID, LLUUID tmpSessionID, bool success); + public delegate void GroupChatJoined(UUID groupChatSessionID, UUID tmpSessionID, bool success); /// Fired when agent group chat session terminated /// Key of Session (groups UUID) - public delegate void GroupChatLeft(LLUUID groupchatSessionID); + public delegate void GroupChatLeft(UUID groupchatSessionID); /// /// Fired when alert message received from simulator @@ -848,7 +848,7 @@ namespace OpenMetaverse /// Fired when camera tries to view beyond its view limits /// /// LLVector4 representing plane where constraints were hit - public delegate void CameraConstraintCallback(LLVector4 collidePlane); + public delegate void CameraConstraintCallback(Vector4 collidePlane); /// /// Fired when script sensor reply is received @@ -864,8 +864,8 @@ namespace OpenMetaverse /// Objects Type /// LLVector3 representing the velocity of object /// TODO: this should probably be a struct, and there should be an enum added for type - public delegate void ScriptSensorReplyCallback(LLUUID requestorID, LLUUID groupID, string name, LLUUID objectID, - LLUUID ownerID, LLVector3 position, float range, LLQuaternion rotation, ScriptSensorTypeFlags type, LLVector3 velocity); + public delegate void ScriptSensorReplyCallback(UUID requestorID, UUID groupID, string name, UUID objectID, + UUID ownerID, Vector3 position, float range, Quaternion rotation, ScriptSensorTypeFlags type, Vector3 velocity); /// /// Fired in response to a RequestSit() @@ -877,10 +877,10 @@ namespace OpenMetaverse /// true of sitting on this object will force mouselook /// position avatar will be in when seated /// rotation avatar will be in when seated - public delegate void AvatarSitResponseCallback(LLUUID objectID, bool autoPilot, LLVector3 cameraAtOffset, LLVector3 cameraEyeOffset, - bool forceMouselook, LLVector3 sitPosition, LLQuaternion sitRotation); + public delegate void AvatarSitResponseCallback(UUID objectID, bool autoPilot, Vector3 cameraAtOffset, Vector3 cameraEyeOffset, + bool forceMouselook, Vector3 sitPosition, Quaternion sitRotation); - public delegate void AgentMovementCallback(LLVector3 agentPosition, ulong regionHandle, LLVector3 agentLookAt, string simVersion); + public delegate void AgentMovementCallback(Vector3 agentPosition, ulong regionHandle, Vector3 agentLookAt, string simVersion); /// Callback for incoming chat packets public event ChatCallback OnChat; @@ -932,22 +932,22 @@ namespace OpenMetaverse /// check the current movement status such as walking, hovering, aiming, /// etc. by checking for system animations in the Animations /// class - public InternalDictionary SignaledAnimations = new InternalDictionary(); + public InternalDictionary SignaledAnimations = new InternalDictionary(); /// /// Dictionary containing current Group Chat sessions and members /// - public InternalDictionary> GroupChatSessions = new InternalDictionary>(); + public InternalDictionary> GroupChatSessions = new InternalDictionary>(); #region Properties /// Your (client) avatars /// "client", "agent", and "avatar" all represent the same thing - public LLUUID AgentID { get { return id; } } + public UUID AgentID { get { return id; } } /// Temporary assigned to this session, used for /// verifying our identity in packets - public LLUUID SessionID { get { return sessionID; } } + public UUID SessionID { get { return sessionID; } } /// Shared secret that is never sent over the wire - public LLUUID SecureSessionID { get { return secureSessionID; } } + public UUID SecureSessionID { get { return secureSessionID; } } /// Your (client) avatar ID, local to the current region/sim public uint LocalID { get { return localID; } } /// Where the avatar started at login. Can be "last", "home" @@ -956,18 +956,18 @@ namespace OpenMetaverse /// The access level of this agent, usually M or PG public string AgentAccess { get { return agentAccess; } } /// - public LLVector4 CollisionPlane { get { return collisionPlane; } } + public Vector4 CollisionPlane { get { return collisionPlane; } } /// An representing the velocity of our agent - public LLVector3 Velocity { get { return velocity; } } + public Vector3 Velocity { get { return velocity; } } /// An representing the acceleration of our agent - public LLVector3 Acceleration { get { return acceleration; } } + public Vector3 Acceleration { get { return acceleration; } } /// - public LLVector3 AngularVelocity { get { return angularVelocity; } } + public Vector3 AngularVelocity { get { return angularVelocity; } } /// Position avatar client will goto when login to 'home' or during /// teleport request to 'home' region. - public LLVector3 HomePosition { get { return homePosition; } } + public Vector3 HomePosition { get { return homePosition; } } /// LookAt point saved/restored with HomePosition - public LLVector3 HomeLookAt { get { return homeLookAt; } } + public Vector3 HomeLookAt { get { return homeLookAt; } } /// Avatar First Name (i.e. Philip) public string FirstName { get { return firstName; } } /// Avatar Last Name (i.e. Linden) @@ -992,17 +992,17 @@ namespace OpenMetaverse /// zero if the avatar is not currently sitting public uint SittingOn { get { return sittingOn; } } /// Gets the of the agents active group. - public LLUUID ActiveGroup { get { return activeGroup; } } + public UUID ActiveGroup { get { return activeGroup; } } /// Current status message for teleporting public string TeleportMessage { get { return teleportMessage; } } /// Current position of the agent as a relative offset from /// the simulator, or the parent object if we are sitting on something - public LLVector3 RelativePosition { get { return relativePosition; } } + public Vector3 RelativePosition { get { return relativePosition; } } /// Current rotation of the agent as a relative rotation from /// the simulator, or the parent object if we are sitting on something - public LLQuaternion RelativeRotation { get { return relativeRotation; } } + public Quaternion RelativeRotation { get { return relativeRotation; } } /// Current position of the agent in the simulator - public LLVector3 SimPosition + public Vector3 SimPosition { get { @@ -1029,7 +1029,7 @@ namespace OpenMetaverse /// /// A representing the agents current rotation /// - public LLQuaternion SimRotation + public Quaternion SimRotation { get { @@ -1054,7 +1054,7 @@ namespace OpenMetaverse } } /// Returns the global grid position of the avatar - public LLVector3d GlobalPosition + public Vector3d GlobalPosition { get { @@ -1062,39 +1062,39 @@ namespace OpenMetaverse { uint globalX, globalY; Helpers.LongToUInts(Client.Network.CurrentSim.Handle, out globalX, out globalY); - LLVector3 pos = SimPosition; + Vector3 pos = SimPosition; - return new LLVector3d( + return new Vector3d( (double)globalX + (double)pos.X, (double)globalY + (double)pos.Y, (double)pos.Z); } else - return LLVector3d.Zero; + return Vector3d.Zero; } } #endregion Properties internal uint localID; - internal LLVector3 relativePosition; - internal LLQuaternion relativeRotation = LLQuaternion.Identity; - internal LLVector4 collisionPlane; - internal LLVector3 velocity; - internal LLVector3 acceleration; - internal LLVector3 angularVelocity; + internal Vector3 relativePosition; + internal Quaternion relativeRotation = Quaternion.Identity; + internal Vector4 collisionPlane; + internal Vector3 velocity; + internal Vector3 acceleration; + internal Vector3 angularVelocity; internal uint sittingOn; internal int lastInterpolation; #region Private Members - private LLUUID id; - private LLUUID sessionID; - private LLUUID secureSessionID; + private UUID id; + private UUID sessionID; + private UUID secureSessionID; private string startLocation = String.Empty; private string agentAccess = String.Empty; - private LLVector3 homePosition; - private LLVector3 homeLookAt; + private Vector3 homePosition; + private Vector3 homeLookAt; private string firstName = String.Empty; private string lastName = String.Empty; private string fullName; @@ -1104,7 +1104,7 @@ namespace OpenMetaverse private uint heightWidthGenCounter; private float health; private int balance; - private LLUUID activeGroup; + private UUID activeGroup; #endregion Private Members /// @@ -1208,11 +1208,11 @@ namespace OpenMetaverse /// /// Target of the Instant Message /// Text message being sent - public void InstantMessage(LLUUID target, string message) + public void InstantMessage(UUID target, string message) { InstantMessage(Name, target, message, AgentID.Equals(target) ? AgentID : target ^ AgentID, InstantMessageDialog.MessageFromAgent, InstantMessageOnline.Offline, this.SimPosition, - LLUUID.Zero, new byte[0]); + UUID.Zero, new byte[0]); } /// @@ -1221,11 +1221,11 @@ namespace OpenMetaverse /// Target of the Instant Message /// Text message being sent /// IM session ID (to differentiate between IM windows) - public void InstantMessage(LLUUID target, string message, LLUUID imSessionID) + public void InstantMessage(UUID target, string message, UUID imSessionID) { InstantMessage(Name, target, message, imSessionID, InstantMessageDialog.MessageFromAgent, InstantMessageOnline.Offline, this.SimPosition, - LLUUID.Zero, new byte[0]); + UUID.Zero, new byte[0]); } /// @@ -1236,8 +1236,8 @@ namespace OpenMetaverse /// Text message being sent /// IM session ID (to differentiate between IM windows) /// IDs of sessions for a conference - public void InstantMessage(string fromName, LLUUID target, string message, LLUUID imSessionID, - LLUUID[] conferenceIDs) + public void InstantMessage(string fromName, UUID target, string message, UUID imSessionID, + UUID[] conferenceIDs) { byte[] binaryBucket; @@ -1253,7 +1253,7 @@ namespace OpenMetaverse } InstantMessage(fromName, target, message, imSessionID, InstantMessageDialog.MessageFromAgent, - InstantMessageOnline.Offline, LLVector3.Zero, LLUUID.Zero, binaryBucket); + InstantMessageOnline.Offline, Vector3.Zero, UUID.Zero, binaryBucket); } /// @@ -1269,15 +1269,15 @@ namespace OpenMetaverse /// RegionID Sender is In /// Packed binary data that is specific to /// the dialog type - public void InstantMessage(string fromName, LLUUID target, string message, LLUUID imSessionID, - InstantMessageDialog dialog, InstantMessageOnline offline, LLVector3 position, LLUUID regionID, + public void InstantMessage(string fromName, UUID target, string message, UUID imSessionID, + InstantMessageDialog dialog, InstantMessageOnline offline, Vector3 position, UUID regionID, byte[] binaryBucket) { - if (target != LLUUID.Zero) + if (target != UUID.Zero) { ImprovedInstantMessagePacket im = new ImprovedInstantMessagePacket(); - if (imSessionID.Equals(LLUUID.Zero) || imSessionID.Equals(AgentID)) + if (imSessionID.Equals(UUID.Zero) || imSessionID.Equals(AgentID)) imSessionID = AgentID.Equals(target) ? AgentID : target ^ AgentID; im.AgentData.AgentID = Client.Self.AgentID; @@ -1297,7 +1297,7 @@ namespace OpenMetaverse im.MessageBlock.BinaryBucket = new byte[0]; // These fields are mandatory, even if we don't have valid values for them - im.MessageBlock.Position = LLVector3.Zero; + im.MessageBlock.Position = Vector3.Zero; //TODO: Allow region id to be correctly set by caller or fetched from Client.* im.MessageBlock.RegionID = regionID; @@ -1316,7 +1316,7 @@ namespace OpenMetaverse /// /// of the group to send message to /// Text Message being sent. - public void InstantMessageGroup(LLUUID groupUUID, string message) + public void InstantMessageGroup(UUID groupUUID, string message) { InstantMessageGroup(Name, groupUUID, message); } @@ -1328,7 +1328,7 @@ namespace OpenMetaverse /// of the group to send message to /// Text message being sent /// This does not appear to function with groups the agent is not in - public void InstantMessageGroup(string fromName, LLUUID groupUUID, string message) + public void InstantMessageGroup(string fromName, UUID groupUUID, string message) { lock (GroupChatSessions.Dictionary) if (GroupChatSessions.ContainsKey(groupUUID)) @@ -1344,8 +1344,8 @@ namespace OpenMetaverse im.MessageBlock.Offline = 0; im.MessageBlock.ID = groupUUID; im.MessageBlock.ToAgentID = groupUUID; - im.MessageBlock.Position = LLVector3.Zero; - im.MessageBlock.RegionID = LLUUID.Zero; + im.MessageBlock.Position = Vector3.Zero; + im.MessageBlock.RegionID = UUID.Zero; im.MessageBlock.BinaryBucket = Helpers.StringToField("\0"); Client.Network.SendPacket(im); @@ -1361,7 +1361,7 @@ namespace OpenMetaverse /// Send a request to join a group chat session /// /// of Group to leave - public void RequestJoinGroupChat(LLUUID groupUUID) + public void RequestJoinGroupChat(UUID groupUUID) { ImprovedInstantMessagePacket im = new ImprovedInstantMessagePacket(); @@ -1375,8 +1375,8 @@ namespace OpenMetaverse im.MessageBlock.ID = groupUUID; im.MessageBlock.ToAgentID = groupUUID; im.MessageBlock.BinaryBucket = new byte[0]; - im.MessageBlock.Position = LLVector3.Zero; - im.MessageBlock.RegionID = LLUUID.Zero; + im.MessageBlock.Position = Vector3.Zero; + im.MessageBlock.RegionID = UUID.Zero; Client.Network.SendPacket(im); } @@ -1385,7 +1385,7 @@ namespace OpenMetaverse /// until session is rejoined or expires. /// /// of Group to leave - public void RequestLeaveGroupChat(LLUUID groupUUID) + public void RequestLeaveGroupChat(UUID groupUUID) { ImprovedInstantMessagePacket im = new ImprovedInstantMessagePacket(); @@ -1399,8 +1399,8 @@ namespace OpenMetaverse im.MessageBlock.ID = groupUUID; im.MessageBlock.ToAgentID = groupUUID; im.MessageBlock.BinaryBucket = new byte[0]; - im.MessageBlock.Position = LLVector3.Zero; - im.MessageBlock.RegionID = LLUUID.Zero; + im.MessageBlock.Position = Vector3.Zero; + im.MessageBlock.RegionID = UUID.Zero; Client.Network.SendPacket(im); } @@ -1413,7 +1413,7 @@ namespace OpenMetaverse /// Label of button you're "clicking" /// UUID of Object that sent the request /// - public void ReplyToScriptDialog(int channel, int buttonIndex, string buttonlabel, LLUUID objectID) + public void ReplyToScriptDialog(int channel, int buttonIndex, string buttonlabel, UUID objectID) { ScriptDialogReplyPacket reply = new ScriptDialogReplyPacket(); @@ -1440,8 +1440,8 @@ namespace OpenMetaverse /// /// The type from the enum /// A unique for this effect - public void PointAtEffect(LLUUID sourceAvatar, LLUUID targetObject, LLVector3d globalOffset, PointAtType type, - LLUUID effectID) + public void PointAtEffect(UUID sourceAvatar, UUID targetObject, Vector3d globalOffset, PointAtType type, + UUID effectID) { ViewerEffectPacket effect = new ViewerEffectPacket(); @@ -1457,9 +1457,9 @@ namespace OpenMetaverse effect.Effect[0].Type = (byte)EffectType.PointAt; byte[] typeData = new byte[57]; - if (sourceAvatar != LLUUID.Zero) + if (sourceAvatar != UUID.Zero) Buffer.BlockCopy(sourceAvatar.GetBytes(), 0, typeData, 0, 16); - if (targetObject != LLUUID.Zero) + if (targetObject != UUID.Zero) Buffer.BlockCopy(targetObject.GetBytes(), 0, typeData, 16, 16); Buffer.BlockCopy(globalOffset.GetBytes(), 0, typeData, 32, 24); typeData[56] = (byte)type; @@ -1477,8 +1477,8 @@ namespace OpenMetaverse /// A representing the beams offset from the source /// A which sets the avatars lookat animation /// of the Effect - public void LookAtEffect(LLUUID sourceAvatar, LLUUID targetObject, LLVector3d globalOffset, LookAtType type, - LLUUID effectID) + public void LookAtEffect(UUID sourceAvatar, UUID targetObject, Vector3d globalOffset, LookAtType type, + UUID effectID) { ViewerEffectPacket effect = new ViewerEffectPacket(); @@ -1525,9 +1525,9 @@ namespace OpenMetaverse effect.Effect[0].Type = (byte)EffectType.LookAt; byte[] typeData = new byte[57]; - if (sourceAvatar != LLUUID.Zero) + if (sourceAvatar != UUID.Zero) Buffer.BlockCopy(sourceAvatar.GetBytes(), 0, typeData, 0, 16); - if (targetObject != LLUUID.Zero) + if (targetObject != UUID.Zero) Buffer.BlockCopy(targetObject.GetBytes(), 0, typeData, 16, 16); typeData[56] = (byte)type; @@ -1545,8 +1545,8 @@ namespace OpenMetaverse /// Color values of beam /// a float representing the duration the beam will last /// of the Effect - public void BeamEffect(LLUUID sourceAvatar, LLUUID targetObject, LLVector3d globalOffset, LLColor color, - float duration, LLUUID effectID) + public void BeamEffect(UUID sourceAvatar, UUID targetObject, Vector3d globalOffset, Color4 color, + float duration, UUID effectID) { ViewerEffectPacket effect = new ViewerEffectPacket(); @@ -1580,7 +1580,7 @@ namespace OpenMetaverse /// /// LLUUID of the object to sit on /// Sit at offset - public void RequestSit(LLUUID targetID, LLVector3 offset) + public void RequestSit(UUID targetID, Vector3 offset) { AgentRequestSitPacket requestSit = new AgentRequestSitPacket(); requestSit.AgentData.AgentID = Client.Self.AgentID; @@ -1681,8 +1681,8 @@ namespace OpenMetaverse autopilot.AgentData.AgentID = Client.Self.AgentID; autopilot.AgentData.SessionID = Client.Self.SessionID; - autopilot.AgentData.TransactionID = LLUUID.Zero; - autopilot.MethodData.Invoice = LLUUID.Zero; + autopilot.AgentData.TransactionID = UUID.Zero; + autopilot.MethodData.Invoice = UUID.Zero; autopilot.MethodData.Method = Helpers.StringToField("autopilot"); autopilot.ParamList = new GenericMessagePacket.ParamListBlock[3]; autopilot.ParamList[0] = new GenericMessagePacket.ParamListBlock(); @@ -1708,8 +1708,8 @@ namespace OpenMetaverse autopilot.AgentData.AgentID = Client.Self.AgentID; autopilot.AgentData.SessionID = Client.Self.SessionID; - autopilot.AgentData.TransactionID = LLUUID.Zero; - autopilot.MethodData.Invoice = LLUUID.Zero; + autopilot.AgentData.TransactionID = UUID.Zero; + autopilot.MethodData.Invoice = UUID.Zero; autopilot.MethodData.Method = Helpers.StringToField("autopilot"); autopilot.ParamList = new GenericMessagePacket.ParamListBlock[3]; autopilot.ParamList[0] = new GenericMessagePacket.ParamListBlock(); @@ -1771,7 +1771,7 @@ namespace OpenMetaverse grab.AgentData.AgentID = Client.Self.AgentID; grab.AgentData.SessionID = Client.Self.SessionID; grab.ObjectData.LocalID = objectLocalID; - grab.ObjectData.GrabOffset = new LLVector3(0, 0, 0); + grab.ObjectData.GrabOffset = new Vector3(0, 0, 0); Client.Network.SendPacket(grab); } @@ -1780,13 +1780,13 @@ namespace OpenMetaverse /// /// LLUUID of the object to drag /// Drag target in region coordinates - public void GrabUpdate(LLUUID objectID, LLVector3 grabPosition) + public void GrabUpdate(UUID objectID, Vector3 grabPosition) { ObjectGrabUpdatePacket grab = new ObjectGrabUpdatePacket(); grab.AgentData.AgentID = Client.Self.AgentID; grab.AgentData.SessionID = Client.Self.SessionID; grab.ObjectData.ObjectID = objectID; - grab.ObjectData.GrabOffsetInitial = new LLVector3(0, 0, 0); + grab.ObjectData.GrabOffsetInitial = new Vector3(0, 0, 0); grab.ObjectData.GrabPosition = grabPosition; grab.ObjectData.TimeSinceLast = 0; Client.Network.SendPacket(grab); @@ -1829,7 +1829,7 @@ namespace OpenMetaverse MoneyBalanceRequestPacket money = new MoneyBalanceRequestPacket(); money.AgentData.AgentID = Client.Self.AgentID; money.AgentData.SessionID = Client.Self.SessionID; - money.MoneyData.TransactionID = LLUUID.Zero; + money.MoneyData.TransactionID = UUID.Zero; Client.Network.SendPacket(money); } @@ -1839,7 +1839,7 @@ namespace OpenMetaverse /// /// UUID of the Target Avatar /// Amount in L$ - public void GiveAvatarMoney(LLUUID target, int amount) + public void GiveAvatarMoney(UUID target, int amount) { GiveMoney(target, amount, String.Empty, MoneyTransactionType.Gift, TransactionFlags.None); } @@ -1851,7 +1851,7 @@ namespace OpenMetaverse /// Amount in L$ /// Description that will show up in the /// recipients transaction history - public void GiveAvatarMoney(LLUUID target, int amount, string description) + public void GiveAvatarMoney(UUID target, int amount, string description) { GiveMoney(target, amount, description, MoneyTransactionType.Gift, TransactionFlags.None); } @@ -1862,7 +1862,7 @@ namespace OpenMetaverse /// object to give money to /// amount of L$ to give /// name of object - public void GiveObjectMoney(LLUUID target, int amount, string objectName) + public void GiveObjectMoney(UUID target, int amount, string objectName) { GiveMoney(target, amount, objectName, MoneyTransactionType.PayObject, TransactionFlags.None); } @@ -1872,7 +1872,7 @@ namespace OpenMetaverse /// /// group to give money to /// amount of L$ to give - public void GiveGroupMoney(LLUUID target, int amount) + public void GiveGroupMoney(UUID target, int amount) { GiveMoney(target, amount, String.Empty, MoneyTransactionType.Gift, TransactionFlags.DestGroup); } @@ -1883,7 +1883,7 @@ namespace OpenMetaverse /// group to give money to /// amount of L$ to give /// description of transaction - public void GiveGroupMoney(LLUUID target, int amount, string description) + public void GiveGroupMoney(UUID target, int amount, string description) { GiveMoney(target, amount, description, MoneyTransactionType.Gift, TransactionFlags.DestGroup); } @@ -1893,7 +1893,7 @@ namespace OpenMetaverse /// public void PayUploadFee() { - GiveMoney(LLUUID.Zero, Client.Settings.UPLOAD_COST, String.Empty, MoneyTransactionType.UploadCharge, + GiveMoney(UUID.Zero, Client.Settings.UPLOAD_COST, String.Empty, MoneyTransactionType.UploadCharge, TransactionFlags.None); } @@ -1903,7 +1903,7 @@ namespace OpenMetaverse /// description of the transaction public void PayUploadFee(string description) { - GiveMoney(LLUUID.Zero, Client.Settings.UPLOAD_COST, description, MoneyTransactionType.UploadCharge, + GiveMoney(UUID.Zero, Client.Settings.UPLOAD_COST, description, MoneyTransactionType.UploadCharge, TransactionFlags.None); } @@ -1916,7 +1916,7 @@ namespace OpenMetaverse /// The type of transaction /// Transaction flags, mostly for identifying group /// transactions - public void GiveMoney(LLUUID target, int amount, string description, MoneyTransactionType type, TransactionFlags flags) + public void GiveMoney(UUID target, int amount, string description, MoneyTransactionType type, TransactionFlags flags) { MoneyTransferRequestPacket money = new MoneyTransferRequestPacket(); money.AgentData.AgentID = this.id; @@ -1942,9 +1942,9 @@ namespace OpenMetaverse /// /// The of the animation to start playing /// Whether to ensure delivery of this packet or not - public void AnimationStart(LLUUID animation, bool reliable) + public void AnimationStart(UUID animation, bool reliable) { - Dictionary animations = new Dictionary(); + Dictionary animations = new Dictionary(); animations[animation] = true; Animate(animations, reliable); @@ -1956,9 +1956,9 @@ namespace OpenMetaverse /// The of a /// currently playing animation to stop playing /// Whether to ensure delivery of this packet or not - public void AnimationStop(LLUUID animation, bool reliable) + public void AnimationStop(UUID animation, bool reliable) { - Dictionary animations = new Dictionary(); + Dictionary animations = new Dictionary(); animations[animation] = false; Animate(animations, reliable); @@ -1970,7 +1970,7 @@ namespace OpenMetaverse /// A list of animation s, and whether to /// turn that animation on or off /// Whether to ensure delivery of this packet or not - public void Animate(Dictionary animations, bool reliable) + public void Animate(Dictionary animations, bool reliable) { AgentAnimationPacket animate = new AgentAnimationPacket(); animate.Header.Reliable = reliable; @@ -1980,7 +1980,7 @@ namespace OpenMetaverse animate.AnimationList = new AgentAnimationPacket.AnimationListBlock[animations.Count]; int i = 0; - foreach (KeyValuePair animation in animations) + foreach (KeyValuePair animation in animations) { animate.AnimationList[i] = new AgentAnimationPacket.AnimationListBlock(); animate.AnimationList[i].AnimID = animation.Key; @@ -2002,7 +2002,7 @@ namespace OpenMetaverse /// true on successful teleport to home location public bool GoHome() { - return Teleport(LLUUID.Zero); + return Teleport(UUID.Zero); } /// @@ -2010,7 +2010,7 @@ namespace OpenMetaverse /// /// of the landmark to teleport agent to /// true on success, false on failure - public bool Teleport(LLUUID landmark) + public bool Teleport(UUID landmark) { teleportStat = TeleportStatus.None; teleportEvent.Reset(); @@ -2042,9 +2042,9 @@ namespace OpenMetaverse /// Position to teleport to /// True if the lookup and teleport were successful, otherwise /// false - public bool Teleport(string simName, LLVector3 position) + public bool Teleport(string simName, Vector3 position) { - return Teleport(simName, position, new LLVector3(0, 1.0f, 0)); + return Teleport(simName, position, new Vector3(0, 1.0f, 0)); } /// @@ -2056,7 +2056,7 @@ namespace OpenMetaverse /// Target to look at /// True if the lookup and teleport were successful, otherwise /// false - public bool Teleport(string simName, LLVector3 position, LLVector3 lookAt) + public bool Teleport(string simName, Vector3 position, Vector3 lookAt) { teleportStat = TeleportStatus.None; simName = simName.ToLower(); @@ -2091,9 +2091,9 @@ namespace OpenMetaverse /// position in destination sim to teleport to /// true on success, false on failure /// This call is blocking - public bool Teleport(ulong regionHandle, LLVector3 position) + public bool Teleport(ulong regionHandle, Vector3 position) { - return Teleport(regionHandle, position, new LLVector3(0.0f, 1.0f, 0.0f)); + return Teleport(regionHandle, position, new Vector3(0.0f, 1.0f, 0.0f)); } /// @@ -2104,7 +2104,7 @@ namespace OpenMetaverse /// direction in destination sim agent will look at /// true on success, false on failure /// This call is blocking - public bool Teleport(ulong regionHandle, LLVector3 position, LLVector3 lookAt) + public bool Teleport(ulong regionHandle, Vector3 position, Vector3 lookAt) { teleportStat = TeleportStatus.None; teleportEvent.Reset(); @@ -2129,9 +2129,9 @@ namespace OpenMetaverse /// /// handle of region to teleport agent to /// position in destination sim to teleport to - public void RequestTeleport(ulong regionHandle, LLVector3 position) + public void RequestTeleport(ulong regionHandle, Vector3 position) { - RequestTeleport(regionHandle, position, new LLVector3(0.0f, 1.0f, 0.0f)); + RequestTeleport(regionHandle, position, new Vector3(0.0f, 1.0f, 0.0f)); } /// @@ -2140,7 +2140,7 @@ namespace OpenMetaverse /// handle of region to teleport agent to /// position in destination sim to teleport to /// direction in destination sim agent will look at - public void RequestTeleport(ulong regionHandle, LLVector3 position, LLVector3 lookAt) + public void RequestTeleport(ulong regionHandle, Vector3 position, Vector3 lookAt) { if (Client.Network.CurrentSim != null && Client.Network.CurrentSim.Caps != null && @@ -2169,7 +2169,7 @@ namespace OpenMetaverse /// Teleport agent to a landmark /// /// of the landmark to teleport agent to - public void RequestTeleport(LLUUID landmark) + public void RequestTeleport(UUID landmark) { TeleportLandmarkRequestPacket p = new TeleportLandmarkRequestPacket(); p.Info = new TeleportLandmarkRequestPacket.InfoBlock(); @@ -2183,7 +2183,7 @@ namespace OpenMetaverse /// Send a teleport lure to another avatar with default "Join me in ..." invitation message /// /// target avatars to lure - public void SendTeleportLure(LLUUID targetID) + public void SendTeleportLure(UUID targetID) { SendTeleportLure(targetID, "Join me in " + Client.Network.CurrentSim.Name + "!"); } @@ -2193,7 +2193,7 @@ namespace OpenMetaverse /// /// target avatars to lure /// custom message to send with invitation - public void SendTeleportLure(LLUUID targetID, string message) + public void SendTeleportLure(UUID targetID, string message) { StartLurePacket p = new StartLurePacket(); p.AgentData.AgentID = Client.Self.id; @@ -2211,11 +2211,11 @@ namespace OpenMetaverse /// /// of the avatar sending the lure /// true to accept the lure, false to decline it - public void TeleportLureRespond(LLUUID requesterID, bool accept) + public void TeleportLureRespond(UUID requesterID, bool accept) { - InstantMessage(Name, requesterID, String.Empty, LLUUID.Random(), + InstantMessage(Name, requesterID, String.Empty, UUID.Random(), accept ? InstantMessageDialog.AcceptTeleport : InstantMessageDialog.DenyTeleport, - InstantMessageOnline.Offline, this.SimPosition, LLUUID.Zero, new byte[0]); + InstantMessageOnline.Offline, this.SimPosition, UUID.Zero, new byte[0]); if (accept) { @@ -2347,7 +2347,7 @@ namespace OpenMetaverse /// of the itemID requesting permissions /// of the taskID requesting permissions /// list of permissions to allow - public void ScriptQuestionReply(Simulator simulator, LLUUID itemID, LLUUID taskID, ScriptPermission permissions) + public void ScriptQuestionReply(Simulator simulator, UUID itemID, UUID taskID, ScriptPermission permissions) { ScriptAnswerYesPacket yes = new ScriptAnswerYesPacket(); yes.AgentData.AgentID = Client.Self.AgentID; @@ -2365,11 +2365,11 @@ namespace OpenMetaverse /// UUID of the group (sent in the AgentID field of the invite message) /// IM Session ID from the group invitation message /// Accept the group invitation or deny it - public void GroupInviteRespond(LLUUID groupID, LLUUID imSessionID, bool accept) + public void GroupInviteRespond(UUID groupID, UUID imSessionID, bool accept) { InstantMessage(Name, groupID, String.Empty, imSessionID, accept ? InstantMessageDialog.GroupInvitationAccept : InstantMessageDialog.GroupInvitationDecline, - InstantMessageOnline.Offline, LLVector3.Zero, LLUUID.Zero, new byte[0]); + InstantMessageOnline.Offline, Vector3.Zero, UUID.Zero, new byte[0]); } /// @@ -2382,17 +2382,17 @@ namespace OpenMetaverse /// the arc in radians to search within /// an user generated ID to correlate replies with /// Simulator to perform search in - public void RequestScriptSensor(string name, LLUUID searchID, ScriptSensorTypeFlags type, float range, float arc, LLUUID requestID, Simulator sim) + public void RequestScriptSensor(string name, UUID searchID, ScriptSensorTypeFlags type, float range, float arc, UUID requestID, Simulator sim) { ScriptSensorRequestPacket request = new ScriptSensorRequestPacket(); request.Requester.Arc = arc; request.Requester.Range = range; request.Requester.RegionHandle = sim.Handle; request.Requester.RequestID = requestID; - request.Requester.SearchDir = LLQuaternion.Identity; // TODO: this needs to be tested + request.Requester.SearchDir = Quaternion.Identity; // TODO: this needs to be tested request.Requester.SearchID = searchID; request.Requester.SearchName = Helpers.StringToField(name); - request.Requester.SearchPos = LLVector3.Zero; + request.Requester.SearchPos = Vector3.Zero; request.Requester.SearchRegions = 0; // TODO: ? request.Requester.SourceID = Client.Self.AgentID; request.Requester.Type = (int)type; @@ -2797,7 +2797,7 @@ namespace OpenMetaverse for (int i = 0; i < animation.AnimationList.Length; i++) { - LLUUID animID = animation.AnimationList[i].AnimID; + UUID animID = animation.AnimationList[i].AnimID; int sequenceID = animation.AnimationList[i].AnimSequenceID; // Add this animation to the list of currently signaled animations @@ -2940,14 +2940,14 @@ namespace OpenMetaverse private void ChatterBoxSessionStartReplyHandler(string capsKey, LLSD llsd, Simulator simulator) { LLSDMap map = (LLSDMap)llsd; - LLUUID sessionID = map["session_id"].AsUUID(); - LLUUID tmpSessionID = map["temp_session_id"].AsUUID(); + UUID sessionID = map["session_id"].AsUUID(); + UUID tmpSessionID = map["temp_session_id"].AsUUID(); bool success = map["success"].AsBoolean(); if (success) { LLSDArray agentlist = (LLSDArray)map["agents"]; - List agents = new List(); + List agents = new List(); foreach (LLSD id in agentlist) agents.Add(id.AsUUID()); @@ -2976,7 +2976,7 @@ namespace OpenMetaverse private void ChatterBoxSessionAgentListReplyHandler(string capsKey, LLSD llsd, Simulator simulator) { LLSDMap map = (LLSDMap)llsd; - LLUUID sessionID = map["session_id"].AsUUID(); + UUID sessionID = map["session_id"].AsUUID(); LLSDMap update = (LLSDMap)map["updates"]; string errormsg = map["error"].AsString(); @@ -2989,16 +2989,16 @@ namespace OpenMetaverse { lock (GroupChatSessions.Dictionary) { - if (!GroupChatSessions.Dictionary[sessionID].Contains((LLUUID)kvp.Key)) - GroupChatSessions.Dictionary[sessionID].Add((LLUUID)kvp.Key); + if (!GroupChatSessions.Dictionary[sessionID].Contains((UUID)kvp.Key)) + GroupChatSessions.Dictionary[sessionID].Add((UUID)kvp.Key); } } else if (kvp.Value.Equals("LEAVE")) { lock (GroupChatSessions.Dictionary) { - if (GroupChatSessions.Dictionary[sessionID].Contains((LLUUID)kvp.Key)) - GroupChatSessions.Dictionary[sessionID].Remove((LLUUID)kvp.Key); + if (GroupChatSessions.Dictionary[sessionID].Contains((UUID)kvp.Key)) + GroupChatSessions.Dictionary[sessionID].Remove((UUID)kvp.Key); // we left session, remove from dictionary if (kvp.Key.Equals(Client.Self.id) && OnGroupChatLeft != null) diff --git a/OpenMetaverse/AgentManagerCamera.cs b/OpenMetaverse/AgentManagerCamera.cs index 46a6e82f..234d3a2e 100644 --- a/OpenMetaverse/AgentManagerCamera.cs +++ b/OpenMetaverse/AgentManagerCamera.cs @@ -47,25 +47,25 @@ namespace OpenMetaverse private CoordinateFrame Frame; /// - public LLVector3 Position + public Vector3 Position { get { return Frame.Origin; } set { Frame.Origin = value; } } /// - public LLVector3 AtAxis + public Vector3 AtAxis { get { return Frame.YAxis; } set { Frame.YAxis = value; } } /// - public LLVector3 LeftAxis + public Vector3 LeftAxis { get { return Frame.XAxis; } set { Frame.XAxis = value; } } /// - public LLVector3 UpAxis + public Vector3 UpAxis { get { return Frame.ZAxis; } set { Frame.ZAxis = value; } @@ -76,7 +76,7 @@ namespace OpenMetaverse /// public AgentCamera() { - Frame = new CoordinateFrame(new LLVector3(128f, 128f, 20f)); + Frame = new CoordinateFrame(new Vector3(128f, 128f, 20f)); Far = 128f; } @@ -95,12 +95,12 @@ namespace OpenMetaverse Frame.Yaw(angle); } - public void LookDirection(LLVector3 target) + public void LookDirection(Vector3 target) { Frame.LookDirection(target); } - public void LookDirection(LLVector3 target, LLVector3 upDirection) + public void LookDirection(Vector3 target, Vector3 upDirection) { Frame.LookDirection(target, upDirection); } @@ -110,17 +110,17 @@ namespace OpenMetaverse Frame.LookDirection(heading); } - public void LookAt(LLVector3 position, LLVector3 target) + public void LookAt(Vector3 position, Vector3 target) { Frame.LookAt(position, target); } - public void LookAt(LLVector3 position, LLVector3 target, LLVector3 upDirection) + public void LookAt(Vector3 position, Vector3 target, Vector3 upDirection) { Frame.LookAt(position, target, upDirection); } - public void SetPositionOrientation(LLVector3 position, float roll, float pitch, float yaw) + public void SetPositionOrientation(Vector3 position, float roll, float pitch, float yaw) { Frame.Origin = position; diff --git a/OpenMetaverse/AgentManagerMovement.cs b/OpenMetaverse/AgentManagerMovement.cs index 9f0fdbee..ddd372f5 100644 --- a/OpenMetaverse/AgentManagerMovement.cs +++ b/OpenMetaverse/AgentManagerMovement.cs @@ -433,23 +433,23 @@ namespace OpenMetaverse /// typing and editing public AgentState State = AgentState.None; /// - public LLQuaternion BodyRotation = LLQuaternion.Identity; + public Quaternion BodyRotation = Quaternion.Identity; /// - public LLQuaternion HeadRotation = LLQuaternion.Identity; + public Quaternion HeadRotation = Quaternion.Identity; #region Change tracking /// - private LLQuaternion LastBodyRotation; + private Quaternion LastBodyRotation; /// - private LLQuaternion LastHeadRotation; + private Quaternion LastHeadRotation; /// - private LLVector3 LastCameraCenter; + private Vector3 LastCameraCenter; /// - private LLVector3 LastCameraXAxis; + private Vector3 LastCameraXAxis; /// - private LLVector3 LastCameraYAxis; + private Vector3 LastCameraYAxis; /// - private LLVector3 LastCameraZAxis; + private Vector3 LastCameraZAxis; /// private float LastFar; #endregion Change tracking @@ -499,14 +499,14 @@ namespace OpenMetaverse /// This will also anchor the camera position on the avatar /// /// Region coordinates to turn toward - public bool TurnToward(LLVector3 target) + public bool TurnToward(Vector3 target) { if (Client.Settings.SEND_AGENT_UPDATES) { - LLVector3 myPos = Client.Self.SimPosition; - LLVector3 forward = new LLVector3(1, 0, 0); - LLVector3 offset = LLVector3.Norm(target - myPos); - LLQuaternion newRot = LLVector3.RotBetween(forward, offset); + Vector3 myPos = Client.Self.SimPosition; + Vector3 forward = new Vector3(1, 0, 0); + Vector3 offset = Vector3.Norm(target - myPos); + Quaternion newRot = Vector3.RotBetween(forward, offset); BodyRotation = newRot; HeadRotation = newRot; @@ -552,10 +552,10 @@ namespace OpenMetaverse /// Simulator to send the update to public void SendUpdate(bool reliable, Simulator simulator) { - LLVector3 origin = Camera.Position; - LLVector3 xAxis = Camera.LeftAxis; - LLVector3 yAxis = Camera.AtAxis; - LLVector3 zAxis = Camera.UpAxis; + Vector3 origin = Camera.Position; + Vector3 xAxis = Camera.LeftAxis; + Vector3 yAxis = Camera.AtAxis; + Vector3 zAxis = Camera.UpAxis; // Attempted to sort these in a rough order of how often they might change if (agentControls == 0 && @@ -628,8 +628,8 @@ namespace OpenMetaverse /// /// /// - public void SendManualUpdate(AgentManager.ControlFlags controlFlags, LLVector3 position, LLVector3 forwardAxis, - LLVector3 leftAxis, LLVector3 upAxis, LLQuaternion bodyRotation, LLQuaternion headRotation, float farClip, + public void SendManualUpdate(AgentManager.ControlFlags controlFlags, Vector3 position, Vector3 forwardAxis, + Vector3 leftAxis, Vector3 upAxis, Quaternion bodyRotation, Quaternion headRotation, float farClip, AgentFlags flags, AgentState state, bool reliable) { AgentUpdatePacket update = new AgentUpdatePacket(); diff --git a/OpenMetaverse/Animations.cs b/OpenMetaverse/Animations.cs index 53f0e3b2..a9394628 100644 --- a/OpenMetaverse/Animations.cs +++ b/OpenMetaverse/Animations.cs @@ -34,274 +34,274 @@ namespace OpenMetaverse public static class Animations { /// Agent with afraid expression on face - public readonly static LLUUID AFRAID = new LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca"); + public readonly static UUID AFRAID = new UUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca"); /// Agent aiming a bazooka (right handed) - public readonly static LLUUID AIM_BAZOOKA_R = new LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef"); + public readonly static UUID AIM_BAZOOKA_R = new UUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef"); /// Agent aiming a bow (left handed) - public readonly static LLUUID AIM_BOW_L = new LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506"); + public readonly static UUID AIM_BOW_L = new UUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506"); /// Agent aiming a hand gun (right handed) - public readonly static LLUUID AIM_HANDGUN_R = new LLUUID("3147d815-6338-b932-f011-16b56d9ac18b"); + public readonly static UUID AIM_HANDGUN_R = new UUID("3147d815-6338-b932-f011-16b56d9ac18b"); /// Agent aiming a rifle (right handed) - public readonly static LLUUID AIM_RIFLE_R = new LLUUID("ea633413-8006-180a-c3ba-96dd1d756720"); + public readonly static UUID AIM_RIFLE_R = new UUID("ea633413-8006-180a-c3ba-96dd1d756720"); /// Agent with angry expression on face - public readonly static LLUUID ANGRY = new LLUUID("5747a48e-073e-c331-f6f3-7c2149613d3e"); + public readonly static UUID ANGRY = new UUID("5747a48e-073e-c331-f6f3-7c2149613d3e"); /// Agent hunched over (away) - public readonly static LLUUID AWAY = new LLUUID("fd037134-85d4-f241-72c6-4f42164fedee"); + public readonly static UUID AWAY = new UUID("fd037134-85d4-f241-72c6-4f42164fedee"); /// Agent doing a backflip - public readonly static LLUUID BACKFLIP = new LLUUID("c4ca6188-9127-4f31-0158-23c4e2f93304"); + public readonly static UUID BACKFLIP = new UUID("c4ca6188-9127-4f31-0158-23c4e2f93304"); /// Agent laughing while holding belly - public readonly static LLUUID BELLY_LAUGH = new LLUUID("18b3a4b5-b463-bd48-e4b6-71eaac76c515"); + public readonly static UUID BELLY_LAUGH = new UUID("18b3a4b5-b463-bd48-e4b6-71eaac76c515"); /// Agent blowing a kiss - public readonly static LLUUID BLOW_KISS = new LLUUID("db84829b-462c-ee83-1e27-9bbee66bd624"); + public readonly static UUID BLOW_KISS = new UUID("db84829b-462c-ee83-1e27-9bbee66bd624"); /// Agent with bored expression on face - public readonly static LLUUID BORED = new LLUUID("b906c4ba-703b-1940-32a3-0c7f7d791510"); + public readonly static UUID BORED = new UUID("b906c4ba-703b-1940-32a3-0c7f7d791510"); /// Agent bowing to audience - public readonly static LLUUID BOW = new LLUUID("82e99230-c906-1403-4d9c-3889dd98daba"); + public readonly static UUID BOW = new UUID("82e99230-c906-1403-4d9c-3889dd98daba"); /// Agent brushing himself/herself off - public readonly static LLUUID BRUSH = new LLUUID("349a3801-54f9-bf2c-3bd0-1ac89772af01"); + public readonly static UUID BRUSH = new UUID("349a3801-54f9-bf2c-3bd0-1ac89772af01"); /// Agent in busy mode - public readonly static LLUUID BUSY = new LLUUID("efcf670c-2d18-8128-973a-034ebc806b67"); + public readonly static UUID BUSY = new UUID("efcf670c-2d18-8128-973a-034ebc806b67"); /// Agent clapping hands - public readonly static LLUUID CLAP = new LLUUID("9b0c1c4e-8ac7-7969-1494-28c874c4f668"); + public readonly static UUID CLAP = new UUID("9b0c1c4e-8ac7-7969-1494-28c874c4f668"); /// Agent doing a curtsey bow - public readonly static LLUUID COURTBOW = new LLUUID("9ba1c942-08be-e43a-fb29-16ad440efc50"); + public readonly static UUID COURTBOW = new UUID("9ba1c942-08be-e43a-fb29-16ad440efc50"); /// Agent crouching - public readonly static LLUUID CROUCH = new LLUUID("201f3fdf-cb1f-dbec-201f-7333e328ae7c"); + public readonly static UUID CROUCH = new UUID("201f3fdf-cb1f-dbec-201f-7333e328ae7c"); /// Agent crouching while walking - public readonly static LLUUID CROUCHWALK = new LLUUID("47f5f6fb-22e5-ae44-f871-73aaaf4a6022"); + public readonly static UUID CROUCHWALK = new UUID("47f5f6fb-22e5-ae44-f871-73aaaf4a6022"); /// Agent crying - public readonly static LLUUID CRY = new LLUUID("92624d3e-1068-f1aa-a5ec-8244585193ed"); + public readonly static UUID CRY = new UUID("92624d3e-1068-f1aa-a5ec-8244585193ed"); /// Agent unanimated with arms out (e.g. setting appearance) - public readonly static LLUUID CUSTOMIZE = new LLUUID("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53"); + public readonly static UUID CUSTOMIZE = new UUID("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53"); /// Agent re-animated after set appearance finished - public readonly static LLUUID CUSTOMIZE_DONE = new LLUUID("6883a61a-b27b-5914-a61e-dda118a9ee2c"); + public readonly static UUID CUSTOMIZE_DONE = new UUID("6883a61a-b27b-5914-a61e-dda118a9ee2c"); /// Agent dancing - public readonly static LLUUID DANCE1 = new LLUUID("b68a3d7c-de9e-fc87-eec8-543d787e5b0d"); + public readonly static UUID DANCE1 = new UUID("b68a3d7c-de9e-fc87-eec8-543d787e5b0d"); /// Agent dancing - public readonly static LLUUID DANCE2 = new LLUUID("928cae18-e31d-76fd-9cc9-2f55160ff818"); + public readonly static UUID DANCE2 = new UUID("928cae18-e31d-76fd-9cc9-2f55160ff818"); /// Agent dancing - public readonly static LLUUID DANCE3 = new LLUUID("30047778-10ea-1af7-6881-4db7a3a5a114"); + public readonly static UUID DANCE3 = new UUID("30047778-10ea-1af7-6881-4db7a3a5a114"); /// Agent dancing - public readonly static LLUUID DANCE4 = new LLUUID("951469f4-c7b2-c818-9dee-ad7eea8c30b7"); + public readonly static UUID DANCE4 = new UUID("951469f4-c7b2-c818-9dee-ad7eea8c30b7"); /// Agent dancing - public readonly static LLUUID DANCE5 = new LLUUID("4bd69a1d-1114-a0b4-625f-84e0a5237155"); + public readonly static UUID DANCE5 = new UUID("4bd69a1d-1114-a0b4-625f-84e0a5237155"); /// Agent dancing - public readonly static LLUUID DANCE6 = new LLUUID("cd28b69b-9c95-bb78-3f94-8d605ff1bb12"); + public readonly static UUID DANCE6 = new UUID("cd28b69b-9c95-bb78-3f94-8d605ff1bb12"); /// Agent dancing - public readonly static LLUUID DANCE7 = new LLUUID("a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6"); + public readonly static UUID DANCE7 = new UUID("a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6"); /// Agent dancing - public readonly static LLUUID DANCE8 = new LLUUID("b0dc417c-1f11-af36-2e80-7e7489fa7cdc"); + public readonly static UUID DANCE8 = new UUID("b0dc417c-1f11-af36-2e80-7e7489fa7cdc"); /// Agent on ground unanimated - public readonly static LLUUID DEAD = new LLUUID("57abaae6-1d17-7b1b-5f98-6d11a6411276"); + public readonly static UUID DEAD = new UUID("57abaae6-1d17-7b1b-5f98-6d11a6411276"); /// Agent boozing it up - public readonly static LLUUID DRINK = new LLUUID("0f86e355-dd31-a61c-fdb0-3a96b9aad05f"); + public readonly static UUID DRINK = new UUID("0f86e355-dd31-a61c-fdb0-3a96b9aad05f"); /// Agent with embarassed expression on face - public readonly static LLUUID EMBARRASSED = new LLUUID("514af488-9051-044a-b3fc-d4dbf76377c6"); + public readonly static UUID EMBARRASSED = new UUID("514af488-9051-044a-b3fc-d4dbf76377c6"); /// Agent with afraid expression on face - public readonly static LLUUID EXPRESS_AFRAID = new LLUUID("aa2df84d-cf8f-7218-527b-424a52de766e"); + public readonly static UUID EXPRESS_AFRAID = new UUID("aa2df84d-cf8f-7218-527b-424a52de766e"); /// Agent with angry expression on face - public readonly static LLUUID EXPRESS_ANGER = new LLUUID("1a03b575-9634-b62a-5767-3a679e81f4de"); + public readonly static UUID EXPRESS_ANGER = new UUID("1a03b575-9634-b62a-5767-3a679e81f4de"); /// Agent with bored expression on face - public readonly static LLUUID EXPRESS_BORED = new LLUUID("214aa6c1-ba6a-4578-f27c-ce7688f61d0d"); + public readonly static UUID EXPRESS_BORED = new UUID("214aa6c1-ba6a-4578-f27c-ce7688f61d0d"); /// Agent crying - public readonly static LLUUID EXPRESS_CRY = new LLUUID("d535471b-85bf-3b4d-a542-93bea4f59d33"); + public readonly static UUID EXPRESS_CRY = new UUID("d535471b-85bf-3b4d-a542-93bea4f59d33"); /// Agent showing disdain (dislike) for something - public readonly static LLUUID EXPRESS_DISDAIN = new LLUUID("d4416ff1-09d3-300f-4183-1b68a19b9fc1"); + public readonly static UUID EXPRESS_DISDAIN = new UUID("d4416ff1-09d3-300f-4183-1b68a19b9fc1"); /// Agent with embarassed expression on face - public readonly static LLUUID EXPRESS_EMBARRASSED = new LLUUID("0b8c8211-d78c-33e8-fa28-c51a9594e424"); + public readonly static UUID EXPRESS_EMBARRASSED = new UUID("0b8c8211-d78c-33e8-fa28-c51a9594e424"); /// Agent with frowning expression on face - public readonly static LLUUID EXPRESS_FROWN = new LLUUID("fee3df48-fa3d-1015-1e26-a205810e3001"); + public readonly static UUID EXPRESS_FROWN = new UUID("fee3df48-fa3d-1015-1e26-a205810e3001"); /// Agent with kissy face - public readonly static LLUUID EXPRESS_KISS = new LLUUID("1e8d90cc-a84e-e135-884c-7c82c8b03a14"); + public readonly static UUID EXPRESS_KISS = new UUID("1e8d90cc-a84e-e135-884c-7c82c8b03a14"); /// Agent expressing laughgter - public readonly static LLUUID EXPRESS_LAUGH = new LLUUID("62570842-0950-96f8-341c-809e65110823"); + public readonly static UUID EXPRESS_LAUGH = new UUID("62570842-0950-96f8-341c-809e65110823"); /// Agent with open mouth - public readonly static LLUUID EXPRESS_OPEN_MOUTH = new LLUUID("d63bc1f9-fc81-9625-a0c6-007176d82eb7"); + public readonly static UUID EXPRESS_OPEN_MOUTH = new UUID("d63bc1f9-fc81-9625-a0c6-007176d82eb7"); /// Agent with repulsed expression on face - public readonly static LLUUID EXPRESS_REPULSED = new LLUUID("f76cda94-41d4-a229-2872-e0296e58afe1"); + public readonly static UUID EXPRESS_REPULSED = new UUID("f76cda94-41d4-a229-2872-e0296e58afe1"); /// Agent expressing sadness - public readonly static LLUUID EXPRESS_SAD = new LLUUID("eb6ebfb2-a4b3-a19c-d388-4dd5c03823f7"); + public readonly static UUID EXPRESS_SAD = new UUID("eb6ebfb2-a4b3-a19c-d388-4dd5c03823f7"); /// Agent shrugging shoulders - public readonly static LLUUID EXPRESS_SHRUG = new LLUUID("a351b1bc-cc94-aac2-7bea-a7e6ebad15ef"); + public readonly static UUID EXPRESS_SHRUG = new UUID("a351b1bc-cc94-aac2-7bea-a7e6ebad15ef"); /// Agent with a smile - public readonly static LLUUID EXPRESS_SMILE = new LLUUID("b7c7c833-e3d3-c4e3-9fc0-131237446312"); + public readonly static UUID EXPRESS_SMILE = new UUID("b7c7c833-e3d3-c4e3-9fc0-131237446312"); /// Agent expressing surprise - public readonly static LLUUID EXPRESS_SURPRISE = new LLUUID("728646d9-cc79-08b2-32d6-937f0a835c24"); + public readonly static UUID EXPRESS_SURPRISE = new UUID("728646d9-cc79-08b2-32d6-937f0a835c24"); /// Agent sticking tongue out - public readonly static LLUUID EXPRESS_TONGUE_OUT = new LLUUID("835965c6-7f2f-bda2-5deb-2478737f91bf"); + public readonly static UUID EXPRESS_TONGUE_OUT = new UUID("835965c6-7f2f-bda2-5deb-2478737f91bf"); /// Agent with big toothy smile - public readonly static LLUUID EXPRESS_TOOTHSMILE = new LLUUID("b92ec1a5-e7ce-a76b-2b05-bcdb9311417e"); + public readonly static UUID EXPRESS_TOOTHSMILE = new UUID("b92ec1a5-e7ce-a76b-2b05-bcdb9311417e"); /// Agent winking - public readonly static LLUUID EXPRESS_WINK = new LLUUID("da020525-4d94-59d6-23d7-81fdebf33148"); + public readonly static UUID EXPRESS_WINK = new UUID("da020525-4d94-59d6-23d7-81fdebf33148"); /// Agent expressing worry - public readonly static LLUUID EXPRESS_WORRY = new LLUUID("9c05e5c7-6f07-6ca4-ed5a-b230390c3950"); + public readonly static UUID EXPRESS_WORRY = new UUID("9c05e5c7-6f07-6ca4-ed5a-b230390c3950"); /// Agent falling down - public readonly static LLUUID FALLDOWN = new LLUUID("666307d9-a860-572d-6fd4-c3ab8865c094"); + public readonly static UUID FALLDOWN = new UUID("666307d9-a860-572d-6fd4-c3ab8865c094"); /// Agent walking (feminine version) - public readonly static LLUUID FEMALE_WALK = new LLUUID("f5fc7433-043d-e819-8298-f519a119b688"); + public readonly static UUID FEMALE_WALK = new UUID("f5fc7433-043d-e819-8298-f519a119b688"); /// Agent wagging finger (disapproval) - public readonly static LLUUID FINGER_WAG = new LLUUID("c1bc7f36-3ba0-d844-f93c-93be945d644f"); + public readonly static UUID FINGER_WAG = new UUID("c1bc7f36-3ba0-d844-f93c-93be945d644f"); /// I'm not sure I want to know - public readonly static LLUUID FIST_PUMP = new LLUUID("7db00ccd-f380-f3ee-439d-61968ec69c8a"); + public readonly static UUID FIST_PUMP = new UUID("7db00ccd-f380-f3ee-439d-61968ec69c8a"); /// Agent in superman position - public readonly static LLUUID FLY = new LLUUID("aec4610c-757f-bc4e-c092-c6e9caf18daf"); + public readonly static UUID FLY = new UUID("aec4610c-757f-bc4e-c092-c6e9caf18daf"); /// Agent in superman position - public readonly static LLUUID FLYSLOW = new LLUUID("2b5a38b2-5e00-3a97-a495-4c826bc443e6"); + public readonly static UUID FLYSLOW = new UUID("2b5a38b2-5e00-3a97-a495-4c826bc443e6"); /// Agent greeting another - public readonly static LLUUID HELLO = new LLUUID("9b29cd61-c45b-5689-ded2-91756b8d76a9"); + public readonly static UUID HELLO = new UUID("9b29cd61-c45b-5689-ded2-91756b8d76a9"); /// Agent holding bazooka (right handed) - public readonly static LLUUID HOLD_BAZOOKA_R = new LLUUID("ef62d355-c815-4816-2474-b1acc21094a6"); + public readonly static UUID HOLD_BAZOOKA_R = new UUID("ef62d355-c815-4816-2474-b1acc21094a6"); /// Agent holding a bow (left handed) - public readonly static LLUUID HOLD_BOW_L = new LLUUID("8b102617-bcba-037b-86c1-b76219f90c88"); + public readonly static UUID HOLD_BOW_L = new UUID("8b102617-bcba-037b-86c1-b76219f90c88"); /// Agent holding a handgun (right handed) - public readonly static LLUUID HOLD_HANDGUN_R = new LLUUID("efdc1727-8b8a-c800-4077-975fc27ee2f2"); + public readonly static UUID HOLD_HANDGUN_R = new UUID("efdc1727-8b8a-c800-4077-975fc27ee2f2"); /// Agent holding a rifle (right handed) - public readonly static LLUUID HOLD_RIFLE_R = new LLUUID("3d94bad0-c55b-7dcc-8763-033c59405d33"); + public readonly static UUID HOLD_RIFLE_R = new UUID("3d94bad0-c55b-7dcc-8763-033c59405d33"); /// Agent throwing an object (right handed) - public readonly static LLUUID HOLD_THROW_R = new LLUUID("7570c7b5-1f22-56dd-56ef-a9168241bbb6"); + public readonly static UUID HOLD_THROW_R = new UUID("7570c7b5-1f22-56dd-56ef-a9168241bbb6"); /// Agent in static hover - public readonly static LLUUID HOVER = new LLUUID("4ae8016b-31b9-03bb-c401-b1ea941db41d"); + public readonly static UUID HOVER = new UUID("4ae8016b-31b9-03bb-c401-b1ea941db41d"); /// Agent hovering downward - public readonly static LLUUID HOVER_DOWN = new LLUUID("20f063ea-8306-2562-0b07-5c853b37b31e"); + public readonly static UUID HOVER_DOWN = new UUID("20f063ea-8306-2562-0b07-5c853b37b31e"); /// Agent hovering upward - public readonly static LLUUID HOVER_UP = new LLUUID("62c5de58-cb33-5743-3d07-9e4cd4352864"); + public readonly static UUID HOVER_UP = new UUID("62c5de58-cb33-5743-3d07-9e4cd4352864"); /// Agent being impatient - public readonly static LLUUID IMPATIENT = new LLUUID("5ea3991f-c293-392e-6860-91dfa01278a3"); + public readonly static UUID IMPATIENT = new UUID("5ea3991f-c293-392e-6860-91dfa01278a3"); /// Agent jumping - public readonly static LLUUID JUMP = new LLUUID("2305bd75-1ca9-b03b-1faa-b176b8a8c49e"); + public readonly static UUID JUMP = new UUID("2305bd75-1ca9-b03b-1faa-b176b8a8c49e"); /// Agent jumping with fervor - public readonly static LLUUID JUMP_FOR_JOY = new LLUUID("709ea28e-1573-c023-8bf8-520c8bc637fa"); + public readonly static UUID JUMP_FOR_JOY = new UUID("709ea28e-1573-c023-8bf8-520c8bc637fa"); /// Agent point to lips then rear end - public readonly static LLUUID KISS_MY_BUTT = new LLUUID("19999406-3a3a-d58c-a2ac-d72e555dcf51"); + public readonly static UUID KISS_MY_BUTT = new UUID("19999406-3a3a-d58c-a2ac-d72e555dcf51"); /// Agent landing from jump, finished flight, etc - public readonly static LLUUID LAND = new LLUUID("7a17b059-12b2-41b1-570a-186368b6aa6f"); + public readonly static UUID LAND = new UUID("7a17b059-12b2-41b1-570a-186368b6aa6f"); /// Agent laughing - public readonly static LLUUID LAUGH_SHORT = new LLUUID("ca5b3f14-3194-7a2b-c894-aa699b718d1f"); + public readonly static UUID LAUGH_SHORT = new UUID("ca5b3f14-3194-7a2b-c894-aa699b718d1f"); /// Agent landing from jump, finished flight, etc - public readonly static LLUUID MEDIUM_LAND = new LLUUID("f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57"); + public readonly static UUID MEDIUM_LAND = new UUID("f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57"); /// Agent sitting on a motorcycle - public readonly static LLUUID MOTORCYCLE_SIT = new LLUUID("08464f78-3a8e-2944-cba5-0c94aff3af29"); + public readonly static UUID MOTORCYCLE_SIT = new UUID("08464f78-3a8e-2944-cba5-0c94aff3af29"); /// - public readonly static LLUUID MUSCLE_BEACH = new LLUUID("315c3a41-a5f3-0ba4-27da-f893f769e69b"); + public readonly static UUID MUSCLE_BEACH = new UUID("315c3a41-a5f3-0ba4-27da-f893f769e69b"); /// Agent moving head side to side - public readonly static LLUUID NO = new LLUUID("5a977ed9-7f72-44e9-4c4c-6e913df8ae74"); + public readonly static UUID NO = new UUID("5a977ed9-7f72-44e9-4c4c-6e913df8ae74"); /// Agent moving head side to side with unhappy expression - public readonly static LLUUID NO_UNHAPPY = new LLUUID("d83fa0e5-97ed-7eb2-e798-7bd006215cb4"); + public readonly static UUID NO_UNHAPPY = new UUID("d83fa0e5-97ed-7eb2-e798-7bd006215cb4"); /// Agent taunting another - public readonly static LLUUID NYAH_NYAH = new LLUUID("f061723d-0a18-754f-66ee-29a44795a32f"); + public readonly static UUID NYAH_NYAH = new UUID("f061723d-0a18-754f-66ee-29a44795a32f"); /// - public readonly static LLUUID ONETWO_PUNCH = new LLUUID("eefc79be-daae-a239-8c04-890f5d23654a"); + public readonly static UUID ONETWO_PUNCH = new UUID("eefc79be-daae-a239-8c04-890f5d23654a"); /// Agent giving peace sign - public readonly static LLUUID PEACE = new LLUUID("b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9"); + public readonly static UUID PEACE = new UUID("b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9"); /// Agent pointing at self - public readonly static LLUUID POINT_ME = new LLUUID("17c024cc-eef2-f6a0-3527-9869876d7752"); + public readonly static UUID POINT_ME = new UUID("17c024cc-eef2-f6a0-3527-9869876d7752"); /// Agent pointing at another - public readonly static LLUUID POINT_YOU = new LLUUID("ec952cca-61ef-aa3b-2789-4d1344f016de"); + public readonly static UUID POINT_YOU = new UUID("ec952cca-61ef-aa3b-2789-4d1344f016de"); /// Agent preparing for jump (bending knees) - public readonly static LLUUID PRE_JUMP = new LLUUID("7a4e87fe-de39-6fcb-6223-024b00893244"); + public readonly static UUID PRE_JUMP = new UUID("7a4e87fe-de39-6fcb-6223-024b00893244"); /// Agent punching with left hand - public readonly static LLUUID PUNCH_LEFT = new LLUUID("f3300ad9-3462-1d07-2044-0fef80062da0"); + public readonly static UUID PUNCH_LEFT = new UUID("f3300ad9-3462-1d07-2044-0fef80062da0"); /// Agent punching with right hand - public readonly static LLUUID PUNCH_RIGHT = new LLUUID("c8e42d32-7310-6906-c903-cab5d4a34656"); + public readonly static UUID PUNCH_RIGHT = new UUID("c8e42d32-7310-6906-c903-cab5d4a34656"); /// Agent acting repulsed - public readonly static LLUUID REPULSED = new LLUUID("36f81a92-f076-5893-dc4b-7c3795e487cf"); + public readonly static UUID REPULSED = new UUID("36f81a92-f076-5893-dc4b-7c3795e487cf"); /// Agent trying to be Chuck Norris - public readonly static LLUUID ROUNDHOUSE_KICK = new LLUUID("49aea43b-5ac3-8a44-b595-96100af0beda"); + public readonly static UUID ROUNDHOUSE_KICK = new UUID("49aea43b-5ac3-8a44-b595-96100af0beda"); /// Rocks, Paper, Scissors 1, 2, 3 - public readonly static LLUUID RPS_COUNTDOWN = new LLUUID("35db4f7e-28c2-6679-cea9-3ee108f7fc7f"); + public readonly static UUID RPS_COUNTDOWN = new UUID("35db4f7e-28c2-6679-cea9-3ee108f7fc7f"); /// Agent with hand flat over other hand - public readonly static LLUUID RPS_PAPER = new LLUUID("0836b67f-7f7b-f37b-c00a-460dc1521f5a"); + public readonly static UUID RPS_PAPER = new UUID("0836b67f-7f7b-f37b-c00a-460dc1521f5a"); /// Agent with fist over other hand - public readonly static LLUUID RPS_ROCK = new LLUUID("42dd95d5-0bc6-6392-f650-777304946c0f"); + public readonly static UUID RPS_ROCK = new UUID("42dd95d5-0bc6-6392-f650-777304946c0f"); /// Agent with two fingers spread over other hand - public readonly static LLUUID RPS_SCISSORS = new LLUUID("16803a9f-5140-e042-4d7b-d28ba247c325"); + public readonly static UUID RPS_SCISSORS = new UUID("16803a9f-5140-e042-4d7b-d28ba247c325"); /// Agent running - public readonly static LLUUID RUN = new LLUUID("05ddbff8-aaa9-92a1-2b74-8fe77a29b445"); + public readonly static UUID RUN = new UUID("05ddbff8-aaa9-92a1-2b74-8fe77a29b445"); /// Agent appearing sad - public readonly static LLUUID SAD = new LLUUID("0eb702e2-cc5a-9a88-56a5-661a55c0676a"); + public readonly static UUID SAD = new UUID("0eb702e2-cc5a-9a88-56a5-661a55c0676a"); /// Agent saluting - public readonly static LLUUID SALUTE = new LLUUID("cd7668a6-7011-d7e2-ead8-fc69eff1a104"); + public readonly static UUID SALUTE = new UUID("cd7668a6-7011-d7e2-ead8-fc69eff1a104"); /// Agent shooting bow (left handed) - public readonly static LLUUID SHOOT_BOW_L = new LLUUID("e04d450d-fdb5-0432-fd68-818aaf5935f8"); + public readonly static UUID SHOOT_BOW_L = new UUID("e04d450d-fdb5-0432-fd68-818aaf5935f8"); /// Agent cupping mouth as if shouting - public readonly static LLUUID SHOUT = new LLUUID("6bd01860-4ebd-127a-bb3d-d1427e8e0c42"); + public readonly static UUID SHOUT = new UUID("6bd01860-4ebd-127a-bb3d-d1427e8e0c42"); /// Agent shrugging shoulders - public readonly static LLUUID SHRUG = new LLUUID("70ea714f-3a97-d742-1b01-590a8fcd1db5"); + public readonly static UUID SHRUG = new UUID("70ea714f-3a97-d742-1b01-590a8fcd1db5"); /// Agent in sit position - public readonly static LLUUID SIT = new LLUUID("1a5fe8ac-a804-8a5d-7cbd-56bd83184568"); + public readonly static UUID SIT = new UUID("1a5fe8ac-a804-8a5d-7cbd-56bd83184568"); /// Agent in sit position (feminine) - public readonly static LLUUID SIT_FEMALE = new LLUUID("b1709c8d-ecd3-54a1-4f28-d55ac0840782"); + public readonly static UUID SIT_FEMALE = new UUID("b1709c8d-ecd3-54a1-4f28-d55ac0840782"); /// Agent in sit position (generic) - public readonly static LLUUID SIT_GENERIC = new LLUUID("245f3c54-f1c0-bf2e-811f-46d8eeb386e7"); + public readonly static UUID SIT_GENERIC = new UUID("245f3c54-f1c0-bf2e-811f-46d8eeb386e7"); /// Agent sitting on ground - public readonly static LLUUID SIT_GROUND = new LLUUID("1c7600d6-661f-b87b-efe2-d7421eb93c86"); + public readonly static UUID SIT_GROUND = new UUID("1c7600d6-661f-b87b-efe2-d7421eb93c86"); /// Agent sitting on ground - public readonly static LLUUID SIT_GROUND_staticRAINED = new LLUUID("1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e"); + public readonly static UUID SIT_GROUND_staticRAINED = new UUID("1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e"); /// - public readonly static LLUUID SIT_TO_STAND = new LLUUID("a8dee56f-2eae-9e7a-05a2-6fb92b97e21e"); + public readonly static UUID SIT_TO_STAND = new UUID("a8dee56f-2eae-9e7a-05a2-6fb92b97e21e"); /// Agent sleeping on side - public readonly static LLUUID SLEEP = new LLUUID("f2bed5f9-9d44-39af-b0cd-257b2a17fe40"); + public readonly static UUID SLEEP = new UUID("f2bed5f9-9d44-39af-b0cd-257b2a17fe40"); /// Agent smoking - public readonly static LLUUID SMOKE_IDLE = new LLUUID("d2f2ee58-8ad1-06c9-d8d3-3827ba31567a"); + public readonly static UUID SMOKE_IDLE = new UUID("d2f2ee58-8ad1-06c9-d8d3-3827ba31567a"); /// Agent inhaling smoke - public readonly static LLUUID SMOKE_INHALE = new LLUUID("6802d553-49da-0778-9f85-1599a2266526"); + public readonly static UUID SMOKE_INHALE = new UUID("6802d553-49da-0778-9f85-1599a2266526"); /// - public readonly static LLUUID SMOKE_THROW_DOWN = new LLUUID("0a9fb970-8b44-9114-d3a9-bf69cfe804d6"); + public readonly static UUID SMOKE_THROW_DOWN = new UUID("0a9fb970-8b44-9114-d3a9-bf69cfe804d6"); /// Agent taking a picture - public readonly static LLUUID SNAPSHOT = new LLUUID("eae8905b-271a-99e2-4c0e-31106afd100c"); + public readonly static UUID SNAPSHOT = new UUID("eae8905b-271a-99e2-4c0e-31106afd100c"); /// Agent standing - public readonly static LLUUID STAND = new LLUUID("2408fe9e-df1d-1d7d-f4ff-1384fa7b350f"); + public readonly static UUID STAND = new UUID("2408fe9e-df1d-1d7d-f4ff-1384fa7b350f"); /// Agent standing up - public readonly static LLUUID STANDUP = new LLUUID("3da1d753-028a-5446-24f3-9c9b856d9422"); + public readonly static UUID STANDUP = new UUID("3da1d753-028a-5446-24f3-9c9b856d9422"); /// Agent standing - public readonly static LLUUID STAND_1 = new LLUUID("15468e00-3400-bb66-cecc-646d7c14458e"); + public readonly static UUID STAND_1 = new UUID("15468e00-3400-bb66-cecc-646d7c14458e"); /// Agent standing - public readonly static LLUUID STAND_2 = new LLUUID("370f3a20-6ca6-9971-848c-9a01bc42ae3c"); + public readonly static UUID STAND_2 = new UUID("370f3a20-6ca6-9971-848c-9a01bc42ae3c"); /// Agent standing - public readonly static LLUUID STAND_3 = new LLUUID("42b46214-4b44-79ae-deb8-0df61424ff4b"); + public readonly static UUID STAND_3 = new UUID("42b46214-4b44-79ae-deb8-0df61424ff4b"); /// Agent standing - public readonly static LLUUID STAND_4 = new LLUUID("f22fed8b-a5ed-2c93-64d5-bdd8b93c889f"); + public readonly static UUID STAND_4 = new UUID("f22fed8b-a5ed-2c93-64d5-bdd8b93c889f"); /// Agent stretching - public readonly static LLUUID STRETCH = new LLUUID("80700431-74ec-a008-14f8-77575e73693f"); + public readonly static UUID STRETCH = new UUID("80700431-74ec-a008-14f8-77575e73693f"); /// Agent in stride (fast walk) - public readonly static LLUUID STRIDE = new LLUUID("1cb562b0-ba21-2202-efb3-30f82cdf9595"); + public readonly static UUID STRIDE = new UUID("1cb562b0-ba21-2202-efb3-30f82cdf9595"); /// Agent surfing - public readonly static LLUUID SURF = new LLUUID("41426836-7437-7e89-025d-0aa4d10f1d69"); + public readonly static UUID SURF = new UUID("41426836-7437-7e89-025d-0aa4d10f1d69"); /// Agent acting surprised - public readonly static LLUUID SURPRISE = new LLUUID("313b9881-4302-73c0-c7d0-0e7a36b6c224"); + public readonly static UUID SURPRISE = new UUID("313b9881-4302-73c0-c7d0-0e7a36b6c224"); /// Agent striking with a sword - public readonly static LLUUID SWORD_STRIKE = new LLUUID("85428680-6bf9-3e64-b489-6f81087c24bd"); + public readonly static UUID SWORD_STRIKE = new UUID("85428680-6bf9-3e64-b489-6f81087c24bd"); /// Agent talking (lips moving) - public readonly static LLUUID TALK = new LLUUID("5c682a95-6da4-a463-0bf6-0f5b7be129d1"); + public readonly static UUID TALK = new UUID("5c682a95-6da4-a463-0bf6-0f5b7be129d1"); /// Agent throwing a tantrum - public readonly static LLUUID TANTRUM = new LLUUID("11000694-3f41-adc2-606b-eee1d66f3724"); + public readonly static UUID TANTRUM = new UUID("11000694-3f41-adc2-606b-eee1d66f3724"); /// Agent throwing an object (right handed) - public readonly static LLUUID THROW_R = new LLUUID("aa134404-7dac-7aca-2cba-435f9db875ca"); + public readonly static UUID THROW_R = new UUID("aa134404-7dac-7aca-2cba-435f9db875ca"); /// Agent trying on a shirt - public readonly static LLUUID TRYON_SHIRT = new LLUUID("83ff59fe-2346-f236-9009-4e3608af64c1"); + public readonly static UUID TRYON_SHIRT = new UUID("83ff59fe-2346-f236-9009-4e3608af64c1"); /// Agent turning to the left - public readonly static LLUUID TURNLEFT = new LLUUID("56e0ba0d-4a9f-7f27-6117-32f2ebbf6135"); + public readonly static UUID TURNLEFT = new UUID("56e0ba0d-4a9f-7f27-6117-32f2ebbf6135"); /// Agent turning to the right - public readonly static LLUUID TURNRIGHT = new LLUUID("2d6daa51-3192-6794-8e2e-a15f8338ec30"); + public readonly static UUID TURNRIGHT = new UUID("2d6daa51-3192-6794-8e2e-a15f8338ec30"); /// Agent typing - public readonly static LLUUID TYPE = new LLUUID("c541c47f-e0c0-058b-ad1a-d6ae3a4584d9"); + public readonly static UUID TYPE = new UUID("c541c47f-e0c0-058b-ad1a-d6ae3a4584d9"); /// Agent walking - public readonly static LLUUID WALK = new LLUUID("6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0"); + public readonly static UUID WALK = new UUID("6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0"); /// Agent whispering - public readonly static LLUUID WHISPER = new LLUUID("7693f268-06c7-ea71-fa21-2b30d6533f8f"); + public readonly static UUID WHISPER = new UUID("7693f268-06c7-ea71-fa21-2b30d6533f8f"); /// Agent whispering with fingers in mouth - public readonly static LLUUID WHISTLE = new LLUUID("b1ed7982-c68e-a982-7561-52a88a5298c0"); + public readonly static UUID WHISTLE = new UUID("b1ed7982-c68e-a982-7561-52a88a5298c0"); /// Agent winking - public readonly static LLUUID WINK = new LLUUID("869ecdad-a44b-671e-3266-56aef2e3ac2e"); + public readonly static UUID WINK = new UUID("869ecdad-a44b-671e-3266-56aef2e3ac2e"); /// Agent winking - public readonly static LLUUID WINK_HOLLYWOOD = new LLUUID("c0c4030f-c02b-49de-24ba-2331f43fe41c"); + public readonly static UUID WINK_HOLLYWOOD = new UUID("c0c4030f-c02b-49de-24ba-2331f43fe41c"); /// Agent worried - public readonly static LLUUID WORRY = new LLUUID("9f496bd2-589a-709f-16cc-69bf7df1d36c"); + public readonly static UUID WORRY = new UUID("9f496bd2-589a-709f-16cc-69bf7df1d36c"); /// Agent nodding yes - public readonly static LLUUID YES = new LLUUID("15dd911d-be82-2856-26db-27659b142875"); + public readonly static UUID YES = new UUID("15dd911d-be82-2856-26db-27659b142875"); /// Agent nodding yes with happy face - public readonly static LLUUID YES_HAPPY = new LLUUID("b8c8b2a3-9008-1771-3bfc-90924955ab2d"); + public readonly static UUID YES_HAPPY = new UUID("b8c8b2a3-9008-1771-3bfc-90924955ab2d"); /// Agent floating with legs and arms crossed - public readonly static LLUUID YOGA_FLOAT = new LLUUID("42ecd00b-9947-a97c-400a-bbc9174c7aeb"); + public readonly static UUID YOGA_FLOAT = new UUID("42ecd00b-9947-a97c-400a-bbc9174c7aeb"); } } diff --git a/OpenMetaverse/AppearanceManager.cs b/OpenMetaverse/AppearanceManager.cs index 2363f3e8..c776b316 100644 --- a/OpenMetaverse/AppearanceManager.cs +++ b/OpenMetaverse/AppearanceManager.cs @@ -126,17 +126,17 @@ namespace OpenMetaverse }; /// Secret values to finalize the cache check hashes for each /// bake - public static readonly LLUUID[] BAKED_TEXTURE_HASH = new LLUUID[] + public static readonly UUID[] BAKED_TEXTURE_HASH = new UUID[] { - new LLUUID("18ded8d6-bcfc-e415-8539-944c0f5ea7a6"), - new LLUUID("338c29e3-3024-4dbb-998d-7c04cf4fa88f"), - new LLUUID("91b4a2c7-1b1a-ba16-9a16-1f8f8dcc1c3f"), - new LLUUID("b2cf28af-b840-1071-3c6a-78085d8128b5"), - new LLUUID("ea800387-ea1a-14e0-56cb-24f2022f969a") + new UUID("18ded8d6-bcfc-e415-8539-944c0f5ea7a6"), + new UUID("338c29e3-3024-4dbb-998d-7c04cf4fa88f"), + new UUID("91b4a2c7-1b1a-ba16-9a16-1f8f8dcc1c3f"), + new UUID("b2cf28af-b840-1071-3c6a-78085d8128b5"), + new UUID("ea800387-ea1a-14e0-56cb-24f2022f969a") }; /// Default avatar texture, used to detect when a custom /// texture is not set for a face - public static readonly LLUUID DEFAULT_AVATAR_TEXTURE = new LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); + public static readonly UUID DEFAULT_AVATAR_TEXTURE = new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); private GridClient Client; @@ -147,14 +147,14 @@ namespace OpenMetaverse /// public InternalDictionary Wearables = new InternalDictionary(); // As wearable assets are downloaded and decoded, the textures are added to this array - private LLUUID[] AgentTextures = new LLUUID[AVATAR_TEXTURE_COUNT]; + private UUID[] AgentTextures = new UUID[AVATAR_TEXTURE_COUNT]; protected struct PendingAssetDownload { - public LLUUID Id; + public UUID Id; public AssetType Type; - public PendingAssetDownload(LLUUID id, AssetType type) + public PendingAssetDownload(UUID id, AssetType type) { Id = id; Type = type; @@ -165,11 +165,11 @@ namespace OpenMetaverse // and started when the previous one completes private Queue AssetDownloads = new Queue(); // A list of all the images we are currently downloading, prior to baking - private Dictionary ImageDownloads = new Dictionary(); + private Dictionary ImageDownloads = new Dictionary(); // A list of all the bakes we need to complete private Dictionary PendingBakes = new Dictionary(BAKED_TEXTURE_COUNT); // A list of all the uploads that are in progress - private Dictionary PendingUploads = new Dictionary(BAKED_TEXTURE_COUNT); + private Dictionary PendingUploads = new Dictionary(BAKED_TEXTURE_COUNT); // Whether the handler for our current wearable list should automatically start downloading the assets //private bool DownloadWearables = false; private static int CacheCheckSerialNum = 1; //FIXME @@ -194,7 +194,7 @@ namespace OpenMetaverse // Initialize AgentTextures to zero UUIDs for (int i = 0; i < AgentTextures.Length; i++) - AgentTextures[i] = LLUUID.Zero; + AgentTextures[i] = UUID.Zero; Client.Network.RegisterCallback(PacketType.AgentWearablesUpdate, new NetworkManager.PacketCallback(AgentWearablesUpdateHandler)); Client.Network.RegisterCallback(PacketType.AgentCachedTextureResponse, new NetworkManager.PacketCallback(AgentCachedTextureResponseHandler)); @@ -230,14 +230,14 @@ namespace OpenMetaverse /// /// the of the asset /// The of the WearableType - public LLUUID GetWearableAsset(WearableType type) + public UUID GetWearableAsset(WearableType type) { WearableData wearable; if (Wearables.TryGetValue(type, out wearable)) return wearable.Item.AssetUUID; else - return LLUUID.Zero; + return UUID.Zero; } /// @@ -321,7 +321,7 @@ namespace OpenMetaverse /// Replace the current outfit with a folder and set appearance /// /// UUID of the inventory folder to wear - public void WearOutfit(LLUUID folder) + public void WearOutfit(UUID folder) { WearOutfit(folder, true); } @@ -340,7 +340,7 @@ namespace OpenMetaverse /// /// Folder containing the new outfit /// Whether to bake the avatar textures or not - public void WearOutfit(LLUUID folder, bool bake) + public void WearOutfit(UUID folder, bool bake) { _wearOutfitParams = new WearParams(folder, bake); Thread appearanceThread = new Thread(new ThreadStart(StartWearOutfitFolder)); @@ -376,7 +376,7 @@ namespace OpenMetaverse private bool GetFolderWearables(object _folder, out List wearables, out List attachments) { - LLUUID folder; + UUID folder; wearables = null; attachments = null; @@ -387,14 +387,14 @@ namespace OpenMetaverse folder = Client.Inventory.FindObjectByPath( Client.Inventory.Store.RootFolder.UUID, Client.Self.AgentID, String.Join("/", path), 1000 * 20); - if (folder == LLUUID.Zero) + if (folder == UUID.Zero) { Logger.Log("Outfit path " + path + " not found", Helpers.LogLevel.Error, Client); return false; } } else - folder = (LLUUID)_folder; + folder = (UUID)_folder; wearables = new List(); attachments = new List(); @@ -476,7 +476,7 @@ namespace OpenMetaverse attachmentsPacket.AgentData.AgentID = Client.Self.AgentID; attachmentsPacket.AgentData.SessionID = Client.Self.SessionID; - attachmentsPacket.HeaderData.CompoundMsgID = LLUUID.Random(); + attachmentsPacket.HeaderData.CompoundMsgID = UUID.Random(); attachmentsPacket.HeaderData.FirstDetachAll = true; attachmentsPacket.HeaderData.TotalObjects = (byte)attachments.Count; @@ -546,7 +546,7 @@ namespace OpenMetaverse /// The of the attachment /// the on the avatar /// to attach the item to - public void Attach(LLUUID itemID, LLUUID ownerID, string name, string description, + public void Attach(UUID itemID, UUID ownerID, string name, string description, Permissions perms, uint itemFlags, AttachmentPoint attachPoint) { // TODO: At some point it might be beneficial to have AppearanceManager track what we @@ -583,7 +583,7 @@ namespace OpenMetaverse /// Detach an Item from avatar by items /// /// The items ID to detach - public void Detach(LLUUID itemID) + public void Detach(UUID itemID) { DetachAttachmentIntoInvPacket detach = new DetachAttachmentIntoInvPacket(); detach.ObjectData.AgentID = Client.Self.AgentID; @@ -598,7 +598,7 @@ namespace OpenMetaverse lock (AgentTextures) { for (int i = 0; i < AgentTextures.Length; i++) - AgentTextures[i] = LLUUID.Zero; + AgentTextures[i] = UUID.Zero; } // Register an asset download callback to get wearable data @@ -651,7 +651,7 @@ namespace OpenMetaverse if (face == null) { // If the texture is LLUUID.Zero the face should be null - if (AgentTextures[i] != LLUUID.Zero) + if (AgentTextures[i] != UUID.Zero) { match = false; break; @@ -709,7 +709,7 @@ namespace OpenMetaverse { Logger.DebugLog("RequestCachedBakes()", Client); - List> hashes = new List>(); + List> hashes = new List>(); AgentCachedTexturePacket cache = new AgentCachedTexturePacket(); cache.AgentData.AgentID = Client.Self.AgentID; @@ -721,27 +721,27 @@ namespace OpenMetaverse { // Don't do a cache request for a skirt bake if we're not wearing a skirt if (bakedIndex == (int)BakeType.Skirt && - (!Wearables.ContainsKey(WearableType.Skirt) || Wearables.Dictionary[WearableType.Skirt].Asset.AssetID == LLUUID.Zero)) + (!Wearables.ContainsKey(WearableType.Skirt) || Wearables.Dictionary[WearableType.Skirt].Asset.AssetID == UUID.Zero)) continue; - LLUUID hash = new LLUUID(); + UUID hash = new UUID(); for (int wearableIndex = 0; wearableIndex < WEARABLES_PER_LAYER; wearableIndex++) { WearableType type = WEARABLE_BAKE_MAP[bakedIndex][wearableIndex]; - LLUUID assetID = GetWearableAsset(type); + UUID assetID = GetWearableAsset(type); // Build a hash of all the texture asset IDs in this baking layer - if (assetID != LLUUID.Zero) hash ^= assetID; + if (assetID != UUID.Zero) hash ^= assetID; } - if (hash != LLUUID.Zero) + if (hash != UUID.Zero) { // Hash with our secret value for this baked layer hash ^= BAKED_TEXTURE_HASH[bakedIndex]; // Add this to the list of hashes to send out - hashes.Add(new KeyValuePair(bakedIndex, hash)); + hashes.Add(new KeyValuePair(bakedIndex, hash)); } } @@ -792,7 +792,7 @@ namespace OpenMetaverse for (int i = 0; i < update.WearableData.Length; i++) { - if (update.WearableData[i].AssetID != LLUUID.Zero) + if (update.WearableData[i].AssetID != UUID.Zero) { WearableType type = (WearableType)update.WearableData[i].WearableType; WearableData data = new WearableData(); @@ -889,7 +889,7 @@ namespace OpenMetaverse { for (uint i = 0; i < AgentTextures.Length; i++) { - if (AgentTextures[i] != LLUUID.Zero) + if (AgentTextures[i] != UUID.Zero) { LLObject.TextureEntryFace face = te.CreateFace(i); face.TextureID = AgentTextures[i]; @@ -901,7 +901,7 @@ namespace OpenMetaverse { if (data.Asset != null) { - foreach (KeyValuePair texture in data.Asset.Textures) + foreach (KeyValuePair texture in data.Asset.Textures) { LLObject.TextureEntryFace face = te.CreateFace((uint)texture.Key); face.TextureID = texture.Value; @@ -929,7 +929,7 @@ namespace OpenMetaverse (AgentSizeVPHeight * .12022) + (AgentSizeVPHeadSize * .01117) + (AgentSizeVPNeckLength * .038) + (AgentSizeVPHeelHeight * .08) + (AgentSizeVPPlatformHeight * .07); - set.AgentData.Size = new LLVector3(0.45f, 0.6f, (float)AgentHeight); + set.AgentData.Size = new Vector3(0.45f, 0.6f, (float)AgentHeight); // TODO: Account for not having all the textures baked yet set.WearableData = new AgentSetAppearancePacket.WearableDataBlock[BAKED_TEXTURE_COUNT]; @@ -937,18 +937,18 @@ namespace OpenMetaverse // Build hashes for each of the bake layers from the individual components for (int bakedIndex = 0; bakedIndex < BAKED_TEXTURE_COUNT; bakedIndex++) { - LLUUID hash = new LLUUID(); + UUID hash = new UUID(); for (int wearableIndex = 0; wearableIndex < WEARABLES_PER_LAYER; wearableIndex++) { WearableType type = WEARABLE_BAKE_MAP[bakedIndex][wearableIndex]; - LLUUID assetID = GetWearableAsset(type); + UUID assetID = GetWearableAsset(type); // Build a hash of all the texture asset IDs in this baking layer - if (assetID != LLUUID.Zero) hash ^= assetID; + if (assetID != UUID.Zero) hash ^= assetID; } - if (hash != LLUUID.Zero) + if (hash != UUID.Zero) { // Hash with our secret value for this baked layer hash ^= BAKED_TEXTURE_HASH[bakedIndex]; @@ -983,7 +983,7 @@ namespace OpenMetaverse if (Wearables.ContainsKey(type)) wearing.WearableData[i].ItemID = Wearables.Dictionary[type].Item.UUID; else - wearing.WearableData[i].ItemID = LLUUID.Zero; + wearing.WearableData[i].ItemID = UUID.Zero; } Client.Network.SendPacket(wearing); @@ -1026,7 +1026,7 @@ namespace OpenMetaverse private void UploadBake(Baker bake) { // Upload the completed layer data - LLUUID transactionID = Assets.RequestUpload(bake.BakedTexture, true); + UUID transactionID = Assets.RequestUpload(bake.BakedTexture, true); Logger.DebugLog(String.Format("Bake {0} completed. Uploading asset {1}", bake.BakeType, bake.BakedTexture.AssetID.ToString()), Client); @@ -1037,9 +1037,9 @@ namespace OpenMetaverse private int AddImageDownload(TextureIndex index) { - LLUUID image = AgentTextures[(int)index]; + UUID image = AgentTextures[(int)index]; - if (image != LLUUID.Zero) + if (image != UUID.Zero) { if (!ImageDownloads.ContainsKey(image)) { @@ -1102,7 +1102,7 @@ namespace OpenMetaverse BakeType bakeType = (BakeType)block.TextureIndex; // Convert the baked index to an AgentTexture index - if (block.TextureID != LLUUID.Zero && host.Length == 0) + if (block.TextureID != UUID.Zero && host.Length == 0) { TextureIndex index = BakeTypeToAgentTextureIndex(bakeType); AgentTextures[(int)index] = block.TextureID; @@ -1196,8 +1196,8 @@ namespace OpenMetaverse { lock (ImageDownloads) { - List imgKeys = new List(ImageDownloads.Keys); - foreach (LLUUID image in imgKeys) + List imgKeys = new List(ImageDownloads.Keys); + foreach (UUID image in imgKeys) { // Download all the images we need for baking Assets.RequestImage(image, ImageType.Normal, 1013000.0f, 0); @@ -1230,7 +1230,7 @@ namespace OpenMetaverse lock (AgentTextures) { - foreach (KeyValuePair texture in kvp.Value.Asset.Textures) + foreach (KeyValuePair texture in kvp.Value.Asset.Textures) { if (texture.Value != DEFAULT_AVATAR_TEXTURE) // this texture is not meant to be displayed { diff --git a/OpenMetaverse/AssetManager.cs b/OpenMetaverse/AssetManager.cs index c076beaf..3d8d8172 100644 --- a/OpenMetaverse/AssetManager.cs +++ b/OpenMetaverse/AssetManager.cs @@ -183,7 +183,7 @@ namespace OpenMetaverse /// public class Transfer { - public LLUUID ID; + public UUID ID; public int Size; public byte[] AssetData = new byte[0]; public int Transferred; @@ -212,7 +212,7 @@ namespace OpenMetaverse /// public class AssetDownload : Transfer { - public LLUUID AssetID; + public UUID AssetID; public ChannelType Channel; public SourceType Source; public TargetType Target; @@ -226,7 +226,7 @@ namespace OpenMetaverse public class XferDownload : Transfer { public ulong XferID; - public LLUUID VFileID; + public UUID VFileID; public AssetType Type; public uint PacketNum; public string Filename = String.Empty; @@ -252,21 +252,21 @@ namespace OpenMetaverse /// public class AssetUpload : Transfer { - public LLUUID AssetID; + public UUID AssetID; public AssetType Type; public ulong XferID; public uint PacketNum; } public class ImageRequest { - public ImageRequest(LLUUID imageid, ImageType type, float priority, int discardLevel) + public ImageRequest(UUID imageid, ImageType type, float priority, int discardLevel) { ImageID = imageid; Type = type; Priority = priority; DiscardLevel = discardLevel; } - public LLUUID ImageID; + public UUID ImageID; public ImageType Type; public float Priority; public int DiscardLevel; @@ -300,7 +300,7 @@ namespace OpenMetaverse /// /// /// - public delegate void ImageReceiveProgressCallback(LLUUID image, int recieved, int total); + public delegate void ImageReceiveProgressCallback(UUID image, int recieved, int total); /// /// /// @@ -335,7 +335,7 @@ namespace OpenMetaverse public TextureCache Cache; private GridClient Client; - private Dictionary Transfers = new Dictionary(); + private Dictionary Transfers = new Dictionary(); private AssetUpload PendingUpload; private object PendingUploadLock = new object(); private volatile bool WaitingForUploadConfirm = false; @@ -402,10 +402,10 @@ namespace OpenMetaverse /// Asset type, must be correct for the transfer to succeed /// Whether to give this transfer an elevated priority /// The transaction ID generated for this transfer - public LLUUID RequestAsset(LLUUID assetID, AssetType type, bool priority) + public UUID RequestAsset(UUID assetID, AssetType type, bool priority) { AssetDownload transfer = new AssetDownload(); - transfer.ID = LLUUID.Random(); + transfer.ID = UUID.Random(); transfer.AssetID = assetID; //transfer.AssetType = type; // Set in TransferInfoHandler. transfer.Priority = 100.0f + (priority ? 1.0f : 0.0f); @@ -444,14 +444,14 @@ namespace OpenMetaverse /// Asset type of vFileID, or /// AssetType.Unknown if filename is not empty /// - public ulong RequestAssetXfer(string filename, bool deleteOnCompletion, bool useBigPackets, LLUUID vFileID, AssetType vFileType) + public ulong RequestAssetXfer(string filename, bool deleteOnCompletion, bool useBigPackets, UUID vFileID, AssetType vFileType) { - LLUUID uuid = LLUUID.Random(); + UUID uuid = UUID.Random(); ulong id = uuid.GetULong(); XferDownload transfer = new XferDownload(); transfer.XferID = id; - transfer.ID = new LLUUID(id); // Our dictionary tracks transfers with LLUUIDs, so convert the ulong back + transfer.ID = new UUID(id); // Our dictionary tracks transfers with LLUUIDs, so convert the ulong back transfer.Filename = filename; transfer.VFileID = vFileID; transfer.AssetType = vFileType; @@ -485,10 +485,10 @@ namespace OpenMetaverse /// The owner of this asset /// Asset type /// Whether to prioritize this asset download or not - public LLUUID RequestInventoryAsset(LLUUID assetID, LLUUID itemID, LLUUID taskID, LLUUID ownerID, AssetType type, bool priority) + public UUID RequestInventoryAsset(UUID assetID, UUID itemID, UUID taskID, UUID ownerID, AssetType type, bool priority) { AssetDownload transfer = new AssetDownload(); - transfer.ID = LLUUID.Random(); + transfer.ID = UUID.Random(); transfer.AssetID = assetID; //transfer.AssetType = type; // Set in TransferInfoHandler. transfer.Priority = 100.0f + (priority ? 1.0f : 0.0f); @@ -520,9 +520,9 @@ namespace OpenMetaverse return transfer.ID; } - public LLUUID RequestInventoryAsset(InventoryItem item, bool priority) + public UUID RequestInventoryAsset(InventoryItem item, bool priority) { - return RequestInventoryAsset(item.AssetUUID, item.UUID, LLUUID.Zero, item.OwnerID, item.AssetType, priority); + return RequestInventoryAsset(item.AssetUUID, item.UUID, UUID.Zero, item.OwnerID, item.AssetType, priority); } public void RequestEstateAsset() @@ -536,7 +536,7 @@ namespace OpenMetaverse /// The image to download /// Type of the image to download, either a baked /// avatar texture or a normal texture - public void RequestImage(LLUUID imageID, ImageType type) + public void RequestImage(UUID imageID, ImageType type) { RequestImage(imageID, type, 1013000.0f, 0); } @@ -552,7 +552,7 @@ namespace OpenMetaverse /// Number of quality layers to discard /// Sending a priority of 0, and a discardlevel of -1 aborts /// download - public void RequestImage(LLUUID imageID, ImageType type, float priority, int discardLevel) + public void RequestImage(UUID imageID, ImageType type, float priority, int discardLevel) { if (Cache.HasImage(imageID)) { @@ -700,20 +700,20 @@ namespace OpenMetaverse } } - public LLUUID RequestUpload(Asset asset, bool storeLocal) + public UUID RequestUpload(Asset asset, bool storeLocal) { if (asset.AssetData == null) throw new ArgumentException("Can't upload an asset with no data (did you forget to call Encode?)"); - LLUUID assetID; - LLUUID transferID = RequestUpload(out assetID, asset.AssetType, asset.AssetData, storeLocal); + UUID assetID; + UUID transferID = RequestUpload(out assetID, asset.AssetType, asset.AssetData, storeLocal); asset.AssetID = assetID; return transferID; } - public LLUUID RequestUpload(AssetType type, byte[] data, bool storeLocal) + public UUID RequestUpload(AssetType type, byte[] data, bool storeLocal) { - LLUUID assetID; + UUID assetID; return RequestUpload(out assetID, type, data, storeLocal); } @@ -727,13 +727,13 @@ namespace OpenMetaverse /// Whether to store this asset on the local /// simulator or the grid-wide asset server /// The transaction ID of this transfer - public LLUUID RequestUpload(out LLUUID assetID, AssetType type, byte[] data, bool storeLocal) + public UUID RequestUpload(out UUID assetID, AssetType type, byte[] data, bool storeLocal) { AssetUpload upload = new AssetUpload(); upload.AssetData = data; upload.AssetType = type; - upload.ID = LLUUID.Random(); - assetID = LLUUID.Combine(upload.ID, Client.Self.SecureSessionID); + upload.ID = UUID.Random(); + assetID = UUID.Combine(upload.ID, Client.Self.SecureSessionID); upload.AssetID = assetID; upload.Size = data.Length; upload.XferID = 0; @@ -931,7 +931,7 @@ namespace OpenMetaverse if (download.Source == SourceType.Asset && info.TransferInfo.Params.Length == 20) { - download.AssetID = new LLUUID(info.TransferInfo.Params, 0); + download.AssetID = new UUID(info.TransferInfo.Params, 0); download.AssetType = (AssetType)(sbyte)info.TransferInfo.Params[16]; //Client.DebugLog(String.Format("TransferInfo packet received. AssetID: {0} Type: {1}", @@ -940,12 +940,12 @@ namespace OpenMetaverse else if (download.Source == SourceType.SimInventoryItem && info.TransferInfo.Params.Length == 100) { // TODO: Can we use these? - LLUUID agentID = new LLUUID(info.TransferInfo.Params, 0); - LLUUID sessionID = new LLUUID(info.TransferInfo.Params, 16); - LLUUID ownerID = new LLUUID(info.TransferInfo.Params, 32); - LLUUID taskID = new LLUUID(info.TransferInfo.Params, 48); - LLUUID itemID = new LLUUID(info.TransferInfo.Params, 64); - download.AssetID = new LLUUID(info.TransferInfo.Params, 80); + UUID agentID = new UUID(info.TransferInfo.Params, 0); + UUID sessionID = new UUID(info.TransferInfo.Params, 16); + UUID ownerID = new UUID(info.TransferInfo.Params, 32); + UUID taskID = new UUID(info.TransferInfo.Params, 48); + UUID itemID = new UUID(info.TransferInfo.Params, 64); + download.AssetID = new UUID(info.TransferInfo.Params, 80); download.AssetType = (AssetType)(sbyte)info.TransferInfo.Params[96]; //Client.DebugLog(String.Format("TransferInfo packet received. AgentID: {0} SessionID: {1} " + @@ -1055,7 +1055,7 @@ namespace OpenMetaverse upload.XferID = request.XferID.ID; upload.Type = (AssetType)request.XferID.VFileType; - LLUUID transferID = new LLUUID(upload.XferID); + UUID transferID = new UUID(upload.XferID); Transfers[transferID] = upload; // Send the first packet containing actual asset data @@ -1069,7 +1069,7 @@ namespace OpenMetaverse // Building a new UUID every time an ACK is received for an upload is a horrible // thing, but this whole Xfer system is horrible - LLUUID transferID = new LLUUID(confirm.XferID.ID); + UUID transferID = new UUID(confirm.XferID.ID); Transfer transfer; AssetUpload upload = null; @@ -1102,12 +1102,12 @@ namespace OpenMetaverse if (OnAssetUploaded != null) { bool found = false; - KeyValuePair foundTransfer = new KeyValuePair(); + KeyValuePair foundTransfer = new KeyValuePair(); // Xfer system sucks really really bad. Where is the damn XferID? lock (Transfers) { - foreach (KeyValuePair transfer in Transfers) + foreach (KeyValuePair transfer in Transfers) { if (transfer.Value.GetType() == typeof(AssetUpload)) { @@ -1147,7 +1147,7 @@ namespace OpenMetaverse SendXferPacketPacket xfer = (SendXferPacketPacket)packet; // Lame ulong to LLUUID conversion, please go away Xfer system - LLUUID transferID = new LLUUID(xfer.XferID.ID); + UUID transferID = new UUID(xfer.XferID.ID); Transfer transfer; XferDownload download = null; @@ -1449,7 +1449,7 @@ namespace OpenMetaverse /// /// LLUUID of the image we want to get /// Raw bytes of the image, or null on failure - public byte[] GetCachedImageBytes(LLUUID imageID) + public byte[] GetCachedImageBytes(UUID imageID) { if (!Operational()) { return null; @@ -1470,7 +1470,7 @@ namespace OpenMetaverse /// /// LLUUID of the image we want to get /// ImageDownload object containing the image, or null on failure - public ImageDownload GetCachedImage(LLUUID imageID) + public ImageDownload GetCachedImage(UUID imageID) { if (!Operational()) return null; @@ -1494,7 +1494,7 @@ namespace OpenMetaverse /// /// LLUUID of the image /// String with the file name of the cahced image - private string FileName(LLUUID imageID) + private string FileName(UUID imageID) { return Client.Settings.TEXTURE_CACHE_DIR + Path.DirectorySeparatorChar + imageID.ToString(); } @@ -1505,7 +1505,7 @@ namespace OpenMetaverse /// LLUUID of the image /// Raw bytes the image consists of /// Weather the operation was successfull - public bool SaveImageToCache(LLUUID imageID, byte[] imageData) + public bool SaveImageToCache(UUID imageID, byte[] imageData) { if (!Operational()) { return false; @@ -1532,7 +1532,7 @@ namespace OpenMetaverse /// /// LLUUID of the image /// Null if we don't have that UUID cached on disk, file name if found in the cache folder - public string ImageFileName(LLUUID imageID) + public string ImageFileName(UUID imageID) { if (!Operational()) { @@ -1552,7 +1552,7 @@ namespace OpenMetaverse /// /// LLUUID of the image /// True is the image is stored in the cache, otherwise false - public bool HasImage(LLUUID imageID) + public bool HasImage(UUID imageID) { if (!Operational()) { return false; diff --git a/OpenMetaverse/AssetTypes.cs b/OpenMetaverse/AssetTypes.cs index d05aa6c8..501fa0e3 100644 --- a/OpenMetaverse/AssetTypes.cs +++ b/OpenMetaverse/AssetTypes.cs @@ -100,8 +100,8 @@ namespace OpenMetaverse { public byte[] AssetData; - private LLUUID _AssetID; - public LLUUID AssetID + private UUID _AssetID; + public UUID AssetID { get { return _AssetID; } internal set { _AssetID = value; } @@ -284,14 +284,14 @@ namespace OpenMetaverse public WearableType WearableType = WearableType.Shape; public SaleType ForSale; public int SalePrice; - public LLUUID Creator; - public LLUUID Owner; - public LLUUID LastOwner; - public LLUUID Group; + public UUID Creator; + public UUID Owner; + public UUID LastOwner; + public UUID Group; public bool GroupOwned; public Permissions Permissions; public Dictionary Params = new Dictionary(); - public Dictionary Textures = new Dictionary(); + public Dictionary Textures = new Dictionary(); public AssetWearable() { } @@ -365,7 +365,7 @@ namespace OpenMetaverse fields = line.Split(' '); AppearanceManager.TextureIndex id = (AppearanceManager.TextureIndex)Int32.Parse(fields[0]); - LLUUID texture = new LLUUID(fields[1]); + UUID texture = new UUID(fields[1]); Textures[id] = texture; } @@ -400,16 +400,16 @@ namespace OpenMetaverse Permissions.NextOwnerMask = (PermissionMask)UInt32.Parse(fields[1], System.Globalization.NumberStyles.HexNumber); break; case "creator_id": - Creator = new LLUUID(fields[1]); + Creator = new UUID(fields[1]); break; case "owner_id": - Owner = new LLUUID(fields[1]); + Owner = new UUID(fields[1]); break; case "last_owner_id": - LastOwner = new LLUUID(fields[1]); + LastOwner = new UUID(fields[1]); break; case "group_id": - Group = new LLUUID(fields[1]); + Group = new UUID(fields[1]); break; case "group_owned": GroupOwned = (Int32.Parse(fields[1]) != 0); @@ -465,7 +465,7 @@ namespace OpenMetaverse } data.Append("textures "); data.Append(Textures.Count); data.Append(NL); - foreach (KeyValuePair texture in Textures) + foreach (KeyValuePair texture in Textures) { data.Append(texture.Key); data.Append(" "); data.Append(texture.Value.ToString()); data.Append(NL); } diff --git a/OpenMetaverse/Avatar.cs b/OpenMetaverse/Avatar.cs index 47557763..8072943b 100644 --- a/OpenMetaverse/Avatar.cs +++ b/OpenMetaverse/Avatar.cs @@ -84,9 +84,9 @@ namespace OpenMetaverse /// First Life about text public string FirstLifeText; /// First Life image ID - public LLUUID FirstLifeImage; + public UUID FirstLifeImage; /// - public LLUUID Partner; + public UUID Partner; /// public string AboutText; /// @@ -94,7 +94,7 @@ namespace OpenMetaverse /// public string CharterMember; /// Profile image ID - public LLUUID ProfileImage; + public UUID ProfileImage; /// Flags of the profile public ProfileFlags Flags; /// Web URL for this profile @@ -227,7 +227,7 @@ namespace OpenMetaverse #region Public Members /// Groups that this avatar is a member of - public List Groups = new List(); + public List Groups = new List(); /// Positive and negative ratings public Statistics ProfileStatistics = new Statistics(); /// Avatar properties including about text, profile URL, image IDs and diff --git a/OpenMetaverse/AvatarManager.cs b/OpenMetaverse/AvatarManager.cs index 1175399a..0cf36c74 100644 --- a/OpenMetaverse/AvatarManager.cs +++ b/OpenMetaverse/AvatarManager.cs @@ -42,9 +42,9 @@ namespace OpenMetaverse /// true of Avatar accepts group notices public bool AcceptNotices; /// Groups Key - public LLUUID GroupID; + public UUID GroupID; /// Texture Key for groups insignia - public LLUUID GroupInsigniaID; + public UUID GroupInsigniaID; /// Name of the group public string GroupName; /// Powers avatar has in the group @@ -60,17 +60,17 @@ namespace OpenMetaverse /// public struct ProfilePick { - public LLUUID PickID; - public LLUUID CreatorID; + public UUID PickID; + public UUID CreatorID; public bool TopPick; - public LLUUID ParcelID; + public UUID ParcelID; public string Name; public string Desc; - public LLUUID SnapshotID; + public UUID SnapshotID; public string User; public string OriginalName; public string SimName; - public LLVector3d PosGlobal; + public Vector3d PosGlobal; public int SortOrder; public bool Enabled; } @@ -88,36 +88,36 @@ namespace OpenMetaverse /// /// /// - public delegate void AvatarAppearanceCallback(LLUUID avatarID, bool isTrial, LLObject.TextureEntryFace defaultTexture, LLObject.TextureEntryFace[] faceTextures, List visualParams); + public delegate void AvatarAppearanceCallback(UUID avatarID, bool isTrial, LLObject.TextureEntryFace defaultTexture, LLObject.TextureEntryFace[] faceTextures, List visualParams); /// /// Triggered when a UUIDNameReply is received /// /// - public delegate void AvatarNamesCallback(Dictionary names); + public delegate void AvatarNamesCallback(Dictionary names); /// /// Triggered when a response for avatar interests is returned /// /// /// - public delegate void AvatarInterestsCallback(LLUUID avatarID, Avatar.Interests interests); + public delegate void AvatarInterestsCallback(UUID avatarID, Avatar.Interests interests); /// /// Triggered when avatar properties are received (AvatarPropertiesReply) /// /// /// - public delegate void AvatarPropertiesCallback(LLUUID avatarID, Avatar.AvatarProperties properties); + public delegate void AvatarPropertiesCallback(UUID avatarID, Avatar.AvatarProperties properties); /// /// Triggered when an avatar group list is received (AvatarGroupsReply) /// /// /// - public delegate void AvatarGroupsCallback(LLUUID avatarID, List avatarGroups); + public delegate void AvatarGroupsCallback(UUID avatarID, List avatarGroups); /// /// Triggered when a name search reply is received (AvatarPickerReply) /// /// /// - public delegate void AvatarNameSearchCallback(LLUUID queryID, Dictionary avatars); + public delegate void AvatarNameSearchCallback(UUID queryID, Dictionary avatars); /// /// /// @@ -127,8 +127,8 @@ namespace OpenMetaverse /// /// /// - public delegate void PointAtCallback(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos, - PointAtType pointType, float duration, LLUUID id); + public delegate void PointAtCallback(UUID sourceID, UUID targetID, Vector3d targetPos, + PointAtType pointType, float duration, UUID id); /// /// /// @@ -138,8 +138,8 @@ namespace OpenMetaverse /// /// /// - public delegate void LookAtCallback(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos, - LookAtType lookType, float duration, LLUUID id); + public delegate void LookAtCallback(UUID sourceID, UUID targetID, Vector3d targetPos, + LookAtType lookType, float duration, UUID id); /// /// /// @@ -149,20 +149,20 @@ namespace OpenMetaverse /// /// /// - public delegate void EffectCallback(EffectType type, LLUUID sourceID, LLUUID targetID, - LLVector3d targetPos, float duration, LLUUID id); + public delegate void EffectCallback(EffectType type, UUID sourceID, UUID targetID, + Vector3d targetPos, float duration, UUID id); /// /// Callback returning a dictionary of avatar's picks /// /// /// - public delegate void AvatarPicksCallback(LLUUID avatarid, Dictionary picks); + public delegate void AvatarPicksCallback(UUID avatarid, Dictionary picks); /// /// Callback returning a details of a specifick pick /// /// /// - public delegate void PickInfoCallback(LLUUID pickid, ProfilePick pick); + public delegate void PickInfoCallback(UUID pickid, ProfilePick pick); /// public event AvatarAppearanceCallback OnAvatarAppearance; /// @@ -222,7 +222,7 @@ namespace OpenMetaverse /// Tracks the specified avatar on your map /// Avatar ID to track - public void TrackAvatar(LLUUID preyID) + public void TrackAvatar(UUID preyID) { TrackAgentPacket p = new TrackAgentPacket(); p.AgentData.AgentID = Client.Self.AgentID; @@ -235,7 +235,7 @@ namespace OpenMetaverse /// Request a single avatar name /// /// The avatar key to retrieve a name for - public void RequestAvatarName(LLUUID id) + public void RequestAvatarName(UUID id) { UUIDNameRequestPacket request = new UUIDNameRequestPacket(); request.UUIDNameBlock = new UUIDNameRequestPacket.UUIDNameBlockBlock[1]; @@ -249,7 +249,7 @@ namespace OpenMetaverse /// Request a list of avatar names /// /// The avatar keys to retrieve names for - public void RequestAvatarNames(List ids) + public void RequestAvatarNames(List ids) { UUIDNameRequestPacket request = new UUIDNameRequestPacket(); request.UUIDNameBlock = new UUIDNameRequestPacket.UUIDNameBlockBlock[ids.Count]; @@ -267,7 +267,7 @@ namespace OpenMetaverse /// Start a request for Avatar Properties /// /// - public void RequestAvatarProperties(LLUUID avatarid) + public void RequestAvatarProperties(UUID avatarid) { AvatarPropertiesRequestPacket aprp = new AvatarPropertiesRequestPacket(); @@ -283,7 +283,7 @@ namespace OpenMetaverse /// /// The name to search for /// An ID to associate with this query - public void RequestAvatarNameSearch(string name, LLUUID queryID) + public void RequestAvatarNameSearch(string name, UUID queryID) { AvatarPickerRequestPacket aprp = new AvatarPickerRequestPacket(); @@ -299,16 +299,16 @@ namespace OpenMetaverse /// Start a request for Avatar Picks /// /// UUID of the avatar - public void RequestAvatarPicks(LLUUID avatarid) + public void RequestAvatarPicks(UUID avatarid) { GenericMessagePacket gmp = new GenericMessagePacket(); gmp.AgentData.AgentID = Client.Self.AgentID; gmp.AgentData.SessionID = Client.Self.SessionID; - gmp.AgentData.TransactionID = LLUUID.Zero; + gmp.AgentData.TransactionID = UUID.Zero; gmp.MethodData.Method = Helpers.StringToField("avatarpicksrequest"); - gmp.MethodData.Invoice = LLUUID.Zero; + gmp.MethodData.Invoice = UUID.Zero; gmp.ParamList = new GenericMessagePacket.ParamListBlock[1]; gmp.ParamList[0] = new GenericMessagePacket.ParamListBlock(); gmp.ParamList[0].Parameter = Helpers.StringToField(avatarid.ToString()); @@ -321,16 +321,16 @@ namespace OpenMetaverse /// /// UUID of the avatar /// UUID of the profile pick - public void RequestPickInfo(LLUUID avatarid, LLUUID pickid) + public void RequestPickInfo(UUID avatarid, UUID pickid) { GenericMessagePacket gmp = new GenericMessagePacket(); gmp.AgentData.AgentID = Client.Self.AgentID; gmp.AgentData.SessionID = Client.Self.SessionID; - gmp.AgentData.TransactionID = LLUUID.Zero; + gmp.AgentData.TransactionID = UUID.Zero; gmp.MethodData.Method = Helpers.StringToField("pickinforequest"); - gmp.MethodData.Invoice = LLUUID.Zero; + gmp.MethodData.Invoice = UUID.Zero; gmp.ParamList = new GenericMessagePacket.ParamListBlock[2]; gmp.ParamList[0] = new GenericMessagePacket.ParamListBlock(); gmp.ParamList[0].Parameter = Helpers.StringToField(avatarid.ToString()); @@ -351,7 +351,7 @@ namespace OpenMetaverse { if (OnAvatarNames != null) { - Dictionary names = new Dictionary(); + Dictionary names = new Dictionary(); UUIDNameReplyPacket reply = (UUIDNameReplyPacket)packet; foreach (UUIDNameReplyPacket.UUIDNameBlockBlock block in reply.UUIDNameBlock) @@ -486,7 +486,7 @@ namespace OpenMetaverse if (OnAvatarNameSearch != null) { AvatarPickerReplyPacket reply = (AvatarPickerReplyPacket)packet; - Dictionary avatars = new Dictionary(); + Dictionary avatars = new Dictionary(); foreach (AvatarPickerReplyPacket.DataBlock block in reply.Data) { @@ -567,9 +567,9 @@ namespace OpenMetaverse { if (block.TypeData.Length == 56) { - LLUUID sourceAvatar = new LLUUID(block.TypeData, 0); - LLUUID targetObject = new LLUUID(block.TypeData, 16); - LLVector3d targetPos = new LLVector3d(block.TypeData, 32); + UUID sourceAvatar = new UUID(block.TypeData, 0); + UUID targetObject = new UUID(block.TypeData, 16); + Vector3d targetPos = new Vector3d(block.TypeData, 32); try { OnEffect(type, sourceAvatar, targetObject, targetPos, block.Duration, block.ID); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, Client, e); } @@ -587,9 +587,9 @@ namespace OpenMetaverse { if (block.TypeData.Length == 57) { - LLUUID sourceAvatar = new LLUUID(block.TypeData, 0); - LLUUID targetObject = new LLUUID(block.TypeData, 16); - LLVector3d targetPos = new LLVector3d(block.TypeData, 32); + UUID sourceAvatar = new UUID(block.TypeData, 0); + UUID targetObject = new UUID(block.TypeData, 16); + Vector3d targetPos = new Vector3d(block.TypeData, 32); LookAtType lookAt = (LookAtType)block.TypeData[56]; try { OnLookAt(sourceAvatar, targetObject, targetPos, lookAt, block.Duration, @@ -608,9 +608,9 @@ namespace OpenMetaverse { if (block.TypeData.Length == 57) { - LLUUID sourceAvatar = new LLUUID(block.TypeData, 0); - LLUUID targetObject = new LLUUID(block.TypeData, 16); - LLVector3d targetPos = new LLVector3d(block.TypeData, 32); + UUID sourceAvatar = new UUID(block.TypeData, 0); + UUID targetObject = new UUID(block.TypeData, 16); + Vector3d targetPos = new Vector3d(block.TypeData, 32); PointAtType pointAt = (PointAtType)block.TypeData[56]; try { OnPointAt(sourceAvatar, targetObject, targetPos, pointAt, block.Duration, @@ -640,7 +640,7 @@ namespace OpenMetaverse return; } AvatarPicksReplyPacket p = (AvatarPicksReplyPacket)packet; - Dictionary picks = new Dictionary(); + Dictionary picks = new Dictionary(); foreach (AvatarPicksReplyPacket.DataBlock b in p.Data) { picks.Add(b.PickID, Helpers.FieldToUTF8String(b.PickName)); diff --git a/OpenMetaverse/BitPack.cs b/OpenMetaverse/BitPack.cs index 818a9137..fe9c67ec 100644 --- a/OpenMetaverse/BitPack.cs +++ b/OpenMetaverse/BitPack.cs @@ -152,7 +152,7 @@ namespace OpenMetaverse /// /// /// - public void PackUUID(LLUUID data) + public void PackUUID(UUID data) { byte[] bytes = data.GetBytes(); @@ -166,7 +166,7 @@ namespace OpenMetaverse /// /// /// - public void PackColor(LLColor data) + public void PackColor(Color4 data) { byte[] bytes = data.GetBytes(); PackBitArray(bytes, 32); @@ -297,11 +297,11 @@ namespace OpenMetaverse return str; } - public LLUUID UnpackUUID() + public UUID UnpackUUID() { if (bitPos != 0) throw new IndexOutOfRangeException(); - LLUUID val = new LLUUID(Data, bytePos); + UUID val = new UUID(Data, bytePos); bytePos += 16; return val; } diff --git a/OpenMetaverse/CapsToPacket.cs b/OpenMetaverse/CapsToPacket.cs index 6d496d03..46985e36 100644 --- a/OpenMetaverse/CapsToPacket.cs +++ b/OpenMetaverse/CapsToPacket.cs @@ -218,25 +218,25 @@ namespace OpenMetaverse.Packets { field.SetValue(block, blockData[field.Name].AsInteger()); } - else if (fieldType == typeof(LLUUID)) + else if (fieldType == typeof(UUID)) { field.SetValue(block, blockData[field.Name].AsUUID()); } - else if (fieldType == typeof(LLVector3)) + else if (fieldType == typeof(Vector3)) { - LLVector3 vec = (LLVector3)field.GetValue(block); + Vector3 vec = (Vector3)field.GetValue(block); vec.FromLLSD(blockData[field.Name]); field.SetValue(block, vec); } - else if (fieldType == typeof(LLVector4)) + else if (fieldType == typeof(Vector4)) { - LLVector4 vec = (LLVector4)field.GetValue(block); + Vector4 vec = (Vector4)field.GetValue(block); vec.FromLLSD(blockData[field.Name]); field.SetValue(block, vec); } - else if (fieldType == typeof(LLQuaternion)) + else if (fieldType == typeof(Quaternion)) { - LLQuaternion quat = (LLQuaternion)field.GetValue(block); + Quaternion quat = (Quaternion)field.GetValue(block); quat.FromLLSD(blockData[field.Name]); field.SetValue(block, quat); } diff --git a/OpenMetaverse/CoordinateFrame.cs b/OpenMetaverse/CoordinateFrame.cs index a5bdc9a1..8b9ce4a3 100644 --- a/OpenMetaverse/CoordinateFrame.cs +++ b/OpenMetaverse/CoordinateFrame.cs @@ -30,12 +30,12 @@ namespace OpenMetaverse { public class CoordinateFrame { - public static readonly LLVector3 X_AXIS = new LLVector3(1f, 0f, 0f); - public static readonly LLVector3 Y_AXIS = new LLVector3(0f, 1f, 0f); - public static readonly LLVector3 Z_AXIS = new LLVector3(0f, 0f, 1f); + public static readonly Vector3 X_AXIS = new Vector3(1f, 0f, 0f); + public static readonly Vector3 Y_AXIS = new Vector3(0f, 1f, 0f); + public static readonly Vector3 Z_AXIS = new Vector3(0f, 0f, 1f); /// Origin position of this coordinate frame - public LLVector3 Origin + public Vector3 Origin { get { return origin; } set @@ -46,7 +46,7 @@ namespace OpenMetaverse } } /// X axis of this coordinate frame, or Forward/At in grid terms - public LLVector3 XAxis + public Vector3 XAxis { get { return xAxis; } set @@ -57,7 +57,7 @@ namespace OpenMetaverse } } /// Y axis of this coordinate frame, or Left in grid terms - public LLVector3 YAxis + public Vector3 YAxis { get { return yAxis; } set @@ -68,7 +68,7 @@ namespace OpenMetaverse } } /// Z axis of this coordinate frame, or Up in grid terms - public LLVector3 ZAxis + public Vector3 ZAxis { get { return zAxis; } set @@ -79,14 +79,14 @@ namespace OpenMetaverse } } - protected LLVector3 origin; - protected LLVector3 xAxis; - protected LLVector3 yAxis; - protected LLVector3 zAxis; + protected Vector3 origin; + protected Vector3 xAxis; + protected Vector3 yAxis; + protected Vector3 zAxis; #region Constructors - public CoordinateFrame(LLVector3 origin) + public CoordinateFrame(Vector3 origin) { this.origin = origin; xAxis = X_AXIS; @@ -97,7 +97,7 @@ namespace OpenMetaverse throw new ArgumentException("Non-finite in CoordinateFrame constructor"); } - public CoordinateFrame(LLVector3 origin, LLVector3 direction) + public CoordinateFrame(Vector3 origin, Vector3 direction) { this.origin = origin; LookDirection(direction); @@ -106,7 +106,7 @@ namespace OpenMetaverse throw new ArgumentException("Non-finite in CoordinateFrame constructor"); } - public CoordinateFrame(LLVector3 origin, LLVector3 xAxis, LLVector3 yAxis, LLVector3 zAxis) + public CoordinateFrame(Vector3 origin, Vector3 xAxis, Vector3 yAxis, Vector3 zAxis) { this.origin = origin; this.xAxis = xAxis; @@ -117,7 +117,7 @@ namespace OpenMetaverse throw new ArgumentException("Non-finite in CoordinateFrame constructor"); } - public CoordinateFrame(LLVector3 origin, LLMatrix3 rotation) + public CoordinateFrame(Vector3 origin, Matrix3 rotation) { this.origin = origin; xAxis = rotation[0]; @@ -128,9 +128,9 @@ namespace OpenMetaverse throw new ArgumentException("Non-finite in CoordinateFrame constructor"); } - public CoordinateFrame(LLVector3 origin, LLQuaternion rotation) + public CoordinateFrame(Vector3 origin, Quaternion rotation) { - LLMatrix3 m = new LLMatrix3(rotation); + Matrix3 m = new Matrix3(rotation); this.origin = origin; xAxis = m[0]; @@ -152,22 +152,22 @@ namespace OpenMetaverse zAxis = Z_AXIS; } - public void Rotate(float angle, LLVector3 rotationAxis) + public void Rotate(float angle, Vector3 rotationAxis) { - LLQuaternion q = new LLQuaternion(angle, rotationAxis); + Quaternion q = new Quaternion(angle, rotationAxis); Rotate(q); } - public void Rotate(LLQuaternion q) + public void Rotate(Quaternion q) { - LLMatrix3 m = new LLMatrix3(q); + Matrix3 m = new Matrix3(q); Rotate(m); } - public void Rotate(LLMatrix3 m) + public void Rotate(Matrix3 m) { - xAxis = LLVector3.Rot(xAxis, m); - yAxis = LLVector3.Rot(yAxis, m); + xAxis = Vector3.Rot(xAxis, m); + yAxis = Vector3.Rot(yAxis, m); Orthonormalize(); @@ -177,8 +177,8 @@ namespace OpenMetaverse public void Roll(float angle) { - LLQuaternion q = new LLQuaternion(angle, xAxis); - LLMatrix3 m = new LLMatrix3(q); + Quaternion q = new Quaternion(angle, xAxis); + Matrix3 m = new Matrix3(q); Rotate(m); if (!yAxis.IsFinite() || !zAxis.IsFinite()) @@ -187,8 +187,8 @@ namespace OpenMetaverse public void Pitch(float angle) { - LLQuaternion q = new LLQuaternion(angle, yAxis); - LLMatrix3 m = new LLMatrix3(q); + Quaternion q = new Quaternion(angle, yAxis); + Matrix3 m = new Matrix3(q); Rotate(m); if (!xAxis.IsFinite() || !zAxis.IsFinite()) @@ -197,15 +197,15 @@ namespace OpenMetaverse public void Yaw(float angle) { - LLQuaternion q = new LLQuaternion(angle, zAxis); - LLMatrix3 m = new LLMatrix3(q); + Quaternion q = new Quaternion(angle, zAxis); + Matrix3 m = new Matrix3(q); Rotate(m); if (!xAxis.IsFinite() || !yAxis.IsFinite()) throw new Exception("Non-finite in CoordinateFrame.Yaw()"); } - public void LookDirection(LLVector3 at) + public void LookDirection(Vector3 at) { LookDirection(at, Z_AXIS); } @@ -215,22 +215,22 @@ namespace OpenMetaverse /// /// Looking direction, must be a normalized vector /// Up direction, must be a normalized vector - public void LookDirection(LLVector3 at, LLVector3 upDirection) + public void LookDirection(Vector3 at, Vector3 upDirection) { // The two parameters cannot be parallel - LLVector3 left = LLVector3.Cross(upDirection, at); - if (left == LLVector3.Zero) + Vector3 left = Vector3.Cross(upDirection, at); + if (left == Vector3.Zero) { // Prevent left from being zero at.X += 0.01f; - at = LLVector3.Norm(at); - left = LLVector3.Cross(upDirection, at); + at = Vector3.Norm(at); + left = Vector3.Cross(upDirection, at); } - left = LLVector3.Norm(left); + left = Vector3.Norm(left); xAxis = at; yAxis = left; - zAxis = LLVector3.Cross(at, left); + zAxis = Vector3.Cross(at, left); } /// @@ -247,16 +247,16 @@ namespace OpenMetaverse xAxis.Y = (float)Math.Cos(heading); } - public void LookAt(LLVector3 origin, LLVector3 target) + public void LookAt(Vector3 origin, Vector3 target) { - LookAt(origin, target, new LLVector3(0f, 0f, 1f)); + LookAt(origin, target, new Vector3(0f, 0f, 1f)); } - public void LookAt(LLVector3 origin, LLVector3 target, LLVector3 upDirection) + public void LookAt(Vector3 origin, Vector3 target, Vector3 upDirection) { this.origin = origin; - LLVector3 at = new LLVector3(target - origin); - at = LLVector3.Norm(at); + Vector3 at = new Vector3(target - origin); + at = Vector3.Norm(at); LookDirection(at, upDirection); } @@ -274,10 +274,10 @@ namespace OpenMetaverse protected void Orthonormalize() { // Make sure the axis are orthagonal and normalized - xAxis = LLVector3.Norm(xAxis); + xAxis = Vector3.Norm(xAxis); yAxis -= xAxis * (xAxis * yAxis); - yAxis = LLVector3.Norm(yAxis); - zAxis = LLVector3.Cross(xAxis, yAxis); + yAxis = Vector3.Norm(yAxis); + zAxis = Vector3.Cross(xAxis, yAxis); } } } diff --git a/OpenMetaverse/DirectoryManager.cs b/OpenMetaverse/DirectoryManager.cs index 772cae80..75c6dbe8 100644 --- a/OpenMetaverse/DirectoryManager.cs +++ b/OpenMetaverse/DirectoryManager.cs @@ -166,7 +166,7 @@ namespace OpenMetaverse { /// UUID for this ad, useful for looking up detailed /// information about it - public LLUUID ID; + public UUID ID; /// The title of this classified ad public string Name; /// Unknown @@ -186,7 +186,7 @@ namespace OpenMetaverse public struct DirectoryParcel { /// - public LLUUID ID; + public UUID ID; /// public string Name; /// @@ -211,14 +211,14 @@ namespace OpenMetaverse /// Agents last name public string LastName; /// Agents - public LLUUID AgentID; + public UUID AgentID; } /// /// Response to a "Groups" Search /// public struct GroupSearchData { - public LLUUID GroupID; + public UUID GroupID; public string GroupName; public int Members; } @@ -229,7 +229,7 @@ namespace OpenMetaverse /// public struct PlacesSearchData { - public LLUUID OwnerID; + public UUID OwnerID; public string Name; public string Desc; public int ActualArea; @@ -239,7 +239,7 @@ namespace OpenMetaverse public float GlobalY; public float GlobalZ; public string SimName; - public LLUUID SnapshotID; + public UUID SnapshotID; public float Dwell; public int Price; } @@ -249,7 +249,7 @@ namespace OpenMetaverse /// public struct EventsSearchData { - public LLUUID Owner; + public UUID Owner; public string Name; public uint ID; public string Date; @@ -264,7 +264,7 @@ namespace OpenMetaverse public struct EventInfo { public uint ID; - public LLUUID Creator; + public UUID Creator; public string Name; public EventCategories Category; public string Desc; @@ -274,7 +274,7 @@ namespace OpenMetaverse public UInt32 Cover; public UInt32 Amount; public string SimName; - public LLVector3d GlobalPos; + public Vector3d GlobalPos; public EventFlags Flags; } @@ -294,28 +294,28 @@ namespace OpenMetaverse /// /// /// - public delegate void DirPeopleReplyCallback(LLUUID queryID, List matchedPeople); + public delegate void DirPeopleReplyCallback(UUID queryID, List matchedPeople); /// /// /// /// /// - public delegate void DirGroupsReplyCallback(LLUUID queryID, List matchedGroups); + public delegate void DirGroupsReplyCallback(UUID queryID, List matchedGroups); /// /// /// /// /// - public delegate void PlacesReplyCallback(LLUUID queryID, List matchedPlaces); + public delegate void PlacesReplyCallback(UUID queryID, List matchedPlaces); /// /// /// /// /// - public delegate void EventReplyCallback(LLUUID queryID, List matchedEvents); + public delegate void EventReplyCallback(UUID queryID, List matchedEvents); /// /// @@ -361,10 +361,10 @@ namespace OpenMetaverse } - public LLUUID StartClassifiedSearch(string searchText, ClassifiedCategories categories, bool mature) + public UUID StartClassifiedSearch(string searchText, ClassifiedCategories categories, bool mature) { DirClassifiedQueryPacket query = new DirClassifiedQueryPacket(); - LLUUID queryID = LLUUID.Random(); + UUID queryID = UUID.Random(); query.AgentData.AgentID = Client.Self.AgentID; query.AgentData.SessionID = Client.Self.SessionID; @@ -390,7 +390,7 @@ namespace OpenMetaverse /// results will be returned, or how many times the callback will be /// fired other than you won't get more than 100 total parcels from /// each query. - public LLUUID StartLandSearch(SearchTypeFlags typeFlags) + public UUID StartLandSearch(SearchTypeFlags typeFlags) { return StartLandSearch(DirFindFlags.SortAsc | DirFindFlags.PerMeterSort, typeFlags, 0, 0, 0); } @@ -412,7 +412,7 @@ namespace OpenMetaverse /// results will be returned, or how many times the callback will be /// fired other than you won't get more than 100 total parcels from /// each query. - public LLUUID StartLandSearch(SearchTypeFlags typeFlags, int priceLimit, int areaLimit, int queryStart) + public UUID StartLandSearch(SearchTypeFlags typeFlags, int priceLimit, int areaLimit, int queryStart) { return StartLandSearch(DirFindFlags.SortAsc | DirFindFlags.PerMeterSort | DirFindFlags.LimitByPrice | DirFindFlags.LimitByArea, typeFlags, priceLimit, areaLimit, queryStart); @@ -440,10 +440,10 @@ namespace OpenMetaverse /// results will be returned, or how many times the callback will be /// fired other than you won't get more than 100 total parcels from /// each query. - public LLUUID StartLandSearch(DirFindFlags findFlags, SearchTypeFlags typeFlags, int priceLimit, + public UUID StartLandSearch(DirFindFlags findFlags, SearchTypeFlags typeFlags, int priceLimit, int areaLimit, int queryStart) { - LLUUID queryID = LLUUID.Random(); + UUID queryID = UUID.Random(); DirLandQueryPacket query = new DirLandQueryPacket(); query.AgentData.AgentID = Client.Self.AgentID; @@ -474,12 +474,12 @@ namespace OpenMetaverse /// results will be returned, or how many times the callback will be /// fired other than you won't get more than 100 total parcels from /// each query. - public LLUUID StartGroupSearch(DirFindFlags findFlags, string searchText, int queryStart) + public UUID StartGroupSearch(DirFindFlags findFlags, string searchText, int queryStart) { - return StartGroupSearch(findFlags, searchText, queryStart, LLUUID.Random()); + return StartGroupSearch(findFlags, searchText, queryStart, UUID.Random()); } - public LLUUID StartGroupSearch(DirFindFlags findFlags, string searchText, int queryStart, LLUUID queryID) + public UUID StartGroupSearch(DirFindFlags findFlags, string searchText, int queryStart, UUID queryID) { DirFindQueryPacket find = new DirFindQueryPacket(); find.AgentData.AgentID = Client.Self.AgentID; @@ -492,12 +492,12 @@ namespace OpenMetaverse return queryID; } - public LLUUID StartPeopleSearch(DirFindFlags findFlags, string searchText, int queryStart) + public UUID StartPeopleSearch(DirFindFlags findFlags, string searchText, int queryStart) { - return StartPeopleSearch(findFlags, searchText, queryStart, LLUUID.Random()); + return StartPeopleSearch(findFlags, searchText, queryStart, UUID.Random()); } - public LLUUID StartPeopleSearch(DirFindFlags findFlags, string searchText, int queryStart, LLUUID queryID) + public UUID StartPeopleSearch(DirFindFlags findFlags, string searchText, int queryStart, UUID queryID) { DirFindQueryPacket find = new DirFindQueryPacket(); find.AgentData.AgentID = Client.Self.AgentID; @@ -515,10 +515,10 @@ namespace OpenMetaverse /// /// Search "places" for Land you personally own /// - public LLUUID StartPlacesSearch() + public UUID StartPlacesSearch() { return StartPlacesSearch(DirFindFlags.AgentOwned, Parcel.ParcelCategory.Any, String.Empty, String.Empty, - LLUUID.Zero, LLUUID.Zero); + UUID.Zero, UUID.Zero); } /// @@ -528,10 +528,10 @@ namespace OpenMetaverse /// LLUID of group you want to recieve land list for (You must be in group), or /// LLUID.Zero for Your own land /// Transaction (Query) ID which can be associated with results from your request. - public LLUUID StartPlacesSearch(DirFindFlags findFlags, LLUUID groupID) + public UUID StartPlacesSearch(DirFindFlags findFlags, UUID groupID) { return StartPlacesSearch(findFlags, Parcel.ParcelCategory.Any, String.Empty, String.Empty, groupID, - LLUUID.Random()); + UUID.Random()); } /// @@ -542,7 +542,7 @@ namespace OpenMetaverse /// LLUID of group you want to recieve results for /// Transaction (Query) ID which can be associated with results from your request. /// Transaction (Query) ID which can be associated with results from your request. - public LLUUID StartPlacesSearch(DirFindFlags findFlags, Parcel.ParcelCategory searchCategory, LLUUID groupID, LLUUID transactionID) + public UUID StartPlacesSearch(DirFindFlags findFlags, Parcel.ParcelCategory searchCategory, UUID groupID, UUID transactionID) { return StartPlacesSearch(findFlags, searchCategory, String.Empty, String.Empty, groupID, transactionID); } @@ -557,7 +557,7 @@ namespace OpenMetaverse /// LLUID of group you want to recieve results for /// Transaction (Query) ID which can be associated with results from your request. /// Transaction (Query) ID which can be associated with results from your request. - public LLUUID StartPlacesSearch(DirFindFlags findFlags, Parcel.ParcelCategory searchCategory, string searchText, string simulatorName, LLUUID groupID, LLUUID transactionID) + public UUID StartPlacesSearch(DirFindFlags findFlags, Parcel.ParcelCategory searchCategory, string searchText, string simulatorName, UUID groupID, UUID transactionID) { PlacesQueryPacket find = new PlacesQueryPacket(); find.AgentData.AgentID = Client.Self.AgentID; @@ -581,7 +581,7 @@ namespace OpenMetaverse /// /// Text to search for /// UUID of query to correlate results in callback. - public LLUUID StartEventsSearch(string searchText) + public UUID StartEventsSearch(string searchText) { return StartEventsSearch(searchText, true, EventCategories.All); } @@ -593,9 +593,9 @@ namespace OpenMetaverse /// true to include Mature events /// category to search /// UUID of query to correlate results in callback. - public LLUUID StartEventsSearch(string searchText, bool showMature, EventCategories category) + public UUID StartEventsSearch(string searchText, bool showMature, EventCategories category) { - return StartEventsSearch(searchText, showMature, "u", 0, category, LLUUID.Random()); + return StartEventsSearch(searchText, showMature, "u", 0, category, UUID.Random()); } /// @@ -609,7 +609,7 @@ namespace OpenMetaverse /// EventCategory event is listed under. /// a LLUUID that can be used to track queries with results. /// UUID of query to correlate results in callback. - public LLUUID StartEventsSearch(string searchText, bool showMature, string eventDay, uint queryStart, EventCategories category, LLUUID queryID) + public UUID StartEventsSearch(string searchText, bool showMature, string eventDay, uint queryStart, EventCategories category, UUID queryID) { DirFindQueryPacket find = new DirFindQueryPacket(); find.AgentData.AgentID = Client.Self.AgentID; @@ -643,11 +643,11 @@ namespace OpenMetaverse int timeoutMS, out List results) { AutoResetEvent searchEvent = new AutoResetEvent(false); - LLUUID id = LLUUID.Random(); + UUID id = UUID.Random(); List people = null; DirPeopleReplyCallback callback = - delegate(LLUUID queryid, List matches) + delegate(UUID queryid, List matches) { if (id == queryid) { @@ -826,7 +826,7 @@ namespace OpenMetaverse evinfo.Amount = eventReply.EventData.Amount; evinfo.Category = (EventCategories)Helpers.BytesToUInt(eventReply.EventData.Category); evinfo.Cover = eventReply.EventData.Cover; - evinfo.Creator = (LLUUID)Helpers.FieldToUTF8String(eventReply.EventData.Creator); + evinfo.Creator = (UUID)Helpers.FieldToUTF8String(eventReply.EventData.Creator); evinfo.Date = Helpers.FieldToUTF8String(eventReply.EventData.Date); evinfo.DateUTC = eventReply.EventData.DateUTC; evinfo.Duration = eventReply.EventData.Duration; diff --git a/OpenMetaverse/EstateTools.cs b/OpenMetaverse/EstateTools.cs index d3a92126..3bc07390 100644 --- a/OpenMetaverse/EstateTools.cs +++ b/OpenMetaverse/EstateTools.cs @@ -57,7 +57,7 @@ namespace OpenMetaverse /// /// /// - public delegate void EstateManagersReply(uint estateID, int count, List managers); + public delegate void EstateManagersReply(uint estateID, int count, List managers); /// /// FIXME - Enumerate all params from EstateOwnerMessage packet @@ -66,17 +66,17 @@ namespace OpenMetaverse /// /// /// - public delegate void EstateUpdateInfoReply(string estateName, LLUUID estateOwner, uint estateID, bool denyNoPaymentInfo); + public delegate void EstateUpdateInfoReply(string estateName, UUID estateOwner, uint estateID, bool denyNoPaymentInfo); - public delegate void EstateManagersListReply(uint estateID, List managers); + public delegate void EstateManagersListReply(uint estateID, List managers); - public delegate void EstateBansReply(uint estateID, int count, List banned); + public delegate void EstateBansReply(uint estateID, int count, List banned); - public delegate void EstateUsersReply(uint estateID, int count, List allowedUsers); + public delegate void EstateUsersReply(uint estateID, int count, List allowedUsers); - public delegate void EstateGroupsReply(uint estateID, int count, List allowedGroups); + public delegate void EstateGroupsReply(uint estateID, int count, List allowedGroups); - public delegate void EstateCovenantReply(LLUUID covenantID, long timestamp, string estateName, LLUUID estateOwnerID); + public delegate void EstateCovenantReply(UUID covenantID, long timestamp, string estateName, UUID estateOwnerID); /// Callback for LandStatReply packets @@ -113,9 +113,9 @@ namespace OpenMetaverse /// Describes tasks returned in LandStatReply public class EstateTask { - public LLVector3 Position; + public Vector3 Position; public float Score; - public LLUUID TaskID; + public UUID TaskID; public uint TaskLocalID; public string TaskName; public string OwnerName; @@ -146,7 +146,7 @@ namespace OpenMetaverse /// Used by GroundTextureSettings public class GroundTextureRegion { - public LLUUID TextureID; + public UUID TextureID; public float Low; public float High; } @@ -229,7 +229,7 @@ namespace OpenMetaverse if (method == "estateupdateinfo") { string estateName = Helpers.FieldToUTF8String(message.ParamList[0].Parameter); - LLUUID estateOwner = new LLUUID(Helpers.FieldToUTF8String(message.ParamList[1].Parameter)); + UUID estateOwner = new UUID(Helpers.FieldToUTF8String(message.ParamList[1].Parameter)); estateID = Helpers.BytesToUInt(message.ParamList[2].Parameter); /* foreach (EstateOwnerMessagePacket.ParamListBlock param in message.ParamList) @@ -264,13 +264,13 @@ namespace OpenMetaverse if (OnGetEstateManagers != null) { count = (int)Helpers.BytesToUInt(message.ParamList[3].Parameter); - List managers = new List(); + List managers = new List(); if (message.ParamList.Length > 5) { for (int i = 5; i < message.ParamList.Length; i++) { - LLUUID managerID; - if (LLUUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out managerID)) + UUID managerID; + if (UUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out managerID)) { managers.Add(managerID); } @@ -285,13 +285,13 @@ namespace OpenMetaverse if (OnGetEstateBans != null) { count = (int)Helpers.BytesToUInt(message.ParamList[4].Parameter); - List bannedUsers = new List(); + List bannedUsers = new List(); if (message.ParamList.Length > 5) { for (int i = 5; i < message.ParamList.Length; i++) { - LLUUID bannedID; - if (LLUUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out bannedID)) + UUID bannedID; + if (UUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out bannedID)) { bannedUsers.Add(bannedID); } @@ -306,13 +306,13 @@ namespace OpenMetaverse if (OnGetAllowedUsers != null) { count = (int)Helpers.BytesToUInt(message.ParamList[2].Parameter); - List allowedUsers = new List(); + List allowedUsers = new List(); if (message.ParamList.Length > 5) { for (int i = 5; i < message.ParamList.Length; i++) { - LLUUID userID; - if (LLUUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out userID)) + UUID userID; + if (UUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out userID)) { allowedUsers.Add(userID); } @@ -327,13 +327,13 @@ namespace OpenMetaverse if (OnGetAllowedGroups != null) { count = (int)Helpers.BytesToUInt(message.ParamList[3].Parameter); - List allowedGroups = new List(); + List allowedGroups = new List(); if (message.ParamList.Length > 5) { for (int i = 5; i < message.ParamList.Length; i++) { - LLUUID groupID; - if (LLUUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out groupID)) + UUID groupID; + if (UUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out groupID)) { allowedGroups.Add(groupID); } @@ -350,12 +350,12 @@ namespace OpenMetaverse if (OnGetEstateManagers != null) { count = (int)Helpers.BytesToUInt(message.ParamList[5].Parameter); - List managers = new List(); + List managers = new List(); for (int i = 5; i < message.ParamList.Length; i++) { - LLUUID managerID; - if (LLUUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out managerID)) + UUID managerID; + if (UUID.TryParse(Helpers.FieldToUTF8String(message.ParamList[i].Parameter), out managerID)) { managers.Add(managerID); } @@ -392,7 +392,7 @@ namespace OpenMetaverse foreach (LandStatReplyPacket.ReportDataBlock rep in p.ReportData) { EstateTask task = new EstateTask(); - task.Position = new LLVector3(rep.LocationX, rep.LocationY, rep.LocationZ); + task.Position = new Vector3(rep.LocationX, rep.LocationY, rep.LocationZ); task.Score = rep.Score; task.TaskID = rep.TaskID; task.TaskLocalID = rep.TaskLocalID; @@ -447,8 +447,8 @@ namespace OpenMetaverse EstateOwnerMessagePacket estate = new EstateOwnerMessagePacket(); estate.AgentData.AgentID = Client.Self.AgentID; estate.AgentData.SessionID = Client.Self.SessionID; - estate.AgentData.TransactionID = LLUUID.Zero; - estate.MethodData.Invoice = LLUUID.Random(); + estate.AgentData.TransactionID = UUID.Zero; + estate.MethodData.Invoice = UUID.Random(); estate.MethodData.Method = Helpers.StringToField(method); estate.ParamList = new EstateOwnerMessagePacket.ParamListBlock[listParams.Count]; for (int i = 0; i < listParams.Count; i++) @@ -463,14 +463,14 @@ namespace OpenMetaverse /// Kick an avatar from an estate /// /// Key of Agent to remove - public void KickUser(LLUUID userID) + public void KickUser(UUID userID) { EstateOwnerMessage("kickestate", userID.ToString()); } /// Ban an avatar from an estate /// Key of Agent to remove - public void BanUser(LLUUID userID) + public void BanUser(UUID userID) { List listParams = new List(); uint flag = (uint)EstateAccessDelta.BanUser; @@ -482,7 +482,7 @@ namespace OpenMetaverse /// Unban an avatar from an estate /// Key of Agent to remove - public void UnbanUser(LLUUID userID) + public void UnbanUser(UUID userID) { List listParams = new List(); uint flag = (uint)EstateAccessDelta.UnbanUser; @@ -523,7 +523,7 @@ namespace OpenMetaverse /// Send an avatar back to their home location /// /// Key of avatar to send home - public void TeleportHomeUser(LLUUID pest) + public void TeleportHomeUser(UUID pest) { List listParams = new List(); listParams.Add(Client.Self.AgentID.ToString()); diff --git a/OpenMetaverse/FriendsManager.cs b/OpenMetaverse/FriendsManager.cs index dc30df95..1fda1ab8 100644 --- a/OpenMetaverse/FriendsManager.cs +++ b/OpenMetaverse/FriendsManager.cs @@ -54,7 +54,7 @@ namespace OpenMetaverse /// public class FriendInfo { - private LLUUID m_id; + private UUID m_id; private string m_name; private bool m_isOnline; private bool m_canSeeMeOnline; @@ -69,7 +69,7 @@ namespace OpenMetaverse /// /// System ID of the avatar /// - public LLUUID UUID { get { return m_id; } } + public UUID UUID { get { return m_id; } } /// /// full name of the avatar @@ -201,7 +201,7 @@ namespace OpenMetaverse /// System ID of the avatar being prepesented /// Rights the friend has to see you online and to modify your objects /// Rights you have to see your friend online and to modify their objects - internal FriendInfo(LLUUID id, FriendRights theirRights, FriendRights myRights) + internal FriendInfo(UUID id, FriendRights theirRights, FriendRights myRights) { m_id = id; m_canSeeMeOnline = (theirRights & FriendRights.CanSeeOnline) != 0; @@ -257,20 +257,20 @@ namespace OpenMetaverse /// full name of the agent offereing friendship /// session ID need when accepting/declining the offer /// Return true to accept the friendship, false to deny it - public delegate void FriendshipOfferedEvent(LLUUID agentID, string agentName, LLUUID imSessionID); + public delegate void FriendshipOfferedEvent(UUID agentID, string agentName, UUID imSessionID); /// /// Trigger when your friendship offer has been accepted or declined /// /// System ID of the avatar who accepted your friendship offer /// Full name of the avatar who accepted your friendship offer /// Whether the friendship request was accepted or declined - public delegate void FriendshipResponseEvent(LLUUID agentID, string agentName, bool accepted); + public delegate void FriendshipResponseEvent(UUID agentID, string agentName, bool accepted); /// /// Trigger when someone terminates your friendship. /// /// System ID of the avatar who terminated your friendship /// Full name of the avatar who terminated your friendship - public delegate void FriendshipTerminatedEvent(LLUUID agentID, string agentName); + public delegate void FriendshipTerminatedEvent(UUID agentID, string agentName); /// /// Triggered in response to a FindFriend request @@ -278,7 +278,7 @@ namespace OpenMetaverse /// Friends Key /// region handle friend is in /// X/Y location of friend - public delegate void FriendFoundEvent(LLUUID agentID, ulong regionHandle, LLVector3 location); + public delegate void FriendFoundEvent(UUID agentID, ulong regionHandle, Vector3 location); #endregion Delegates @@ -301,7 +301,7 @@ namespace OpenMetaverse /// The Key is the of the friend, the value is a /// object that contains detailed information including permissions you have and have given to the friend /// - public InternalDictionary FriendList = new InternalDictionary(); + public InternalDictionary FriendList = new InternalDictionary(); /// /// A Dictionary of key/value pairs containing current pending frienship offers. @@ -310,7 +310,7 @@ namespace OpenMetaverse /// the value is the of the request which is used to accept /// or decline the friendship offer /// - public InternalDictionary FriendRequests = new InternalDictionary(); + public InternalDictionary FriendRequests = new InternalDictionary(); /// /// Internal constructor @@ -340,9 +340,9 @@ namespace OpenMetaverse /// /// agentID of avatatar to form friendship with /// imSessionID of the friendship request message - public void AcceptFriendship(LLUUID fromAgentID, LLUUID imSessionID) + public void AcceptFriendship(UUID fromAgentID, UUID imSessionID) { - LLUUID callingCardFolder = Client.Inventory.FindFolderForType(AssetType.CallingCard); + UUID callingCardFolder = Client.Inventory.FindFolderForType(AssetType.CallingCard); AcceptFriendshipPacket request = new AcceptFriendshipPacket(); request.AgentData.AgentID = Client.Self.AgentID; @@ -369,7 +369,7 @@ namespace OpenMetaverse /// Decline a friendship request /// /// imSessionID of the friendship request message - public void DeclineFriendship(LLUUID fromAgentID, LLUUID imSessionID) + public void DeclineFriendship(UUID fromAgentID, UUID imSessionID) { DeclineFriendshipPacket request = new DeclineFriendshipPacket(); request.AgentData.AgentID = Client.Self.AgentID; @@ -384,14 +384,14 @@ namespace OpenMetaverse /// Offer friendship to an avatar. /// /// System ID of the avatar you are offering friendship to - public void OfferFriendship(LLUUID agentID) + public void OfferFriendship(UUID agentID) { // HACK: folder id stored as "message" - LLUUID callingCardFolder = Client.Inventory.FindFolderForType(AssetType.CallingCard); + UUID callingCardFolder = Client.Inventory.FindFolderForType(AssetType.CallingCard); Client.Self.InstantMessage(Client.Self.Name, agentID, callingCardFolder.ToString(), - LLUUID.Random(), + UUID.Random(), InstantMessageDialog.FriendshipOffered, InstantMessageOnline.Online, Client.Self.SimPosition, @@ -404,7 +404,7 @@ namespace OpenMetaverse /// Terminate a friendship with an avatar /// /// System ID of the avatar you are terminating the friendship with - public void TerminateFriendship(LLUUID agentID) + public void TerminateFriendship(UUID agentID) { if (FriendList.ContainsKey(agentID)) { @@ -452,7 +452,7 @@ namespace OpenMetaverse /// the of the friend /// the new rights to give the friend /// This method will implicitly set the rights to those passed in the rights parameter. - public void GrantRights(LLUUID friendID, FriendRights rights) + public void GrantRights(UUID friendID, FriendRights rights) { GrantUserRightsPacket request = new GrantUserRightsPacket(); request.AgentData.AgentID = Client.Self.AgentID; @@ -470,7 +470,7 @@ namespace OpenMetaverse /// /// Friends UUID to find /// - public void MapFriend(LLUUID friendID) + public void MapFriend(UUID friendID) { FindAgentPacket stalk = new FindAgentPacket(); stalk.AgentBlock.Hunter = Client.Self.AgentID; @@ -483,7 +483,7 @@ namespace OpenMetaverse /// Use to track a friends movement on the grid /// /// Friends Key - public void TrackFriend(LLUUID friendID) + public void TrackFriend(UUID friendID) { TrackAgentPacket stalk = new TrackAgentPacket(); stalk.AgentData.AgentID = Client.Self.AgentID; @@ -503,13 +503,13 @@ namespace OpenMetaverse /// private void Network_OnConnect(object sender) { - List names = new List(); + List names = new List(); if ( FriendList.Count > 0 ) { lock (FriendList) { - foreach (KeyValuePair kvp in FriendList.Dictionary) + foreach (KeyValuePair kvp in FriendList.Dictionary) { if (String.IsNullOrEmpty(kvp.Value.Name)) names.Add(kvp.Key); @@ -525,11 +525,11 @@ namespace OpenMetaverse /// This handles the asynchronous response of a RequestAvatarNames call. /// /// names cooresponding to the the list of IDs sent the the RequestAvatarNames call. - private void Avatars_OnAvatarNames(Dictionary names) + private void Avatars_OnAvatarNames(Dictionary names) { lock (FriendList) { - foreach (KeyValuePair kvp in names) + foreach (KeyValuePair kvp in names) { if (FriendList.ContainsKey(kvp.Key)) FriendList[kvp.Key].Name = names[kvp.Key]; @@ -668,10 +668,10 @@ namespace OpenMetaverse FindAgentPacket reply = (FindAgentPacket)packet; float x,y; - LLUUID prey = reply.AgentBlock.Prey; + UUID prey = reply.AgentBlock.Prey; ulong regionHandle = Helpers.GlobalPosToRegionHandle((float)reply.LocationBlock[0].GlobalX, (float)reply.LocationBlock[0].GlobalY, out x, out y); - LLVector3 xyz = new LLVector3(x, y, 0f); + Vector3 xyz = new Vector3(x, y, 0f); try { OnFriendFound(prey, regionHandle, xyz); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, Client, e); } diff --git a/OpenMetaverse/GridManager.cs b/OpenMetaverse/GridManager.cs index 56da8979..47283892 100644 --- a/OpenMetaverse/GridManager.cs +++ b/OpenMetaverse/GridManager.cs @@ -82,7 +82,7 @@ namespace OpenMetaverse /// public byte Agents; /// UUID of the World Map image - public LLUUID MapImageID; + public UUID MapImageID; /// Unique identifier for this region, a combination of the X /// and Y position public ulong RegionHandle; @@ -144,7 +144,7 @@ namespace OpenMetaverse public int Left; public int Top; public int Right; - public LLUUID ImageID; + public UUID ImageID; public bool ContainsRegion(int x, int y) { @@ -213,9 +213,9 @@ namespace OpenMetaverse /// Unknown public float SunPhase { get { return sunPhase; } } /// Current direction of the sun - public LLVector3 SunDirection { get { return sunDirection; } } + public Vector3 SunDirection { get { return sunDirection; } } /// Current angular velocity of the sun - public LLVector3 SunAngVelocity { get { return sunAngVelocity; } } + public Vector3 SunAngVelocity { get { return sunAngVelocity; } } /// A dictionary of all the regions, indexed by region name internal Dictionary Regions = new Dictionary(); @@ -224,8 +224,8 @@ namespace OpenMetaverse private GridClient Client; private float sunPhase; - private LLVector3 sunDirection; - private LLVector3 sunAngVelocity; + private Vector3 sunDirection; + private Vector3 sunAngVelocity; /// /// Constructor @@ -590,7 +590,7 @@ namespace OpenMetaverse { simulator.positionIndexPrey = i; } - simulator.avatarPositions.Add(new LLVector3(coarse.Location[i].X, coarse.Location[i].Y, + simulator.avatarPositions.Add(new Vector3(coarse.Location[i].X, coarse.Location[i].Y, coarse.Location[i].Z)); } diff --git a/OpenMetaverse/GroupManager.cs b/OpenMetaverse/GroupManager.cs index c9dac23f..93c0b7e0 100644 --- a/OpenMetaverse/GroupManager.cs +++ b/OpenMetaverse/GroupManager.cs @@ -38,7 +38,7 @@ namespace OpenMetaverse public struct GroupMember { /// Key of Group Member - public LLUUID ID; + public UUID ID; /// Total land contribution public int Contribution; /// Online status information @@ -57,7 +57,7 @@ namespace OpenMetaverse public struct GroupRole { /// Key of Role - public LLUUID ID; + public UUID ID; /// Name of Role public string Name; /// Group Title associated with Role @@ -93,13 +93,13 @@ namespace OpenMetaverse public struct Group { /// Key of Group - public LLUUID ID; + public UUID ID; /// Key of Group Insignia - public LLUUID InsigniaID; + public UUID InsigniaID; /// Key of Group Founder - public LLUUID FounderID; + public UUID FounderID; /// Key of Group Role for Owners - public LLUUID OwnerRole; + public UUID OwnerRole; /// Name of Group public string Name; /// Text of Group Charter @@ -145,13 +145,13 @@ namespace OpenMetaverse public struct GroupProfile { /// - public LLUUID ID; + public UUID ID; /// Key of Group Insignia - public LLUUID InsigniaID; + public UUID InsigniaID; /// Key of Group Founder - public LLUUID FounderID; + public UUID FounderID; /// Key of Group Role for Owners - public LLUUID OwnerRole; + public UUID OwnerRole; /// Name of Group public string Name; /// Text of Group Charter @@ -188,7 +188,7 @@ namespace OpenMetaverse public struct Vote { /// Key of Avatar who created Vote - public LLUUID Candidate; + public UUID Candidate; /// Text of the Vote proposal public string VoteString; /// Total number of votes @@ -310,9 +310,9 @@ namespace OpenMetaverse /// public string Message; /// - public LLUUID AttachmentID; + public UUID AttachmentID; /// - public LLUUID OwnerID; + public UUID OwnerID; /// /// @@ -320,7 +320,7 @@ namespace OpenMetaverse /// public byte[] SerializeAttachment() { - if (OwnerID == LLUUID.Zero || AttachmentID == LLUUID.Zero) + if (OwnerID == UUID.Zero || AttachmentID == UUID.Zero) return new byte[0]; //I guess this is how this works, no gaurentees string lsd = "" + AttachmentID.ToString() + "" @@ -460,12 +460,12 @@ namespace OpenMetaverse /// Callback for the list of groups the avatar is currently a member of /// /// - public delegate void CurrentGroupsCallback(Dictionary groups); + public delegate void CurrentGroupsCallback(Dictionary groups); /// /// Callback for a list of group names /// /// - public delegate void GroupNamesCallback(Dictionary groupNames); + public delegate void GroupNamesCallback(Dictionary groupNames); /// /// Callback for the profile of a group /// @@ -475,22 +475,22 @@ namespace OpenMetaverse /// Callback for the member list of a group /// /// - public delegate void GroupMembersCallback(Dictionary members); + public delegate void GroupMembersCallback(Dictionary members); /// /// Callback for the role list of a group /// /// - public delegate void GroupRolesCallback(Dictionary roles); + public delegate void GroupRolesCallback(Dictionary roles); /// /// Callback for a pairing of roles to members /// /// - public delegate void GroupRolesMembersCallback(List> rolesMembers); + public delegate void GroupRolesMembersCallback(List> rolesMembers); /// /// Callback for the title list of a group /// /// - public delegate void GroupTitlesCallback(Dictionary titles); + public delegate void GroupTitlesCallback(Dictionary titles); /// /// /// @@ -512,24 +512,24 @@ namespace OpenMetaverse /// /// /// - public delegate void GroupCreatedCallback(LLUUID groupID, bool success, string message); + public delegate void GroupCreatedCallback(UUID groupID, bool success, string message); /// /// /// /// /// - public delegate void GroupJoinedCallback(LLUUID groupID, bool success); + public delegate void GroupJoinedCallback(UUID groupID, bool success); /// /// /// /// /// - public delegate void GroupLeftCallback(LLUUID groupID, bool success); + public delegate void GroupLeftCallback(UUID groupID, bool success); /// /// /// /// - public delegate void GroupDroppedCallback(LLUUID groupID); + public delegate void GroupDroppedCallback(UUID groupID); /// /// @@ -537,7 +537,7 @@ namespace OpenMetaverse /// /// /// - public delegate void GroupMemberEjectedCallback(LLUUID groupID, LLUUID memberID, bool success); + public delegate void GroupMemberEjectedCallback(UUID groupID, UUID memberID, bool success); #endregion Delegates @@ -577,13 +577,13 @@ namespace OpenMetaverse private GridClient Client; /// A list of all the lists of group members, indexed by the request ID - private Dictionary> GroupMembersCaches; + private Dictionary> GroupMembersCaches; /// A list of all the lists of group roles, indexed by the request ID - private Dictionary> GroupRolesCaches; + private Dictionary> GroupRolesCaches; /// A list of all the role to member mappings - private Dictionary>> GroupRolesMembersCaches; + private Dictionary>> GroupRolesMembersCaches; /// Caches group name lookups - public InternalDictionary GroupName2KeyCache; + public InternalDictionary GroupName2KeyCache; /// /// /// @@ -592,10 +592,10 @@ namespace OpenMetaverse { Client = client; - GroupMembersCaches = new Dictionary>(); - GroupRolesCaches = new Dictionary>(); - GroupRolesMembersCaches = new Dictionary>>(); - GroupName2KeyCache = new InternalDictionary(); + GroupMembersCaches = new Dictionary>(); + GroupRolesCaches = new Dictionary>(); + GroupRolesMembersCaches = new Dictionary>>(); + GroupName2KeyCache = new InternalDictionary(); Client.Network.RegisterCallback(PacketType.AgentGroupDataUpdate, new NetworkManager.PacketCallback(GroupDataHandler)); Client.Network.RegisterCallback(PacketType.AgentDropGroup, new NetworkManager.PacketCallback(AgentDropGroupHandler)); @@ -635,12 +635,12 @@ namespace OpenMetaverse /// Lookup name of group based on groupID /// /// groupID of group to lookup name for. - public void RequestGroupName(LLUUID groupID) + public void RequestGroupName(UUID groupID) { // if we already have this in the cache, return from cache instead of making a request if (GroupName2KeyCache.ContainsKey(groupID)) { - Dictionary groupNames = new Dictionary(); + Dictionary groupNames = new Dictionary(); lock(GroupName2KeyCache.Dictionary) groupNames.Add(groupID, GroupName2KeyCache.Dictionary[groupID]); if (OnGroupNames != null) @@ -666,12 +666,12 @@ namespace OpenMetaverse /// Request lookup of multiple group names /// /// List of group IDs to request. - public void RequestGroupNames(List groupIDs) + public void RequestGroupNames(List groupIDs) { - Dictionary groupNames = new Dictionary(); + Dictionary groupNames = new Dictionary(); lock (GroupName2KeyCache.Dictionary) { - foreach (LLUUID groupID in groupIDs) + foreach (UUID groupID in groupIDs) { if (GroupName2KeyCache.ContainsKey(groupID)) groupNames[groupID] = GroupName2KeyCache.Dictionary[groupID]; @@ -702,7 +702,7 @@ namespace OpenMetaverse /// Lookup group profile data such as name, enrollment, founder, logo, etc /// Subscribe to OnGroupProfile event to receive the results. /// group ID (UUID) - public void RequestGroupProfile(LLUUID group) + public void RequestGroupProfile(UUID group) { GroupProfileRequestPacket request = new GroupProfileRequestPacket(); @@ -716,10 +716,10 @@ namespace OpenMetaverse /// Request a list of group members. /// Subscribe to OnGroupMembers event to receive the results. /// group ID (UUID) - public void RequestGroupMembers(LLUUID group) + public void RequestGroupMembers(UUID group) { - LLUUID requestID = LLUUID.Random(); - lock (GroupMembersCaches) GroupMembersCaches[requestID] = new Dictionary(); + UUID requestID = UUID.Random(); + lock (GroupMembersCaches) GroupMembersCaches[requestID] = new Dictionary(); GroupMembersRequestPacket request = new GroupMembersRequestPacket(); @@ -734,10 +734,10 @@ namespace OpenMetaverse /// Request group roles /// Subscribe to OnGroupRoles event to receive the results. /// group ID (UUID) - public void RequestGroupRoles(LLUUID group) + public void RequestGroupRoles(UUID group) { - LLUUID requestID = LLUUID.Random(); - lock (GroupRolesCaches) GroupRolesCaches[requestID] = new Dictionary(); + UUID requestID = UUID.Random(); + lock (GroupRolesCaches) GroupRolesCaches[requestID] = new Dictionary(); GroupRoleDataRequestPacket request = new GroupRoleDataRequestPacket(); @@ -752,12 +752,12 @@ namespace OpenMetaverse /// Request members (members,role) role mapping for a group. /// Subscribe to OnGroupRolesMembers event to receive the results. /// group ID (UUID) - public void RequestGroupRoleMembers(LLUUID group) + public void RequestGroupRoleMembers(UUID group) { - LLUUID requestID = LLUUID.Random(); + UUID requestID = UUID.Random(); lock (GroupRolesMembersCaches) { - GroupRolesMembersCaches[requestID] = new List>(); + GroupRolesMembersCaches[requestID] = new List>(); } GroupRoleMembersRequestPacket request = new GroupRoleMembersRequestPacket(); @@ -771,9 +771,9 @@ namespace OpenMetaverse /// Request a groups Titles /// Subscribe to OnGroupTitles event to receive the results. /// group ID (UUID) - public void RequestGroupTitles(LLUUID group) + public void RequestGroupTitles(UUID group) { - LLUUID requestID = LLUUID.Random(); + UUID requestID = UUID.Random(); GroupTitlesRequestPacket request = new GroupTitlesRequestPacket(); @@ -790,13 +790,13 @@ namespace OpenMetaverse /// group ID (UUID) /// How long of an interval /// Which interval (0 for current, 1 for last) - public void RequestGroupAccountSummary(LLUUID group, int intervalDays, int currentInterval) + public void RequestGroupAccountSummary(UUID group, int intervalDays, int currentInterval) { GroupAccountSummaryRequestPacket p = new GroupAccountSummaryRequestPacket(); p.AgentData.AgentID = Client.Self.AgentID; p.AgentData.SessionID = Client.Self.SessionID; p.AgentData.GroupID = group; - p.MoneyData.RequestID = LLUUID.Random(); + p.MoneyData.RequestID = UUID.Random(); p.MoneyData.CurrentInterval = currentInterval; p.MoneyData.IntervalDays = intervalDays; Client.Network.SendPacket(p); @@ -806,7 +806,7 @@ namespace OpenMetaverse /// The group to invite to /// A list of roles to invite a person to /// Key of person to invite - public void Invite(LLUUID group, List roles, LLUUID personkey) + public void Invite(UUID group, List roles, UUID personkey) { InviteGroupRequestPacket igp = new InviteGroupRequestPacket(); @@ -831,7 +831,7 @@ namespace OpenMetaverse /// Set a group as the current active group /// group ID (UUID) - public void ActivateGroup(LLUUID id) + public void ActivateGroup(UUID id) { ActivateGroupPacket activate = new ActivateGroupPacket(); activate.AgentData.AgentID = Client.Self.AgentID; @@ -844,7 +844,7 @@ namespace OpenMetaverse /// Change the role that determines your active title /// Group ID to use /// Role ID to change to - public void ActivateTitle(LLUUID group, LLUUID role) + public void ActivateTitle(UUID group, UUID role) { GroupTitleUpdatePacket gtu = new GroupTitleUpdatePacket(); gtu.AgentData.AgentID = Client.Self.AgentID; @@ -858,7 +858,7 @@ namespace OpenMetaverse /// Set this avatar's tier contribution /// Group ID to change tier in /// amount of tier to donate - public void SetGroupContribution(LLUUID group, int contribution) + public void SetGroupContribution(UUID group, int contribution) { SetGroupContributionPacket sgp = new SetGroupContributionPacket(); sgp.AgentData.AgentID = Client.Self.AgentID; @@ -872,7 +872,7 @@ namespace OpenMetaverse /// Request to join a group /// Subscribe to OnGroupJoined event for confirmation. /// group ID (UUID) to join. - public void RequestJoinGroup(LLUUID id) + public void RequestJoinGroup(UUID id) { JoinGroupRequestPacket join = new JoinGroupRequestPacket(); join.AgentData.AgentID = Client.Self.AgentID; @@ -913,7 +913,7 @@ namespace OpenMetaverse /// Update a group's profile and other information /// Groups ID (UUID) to update. /// Group struct to update. - public void UpdateGroup(LLUUID id, Group group) + public void UpdateGroup(UUID id, Group group) { OpenMetaverse.Packets.UpdateGroupInfoPacket cgrp = new UpdateGroupInfoPacket(); //Fill in agent data @@ -937,7 +937,7 @@ namespace OpenMetaverse /// Eject a user from a group /// Group ID to eject the user from /// Avatar's key to eject - public void EjectUser(LLUUID group, LLUUID member) + public void EjectUser(UUID group, UUID member) { OpenMetaverse.Packets.EjectGroupMemberRequestPacket eject = new EjectGroupMemberRequestPacket(); eject.AgentData = new EjectGroupMemberRequestPacket.AgentDataBlock(); @@ -957,7 +957,7 @@ namespace OpenMetaverse /// Update role information /// Group to update /// Role to update - public void UpdateRole(LLUUID group, GroupRole role) + public void UpdateRole(UUID group, GroupRole role) { OpenMetaverse.Packets.GroupRoleUpdatePacket gru = new GroupRoleUpdatePacket(); gru.AgentData.AgentID = Client.Self.AgentID; @@ -975,7 +975,7 @@ namespace OpenMetaverse /// Create a new group role /// Group ID to update /// Role to create - public void CreateRole(LLUUID group, GroupRole role) + public void CreateRole(UUID group, GroupRole role) { OpenMetaverse.Packets.GroupRoleUpdatePacket gru = new GroupRoleUpdatePacket(); gru.AgentData.AgentID = Client.Self.AgentID; @@ -994,7 +994,7 @@ namespace OpenMetaverse /// Group ID to update /// Role ID to be removed from /// Avatar's Key to remove - public void RemoveFromRole(LLUUID group, LLUUID role, LLUUID member) + public void RemoveFromRole(UUID group, UUID role, UUID member) { OpenMetaverse.Packets.GroupRoleChangesPacket grc = new GroupRoleChangesPacket(); grc.AgentData.AgentID = Client.Self.AgentID; @@ -1014,7 +1014,7 @@ namespace OpenMetaverse /// Group ID to update /// Role ID to assign to /// Avatar's ID to assign to role - public void AddToRole(LLUUID group, LLUUID role, LLUUID member) + public void AddToRole(UUID group, UUID role, UUID member) { OpenMetaverse.Packets.GroupRoleChangesPacket grc = new GroupRoleChangesPacket(); grc.AgentData.AgentID = Client.Self.AgentID; @@ -1033,17 +1033,17 @@ namespace OpenMetaverse /// Send out a group notice /// Group ID to update /// GroupNotice structure containing notice data - public void SendGroupNotice(LLUUID group, GroupNotice notice) + public void SendGroupNotice(UUID group, GroupNotice notice) { Client.Self.InstantMessage(Client.Self.Name, group, notice.Subject + "|" + notice.Message, - LLUUID.Zero, InstantMessageDialog.GroupNotice, InstantMessageOnline.Online, - LLVector3.Zero, LLUUID.Zero, notice.SerializeAttachment()); + UUID.Zero, InstantMessageDialog.GroupNotice, InstantMessageOnline.Online, + Vector3.Zero, UUID.Zero, notice.SerializeAttachment()); } /// Start a group proposal (vote) /// The Group ID to send proposal to /// GroupProposal structure containing the proposal - public void StartProposal(LLUUID group, GroupProposal prop) + public void StartProposal(UUID group, GroupProposal prop) { StartGroupProposalPacket p = new StartGroupProposalPacket(); p.AgentData.AgentID = Client.Self.AgentID; @@ -1059,7 +1059,7 @@ namespace OpenMetaverse /// Request to leave a group /// Subscribe to OnGroupLeft event to receive confirmation /// The group to leave - public void LeaveGroup(LLUUID groupID) + public void LeaveGroup(UUID groupID) { LeaveGroupRequestPacket p = new LeaveGroupRequestPacket(); p.AgentData.AgentID = Client.Self.AgentID; @@ -1076,7 +1076,7 @@ namespace OpenMetaverse { AgentGroupDataUpdatePacket update = (AgentGroupDataUpdatePacket)packet; - Dictionary currentGroups = new Dictionary(); + Dictionary currentGroups = new Dictionary(); foreach (AgentGroupDataUpdatePacket.GroupDataBlock block in update.GroupData) { @@ -1143,7 +1143,7 @@ namespace OpenMetaverse if (OnGroupTitles != null) { GroupTitlesReplyPacket titles = (GroupTitlesReplyPacket)packet; - Dictionary groupTitleCache = new Dictionary(); + Dictionary groupTitleCache = new Dictionary(); foreach (GroupTitlesReplyPacket.GroupDataBlock block in titles.GroupData) { @@ -1163,7 +1163,7 @@ namespace OpenMetaverse private void GroupMembersHandler(Packet packet, Simulator simulator) { GroupMembersReplyPacket members = (GroupMembersReplyPacket)packet; - Dictionary groupMemberCache = null; + Dictionary groupMemberCache = null; lock (GroupMembersCaches) { @@ -1199,7 +1199,7 @@ namespace OpenMetaverse private void GroupRoleDataHandler(Packet packet, Simulator simulator) { GroupRoleDataReplyPacket roles = (GroupRoleDataReplyPacket)packet; - Dictionary groupRoleCache = null; + Dictionary groupRoleCache = null; lock (GroupRolesCaches) { @@ -1234,7 +1234,7 @@ namespace OpenMetaverse private void GroupRoleMembersHandler(Packet packet, Simulator simulator) { GroupRoleMembersReplyPacket members = (GroupRoleMembersReplyPacket)packet; - List> groupRoleMemberCache = null; + List> groupRoleMemberCache = null; try { @@ -1247,8 +1247,8 @@ namespace OpenMetaverse foreach (GroupRoleMembersReplyPacket.MemberDataBlock block in members.MemberData) { - KeyValuePair rolemember = - new KeyValuePair(block.RoleID, block.MemberID); + KeyValuePair rolemember = + new KeyValuePair(block.RoleID, block.MemberID); groupRoleMemberCache.Add(rolemember); } @@ -1390,7 +1390,7 @@ namespace OpenMetaverse UUIDGroupNameReplyPacket reply = (UUIDGroupNameReplyPacket)packet; UUIDGroupNameReplyPacket.UUIDNameBlockBlock[] blocks = reply.UUIDNameBlock; - Dictionary groupNames = new Dictionary(); + Dictionary groupNames = new Dictionary(); foreach (UUIDGroupNameReplyPacket.UUIDNameBlockBlock block in blocks) { diff --git a/OpenMetaverse/Helpers.cs b/OpenMetaverse/Helpers.cs index bd71d3c3..4c317472 100644 --- a/OpenMetaverse/Helpers.cs +++ b/OpenMetaverse/Helpers.cs @@ -827,9 +827,9 @@ namespace OpenMetaverse /// /// /// - public static LLVector3 Lerp(LLVector3 a, LLVector3 b, float u) + public static Vector3 Lerp(Vector3 a, Vector3 b, float u) { - return new LLVector3( + return new Vector3( a.X + (b.X - a.X) * u, a.Y + (b.Y - a.Y) * u, a.Z + (b.Z - a.Z) * u); @@ -1017,8 +1017,8 @@ namespace OpenMetaverse /// Owner mask (permisions) /// The calculated CRC public static uint InventoryCRC(int creationDate, byte saleType, sbyte invType, sbyte type, - LLUUID assetID, LLUUID groupID, int salePrice, LLUUID ownerID, LLUUID creatorID, - LLUUID itemID, LLUUID folderID, uint everyoneMask, uint flags, uint nextOwnerMask, + UUID assetID, UUID groupID, int salePrice, UUID ownerID, UUID creatorID, + UUID itemID, UUID folderID, uint everyoneMask, uint flags, uint nextOwnerMask, uint groupMask, uint ownerMask) { uint CRC = 0; @@ -1266,14 +1266,14 @@ namespace OpenMetaverse #endif } - public static bool TryParse(string s, out LLUUID result) + public static bool TryParse(string s, out UUID result) { - return LLUUID.TryParse(s, out result); + return UUID.TryParse(s, out result); } - public static bool TryParse(string s, out LLVector3 result) + public static bool TryParse(string s, out Vector3 result) { - return LLVector3.TryParse(s, out result); + return Vector3.TryParse(s, out result); } public static bool TryParseHex(string s, out uint result) diff --git a/OpenMetaverse/Interfaces/IRendering.cs b/OpenMetaverse/Interfaces/IRendering.cs index 8e8b09a6..68685bfd 100644 --- a/OpenMetaverse/Interfaces/IRendering.cs +++ b/OpenMetaverse/Interfaces/IRendering.cs @@ -75,6 +75,6 @@ namespace OpenMetaverse.Rendering /// Vertex list to modify texture coordinates for /// Center-point of the face /// Face texture parameters - void TransformTexCoords(List vertices, LLVector3 center, LLObject.TextureEntryFace teFace); + void TransformTexCoords(List vertices, Vector3 center, LLObject.TextureEntryFace teFace); } } diff --git a/OpenMetaverse/Inventory.cs b/OpenMetaverse/Inventory.cs index 3350de45..74c9bfb4 100644 --- a/OpenMetaverse/Inventory.cs +++ b/OpenMetaverse/Inventory.cs @@ -137,27 +137,27 @@ namespace OpenMetaverse } } - public LLUUID Owner { + public UUID Owner { get { return _Owner; } } - private LLUUID _Owner; + private UUID _Owner; private GridClient Client; private InventoryManager Manager; - private Dictionary Items = new Dictionary(); + private Dictionary Items = new Dictionary(); public Inventory(GridClient client, InventoryManager manager) : this(client, manager, client.Self.AgentID) { } - public Inventory(GridClient client, InventoryManager manager, LLUUID owner) + public Inventory(GridClient client, InventoryManager manager, UUID owner) { Client = client; Manager = manager; _Owner = owner; - if (owner == LLUUID.Zero) + if (owner == UUID.Zero) Logger.Log("Inventory owned by nobody!", Helpers.LogLevel.Warning, Client); - Items = new Dictionary(); + Items = new Dictionary(); } public List GetContents(InventoryFolder folder) @@ -171,7 +171,7 @@ namespace OpenMetaverse /// A folder's UUID /// The contents of the folder corresponding to folder /// When folder does not exist in the inventory - public List GetContents(LLUUID folder) + public List GetContents(UUID folder) { InventoryNode folderNode; if (!Items.TryGetValue(folder, out folderNode)) @@ -202,7 +202,7 @@ namespace OpenMetaverse lock (Items) { InventoryNode itemParent = null; - if (item.ParentUUID != LLUUID.Zero && !Items.TryGetValue(item.ParentUUID, out itemParent)) + if (item.ParentUUID != UUID.Zero && !Items.TryGetValue(item.ParentUUID, out itemParent)) { // OK, we have no data on the parent, let's create a fake one. InventoryFolder fakeParent = new InventoryFolder(item.ParentUUID); @@ -218,7 +218,7 @@ namespace OpenMetaverse if (Client.Settings.FETCH_MISSING_INVENTORY) { // Fetch the parent - List fetchreq = new List(1); + List fetchreq = new List(1); fetchreq.Add(item.ParentUUID); //Manager.FetchInventory(fetchreq); // we cant fetch folder data! :-O } @@ -259,7 +259,7 @@ namespace OpenMetaverse } } - public InventoryNode GetNodeFor(LLUUID uuid) + public InventoryNode GetNodeFor(UUID uuid) { return Items[uuid]; } @@ -298,7 +298,7 @@ namespace OpenMetaverse /// /// The LLUUID to check. /// true if inventory contains uuid, false otherwise - public bool Contains(LLUUID uuid) + public bool Contains(UUID uuid) { return Items.ContainsKey(uuid); } @@ -319,7 +319,7 @@ namespace OpenMetaverse /// /// The UUID of the InventoryObject to get or set, ignored if set to non-null value. /// The InventoryObject corresponding to uuid. - public InventoryBase this[LLUUID uuid] + public InventoryBase this[UUID uuid] { get { diff --git a/OpenMetaverse/InventoryManager.cs b/OpenMetaverse/InventoryManager.cs index f551a9d9..7f2416c8 100644 --- a/OpenMetaverse/InventoryManager.cs +++ b/OpenMetaverse/InventoryManager.cs @@ -140,21 +140,21 @@ namespace OpenMetaverse public abstract class InventoryBase { /// of item/folder - public readonly LLUUID UUID; + public readonly UUID UUID; /// of parent folder - public LLUUID ParentUUID; + public UUID ParentUUID; /// Name of item/folder public string Name; /// Item/Folder Owners - public LLUUID OwnerID; + public UUID OwnerID; /// /// Constructor, takes an itemID as a parameter /// /// The of the item - public InventoryBase(LLUUID itemID) + public InventoryBase(UUID itemID) { - if (itemID == LLUUID.Zero) + if (itemID == UUID.Zero) Logger.Log("Initializing an InventoryBase with LLUUID.Zero", Helpers.LogLevel.Warning); UUID = itemID; } @@ -200,7 +200,7 @@ namespace OpenMetaverse public class InventoryItem : InventoryBase { /// The of this item - public LLUUID AssetUUID; + public UUID AssetUUID; /// The combined of this item public Permissions Permissions; /// The type of item from @@ -208,11 +208,11 @@ namespace OpenMetaverse /// The type of item from the enum public InventoryType InventoryType; /// The of the creator of this item - public LLUUID CreatorID; + public UUID CreatorID; /// A Description of this item public string Description; /// The s this item is set to or owned by - public LLUUID GroupID; + public UUID GroupID; /// If true, item is owned by a group public bool GroupOwned; /// The price this item can be purchased for @@ -229,7 +229,7 @@ namespace OpenMetaverse /// Construct a new InventoryItem object /// /// The of the item - public InventoryItem(LLUUID itemID) + public InventoryItem(UUID itemID) : base(itemID) { } /// @@ -237,7 +237,7 @@ namespace OpenMetaverse /// /// The type of item from /// of the item - public InventoryItem(InventoryType type, LLUUID itemID) : base(itemID) { InventoryType = type; } + public InventoryItem(InventoryType type, UUID itemID) : base(itemID) { InventoryType = type; } /// /// Generates a number corresponding to the value of the object to support the use of a hash table. @@ -307,7 +307,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryTexture(LLUUID itemID) : base(itemID) + public InventoryTexture(UUID itemID) : base(itemID) { InventoryType = InventoryType.Texture; } @@ -323,7 +323,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventorySound(LLUUID itemID) : base(itemID) + public InventorySound(UUID itemID) : base(itemID) { InventoryType = InventoryType.Sound; } @@ -339,7 +339,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryCallingCard(LLUUID itemID) : base(itemID) + public InventoryCallingCard(UUID itemID) : base(itemID) { InventoryType = InventoryType.CallingCard; } @@ -355,7 +355,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryLandmark(LLUUID itemID) : base(itemID) + public InventoryLandmark(UUID itemID) : base(itemID) { InventoryType = InventoryType.Landmark; } @@ -380,7 +380,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryObject(LLUUID itemID) : base(itemID) + public InventoryObject(UUID itemID) : base(itemID) { InventoryType = InventoryType.Object; } @@ -408,7 +408,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryNotecard(LLUUID itemID) : base(itemID) + public InventoryNotecard(UUID itemID) : base(itemID) { InventoryType = InventoryType.Notecard; } @@ -425,7 +425,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryCategory(LLUUID itemID) : base(itemID) + public InventoryCategory(UUID itemID) : base(itemID) { InventoryType = InventoryType.Category; } @@ -441,7 +441,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryLSL(LLUUID itemID) : base(itemID) + public InventoryLSL(UUID itemID) : base(itemID) { InventoryType = InventoryType.LSL; } @@ -457,7 +457,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventorySnapshot(LLUUID itemID) : base(itemID) + public InventorySnapshot(UUID itemID) : base(itemID) { InventoryType = InventoryType.Snapshot; } @@ -473,7 +473,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryAttachment(LLUUID itemID) : base(itemID) + public InventoryAttachment(UUID itemID) : base(itemID) { InventoryType = InventoryType.Attachment; } @@ -498,7 +498,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryWearable(LLUUID itemID) : base(itemID) { InventoryType = InventoryType.Wearable; } + public InventoryWearable(UUID itemID) : base(itemID) { InventoryType = InventoryType.Wearable; } /// /// The , Skin, Shape, Skirt, Etc @@ -520,7 +520,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryAnimation(LLUUID itemID) : base(itemID) + public InventoryAnimation(UUID itemID) : base(itemID) { InventoryType = InventoryType.Animation; } @@ -536,7 +536,7 @@ namespace OpenMetaverse /// /// A which becomes the /// objects AssetUUID - public InventoryGesture(LLUUID itemID) : base(itemID) + public InventoryGesture(UUID itemID) : base(itemID) { InventoryType = InventoryType.Gesture; } @@ -559,7 +559,7 @@ namespace OpenMetaverse /// Constructor /// /// LLUUID of the folder - public InventoryFolder(LLUUID itemID) + public InventoryFolder(UUID itemID) : base(itemID) { } /// @@ -625,8 +625,8 @@ namespace OpenMetaverse { protected struct InventorySearch { - public LLUUID Folder; - public LLUUID Owner; + public UUID Folder; + public UUID Owner; public string[] Path; public int Level; } @@ -649,7 +649,7 @@ namespace OpenMetaverse /// /// /// - public delegate void ItemCreatedFromAssetCallback(bool success, string status, LLUUID itemID, LLUUID assetID); + public delegate void ItemCreatedFromAssetCallback(bool success, string status, UUID itemID, UUID assetID); /// /// @@ -667,7 +667,7 @@ namespace OpenMetaverse /// Callback for an inventory folder updating /// /// UUID of the folder that was updated - public delegate void FolderUpdatedCallback(LLUUID folderID); + public delegate void FolderUpdatedCallback(UUID folderID); /// /// Callback for when an inventory item is offered to us by another avatar or an object @@ -678,7 +678,7 @@ namespace OpenMetaverse /// Will be null if item is offered from an object /// will be true of item is offered from an object /// Return true to accept the offer, or false to decline it - public delegate bool ObjectOfferedCallback(InstantMessage offerDetails, AssetType type, LLUUID objectID, bool fromTask); + public delegate bool ObjectOfferedCallback(InstantMessage offerDetails, AssetType type, UUID objectID, bool fromTask); /// /// Callback when an inventory object is accepted and received from a @@ -690,15 +690,15 @@ namespace OpenMetaverse /// /// /// - public delegate void TaskItemReceivedCallback(LLUUID itemID, LLUUID folderID, LLUUID creatorID, - LLUUID assetID, InventoryType type); + public delegate void TaskItemReceivedCallback(UUID itemID, UUID folderID, UUID creatorID, + UUID assetID, InventoryType type); /// /// /// /// /// - public delegate void FindObjectByPathCallback(string path, LLUUID inventoryObjectID); + public delegate void FindObjectByPathCallback(string path, UUID inventoryObjectID); /// /// Reply received after calling RequestTaskInventory, @@ -707,7 +707,7 @@ namespace OpenMetaverse /// UUID of the inventory item /// Version number of the task inventory asset /// Filename of the task inventory asset - public delegate void TaskInventoryReplyCallback(LLUUID itemID, short serial, string assetFilename); + public delegate void TaskInventoryReplyCallback(UUID itemID, short serial, string assetFilename); /// /// @@ -716,7 +716,7 @@ namespace OpenMetaverse /// /// /// - public delegate void NotecardUploadedAssetCallback(bool success, string status, LLUUID itemID, LLUUID assetID); + public delegate void NotecardUploadedAssetCallback(bool success, string status, UUID itemID, UUID assetID); #endregion Delegates @@ -909,7 +909,7 @@ namespace OpenMetaverse /// a integer representing the number of milliseconds to wait for results /// An object on success, or null if no item was found /// Items will also be sent to the event - public InventoryItem FetchItem(LLUUID itemID, LLUUID ownerID, int timeoutMS) + public InventoryItem FetchItem(UUID itemID, UUID ownerID, int timeoutMS) { AutoResetEvent fetchEvent = new AutoResetEvent(false); InventoryItem fetchedItem = null; @@ -939,7 +939,7 @@ namespace OpenMetaverse /// The items /// The item Owners /// - public void RequestFetchInventory(LLUUID itemID, LLUUID ownerID) + public void RequestFetchInventory(UUID itemID, UUID ownerID) { FetchInventoryPacket fetch = new FetchInventoryPacket(); fetch.AgentData = new FetchInventoryPacket.AgentDataBlock(); @@ -960,7 +960,7 @@ namespace OpenMetaverse /// Inventory items to request /// Owners of the inventory items /// - public void RequestFetchInventory(List itemIDs, List ownerIDs) + public void RequestFetchInventory(List itemIDs, List ownerIDs) { if (itemIDs.Count != ownerIDs.Count) throw new ArgumentException("itemIDs and ownerIDs must contain the same number of entries"); @@ -994,14 +994,14 @@ namespace OpenMetaverse /// /// InventoryFolder.DescendentCount will only be accurate if both folders and items are /// requested - public List FolderContents(LLUUID folder, LLUUID owner, bool folders, bool items, + public List FolderContents(UUID folder, UUID owner, bool folders, bool items, InventorySortOrder order, int timeoutMS) { List objects = null; AutoResetEvent fetchEvent = new AutoResetEvent(false); FolderUpdatedCallback callback = - delegate(LLUUID folderID) + delegate(UUID folderID) { if (folderID == folder && _Store[folder] is InventoryFolder) @@ -1039,7 +1039,7 @@ namespace OpenMetaverse /// true to return s containd in folder /// the sort order to return items in /// - public void RequestFolderContents(LLUUID folder, LLUUID owner, bool folders, bool items, + public void RequestFolderContents(UUID folder, UUID owner, bool folders, bool items, InventorySortOrder order) { FetchInventoryDescendentsPacket fetch = new FetchInventoryDescendentsPacket(); @@ -1068,13 +1068,13 @@ namespace OpenMetaverse /// /// The UUID of the desired folder if found, the UUID of the RootFolder /// if not found, or LLUUID.Zero on failure - public LLUUID FindFolderForType(AssetType type) + public UUID FindFolderForType(AssetType type) { if (_Store == null) { Logger.Log("Inventory is null, FindFolderForType() lookup cannot continue", Helpers.LogLevel.Error, _Client); - return LLUUID.Zero; + return UUID.Zero; } // Folders go in the root @@ -1108,13 +1108,13 @@ namespace OpenMetaverse /// milliseconds to wait for a reply /// Found items or if /// timeout occurs or item is not found - public LLUUID FindObjectByPath(LLUUID baseFolder, LLUUID inventoryOwner, string path, int timeoutMS) + public UUID FindObjectByPath(UUID baseFolder, UUID inventoryOwner, string path, int timeoutMS) { AutoResetEvent findEvent = new AutoResetEvent(false); - LLUUID foundItem = LLUUID.Zero; + UUID foundItem = UUID.Zero; FindObjectByPathCallback callback = - delegate(string thisPath, LLUUID inventoryObjectID) + delegate(string thisPath, UUID inventoryObjectID) { if (thisPath == path) { @@ -1140,7 +1140,7 @@ namespace OpenMetaverse /// The object owners /// A string path to search, folders/objects separated by a '/' /// Results are sent to the event - public void RequestFindObjectByPath(LLUUID baseFolder, LLUUID inventoryOwner, string path) + public void RequestFindObjectByPath(UUID baseFolder, UUID inventoryOwner, string path) { if (path == null || path.Length == 0) throw new ArgumentException("Empty path is not supported"); @@ -1165,7 +1165,7 @@ namespace OpenMetaverse /// Number of levels below baseFolder to conduct searches /// if True, will stop searching after first match is found /// A list of inventory items found - public List LocalFind(LLUUID baseFolder, string[] path, int level, bool firstOnly) + public List LocalFind(UUID baseFolder, string[] path, int level, bool firstOnly) { List objects = new List(); //List folders = new List(); @@ -1225,7 +1225,7 @@ namespace OpenMetaverse /// The source folders /// The destination folders /// The name to change the folder to - public void MoveFolder(LLUUID folderID, LLUUID newparentID, string newName) + public void MoveFolder(UUID folderID, UUID newparentID, string newName) { lock (Store) { @@ -1255,7 +1255,7 @@ namespace OpenMetaverse /// /// The source folders /// The destination folders - public void MoveFolder(LLUUID folderID, LLUUID newParentID) + public void MoveFolder(UUID folderID, UUID newParentID) { lock (Store) { @@ -1287,13 +1287,13 @@ namespace OpenMetaverse /// A Dictionary containing the /// of the source as the key, and the /// of the destination as the value - public void MoveFolders(Dictionary foldersNewParents) + public void MoveFolders(Dictionary foldersNewParents) { // FIXME: Use two List to stay consistent lock (Store) { - foreach (KeyValuePair entry in foldersNewParents) + foreach (KeyValuePair entry in foldersNewParents) { if (_Store.Contains(entry.Key)) { @@ -1313,7 +1313,7 @@ namespace OpenMetaverse move.InventoryData = new MoveInventoryFolderPacket.InventoryDataBlock[foldersNewParents.Count]; int index = 0; - foreach (KeyValuePair folder in foldersNewParents) + foreach (KeyValuePair folder in foldersNewParents) { MoveInventoryFolderPacket.InventoryDataBlock block = new MoveInventoryFolderPacket.InventoryDataBlock(); block.FolderID = folder.Key; @@ -1330,7 +1330,7 @@ namespace OpenMetaverse /// /// The of the source item to move /// The of the destination folder - public void MoveItem(LLUUID itemID, LLUUID folderID) + public void MoveItem(UUID itemID, UUID folderID) { MoveItem(itemID, folderID, String.Empty); } @@ -1341,7 +1341,7 @@ namespace OpenMetaverse /// The of the source item to move /// The of the destination folder /// The name to change the folder to - public void MoveItem(LLUUID itemID, LLUUID folderID, string newName) + public void MoveItem(UUID itemID, UUID folderID, string newName) { lock (_Store) { @@ -1373,11 +1373,11 @@ namespace OpenMetaverse /// A Dictionary containing the /// of the source item as the key, and the /// of the destination folder as the value - public void MoveItems(Dictionary itemsNewParents) + public void MoveItems(Dictionary itemsNewParents) { lock (_Store) { - foreach (KeyValuePair entry in itemsNewParents) + foreach (KeyValuePair entry in itemsNewParents) { if (_Store.Contains(entry.Key)) { @@ -1396,7 +1396,7 @@ namespace OpenMetaverse move.InventoryData = new MoveInventoryItemPacket.InventoryDataBlock[itemsNewParents.Count]; int index = 0; - foreach (KeyValuePair entry in itemsNewParents) + foreach (KeyValuePair entry in itemsNewParents) { MoveInventoryItemPacket.InventoryDataBlock block = new MoveInventoryItemPacket.InventoryDataBlock(); block.ItemID = entry.Key; @@ -1416,7 +1416,7 @@ namespace OpenMetaverse /// Remove descendants of a folder /// /// The of the folder - public void RemoveDescendants(LLUUID folder) + public void RemoveDescendants(UUID folder) { PurgeInventoryDescendentsPacket purge = new PurgeInventoryDescendentsPacket(); purge.AgentData.AgentID = _Client.Self.AgentID; @@ -1442,9 +1442,9 @@ namespace OpenMetaverse /// Remove a single item from inventory /// /// The of the inventory item to remove - public void RemoveItem(LLUUID item) + public void RemoveItem(UUID item) { - List items = new List(1); + List items = new List(1); items.Add(item); Remove(items, null); @@ -1454,9 +1454,9 @@ namespace OpenMetaverse /// Remove a folder from inventory /// /// The of the folder to remove - public void RemoveFolder(LLUUID folder) + public void RemoveFolder(UUID folder) { - List folders = new List(1); + List folders = new List(1); folders.Add(folder); Remove(null, folders); @@ -1467,7 +1467,7 @@ namespace OpenMetaverse /// /// A List containing the s of items to remove /// A List containing the s of the folders to remove - public void Remove(List items, List folders) + public void Remove(List items, List folders) { if ((items == null || items.Count == 0) && (folders == null || folders.Count == 0)) return; @@ -1481,7 +1481,7 @@ namespace OpenMetaverse // To indicate that we want no items removed: rem.ItemData = new RemoveInventoryObjectsPacket.ItemDataBlock[1]; rem.ItemData[0] = new RemoveInventoryObjectsPacket.ItemDataBlock(); - rem.ItemData[0].ItemID = LLUUID.Zero; + rem.ItemData[0].ItemID = UUID.Zero; } else { @@ -1505,7 +1505,7 @@ namespace OpenMetaverse // To indicate we want no folders removed: rem.FolderData = new RemoveInventoryObjectsPacket.FolderDataBlock[1]; rem.FolderData[0] = new RemoveInventoryObjectsPacket.FolderDataBlock(); - rem.FolderData[0].FolderID = LLUUID.Zero; + rem.FolderData[0].FolderID = UUID.Zero; } else { @@ -1546,7 +1546,7 @@ namespace OpenMetaverse { List items = _Store.GetContents(_Store.RootFolder); - LLUUID folderKey = LLUUID.Zero; + UUID folderKey = UUID.Zero; foreach (InventoryBase item in items) { if ((item as InventoryFolder) != null) @@ -1560,8 +1560,8 @@ namespace OpenMetaverse } } items = _Store.GetContents(folderKey); - List remItems = new List(); - List remFolders = new List(); + List remItems = new List(); + List remFolders = new List(); foreach (InventoryBase item in items) { if ((item as InventoryFolder) != null) @@ -1582,7 +1582,7 @@ namespace OpenMetaverse /// /// /// Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here. - public void RequestCreateItem(LLUUID parentFolder, string name, string description, AssetType type, LLUUID assetTransactionID, + public void RequestCreateItem(UUID parentFolder, string name, string description, AssetType type, UUID assetTransactionID, InventoryType invType, PermissionMask nextOwnerMask, ItemCreatedCallback callback) { // Even though WearableType 0 is Shape, in this context it is treated as NOT_WEARABLE @@ -1594,7 +1594,7 @@ namespace OpenMetaverse /// /// /// Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here. - public void RequestCreateItem(LLUUID parentFolder, string name, string description, AssetType type, LLUUID assetTransactionID, + public void RequestCreateItem(UUID parentFolder, string name, string description, AssetType type, UUID assetTransactionID, InventoryType invType, WearableType wearableType, PermissionMask nextOwnerMask, ItemCreatedCallback callback) { CreateInventoryItemPacket create = new CreateInventoryItemPacket(); @@ -1620,7 +1620,7 @@ namespace OpenMetaverse /// ID of the folder to put this folder in /// Name of the folder to create /// The UUID of the newly created folder - public LLUUID CreateFolder(LLUUID parentID, string name) + public UUID CreateFolder(UUID parentID, string name) { return CreateFolder(parentID, name, AssetType.Unknown); } @@ -1638,9 +1638,9 @@ namespace OpenMetaverse /// If you specify a preferred type of AsseType.Folder /// it will create a new root folder which may likely cause all sorts /// of strange problems - public LLUUID CreateFolder(LLUUID parentID, string name, AssetType preferredType) + public UUID CreateFolder(UUID parentID, string name, AssetType preferredType) { - LLUUID id = LLUUID.Random(); + UUID id = UUID.Random(); // Assign a folder name if one is not already set if (String.IsNullOrEmpty(name)) @@ -1684,7 +1684,7 @@ namespace OpenMetaverse } public void RequestCreateItemFromAsset(byte[] data, string name, string description, AssetType assetType, - InventoryType invType, LLUUID folderID, CapsClient.ProgressCallback progCallback, ItemCreatedFromAssetCallback callback) + InventoryType invType, UUID folderID, CapsClient.ProgressCallback progCallback, ItemCreatedFromAssetCallback callback) { if (_Client.Network.CurrentSim == null || _Client.Network.CurrentSim.Caps == null) throw new Exception("NewFileAgentInventory capability is not currently available"); @@ -1724,7 +1724,7 @@ namespace OpenMetaverse /// /// /// - public void RequestCopyItem(LLUUID item, LLUUID newParent, string newName, ItemCopiedCallback callback) + public void RequestCopyItem(UUID item, UUID newParent, string newName, ItemCopiedCallback callback) { RequestCopyItem(item, newParent, newName, _Client.Self.AgentID, callback); } @@ -1737,13 +1737,13 @@ namespace OpenMetaverse /// /// /// - public void RequestCopyItem(LLUUID item, LLUUID newParent, string newName, LLUUID oldOwnerID, + public void RequestCopyItem(UUID item, UUID newParent, string newName, UUID oldOwnerID, ItemCopiedCallback callback) { - List items = new List(1); + List items = new List(1); items.Add(item); - List folders = new List(1); + List folders = new List(1); folders.Add(newParent); List names = new List(1); @@ -1760,8 +1760,8 @@ namespace OpenMetaverse /// /// /// - public void RequestCopyItems(List items, List targetFolders, List newNames, - LLUUID oldOwnerID, ItemCopiedCallback callback) + public void RequestCopyItems(List items, List targetFolders, List newNames, + UUID oldOwnerID, ItemCopiedCallback callback) { if (items.Count != targetFolders.Count || (newNames != null && items.Count != newNames.Count)) throw new ArgumentException("All list arguments must have an equal number of entries"); @@ -1797,7 +1797,7 @@ namespace OpenMetaverse /// /// /// - public void RequestCopyItemFromNotecard(LLUUID objectID, LLUUID notecardID, LLUUID folderID, LLUUID itemID) + public void RequestCopyItemFromNotecard(UUID objectID, UUID notecardID, UUID folderID, UUID itemID) { CopyInventoryFromNotecardPacket copy = new CopyInventoryFromNotecardPacket(); copy.AgentData.AgentID = _Client.Self.AgentID; @@ -1827,7 +1827,7 @@ namespace OpenMetaverse List items = new List(1); items.Add(item); - RequestUpdateItems(items, LLUUID.Random()); + RequestUpdateItems(items, UUID.Random()); } /// @@ -1836,7 +1836,7 @@ namespace OpenMetaverse /// public void RequestUpdateItems(List items) { - RequestUpdateItems(items, LLUUID.Random()); + RequestUpdateItems(items, UUID.Random()); } /// @@ -1844,7 +1844,7 @@ namespace OpenMetaverse /// /// /// - public void RequestUpdateItems(List items, LLUUID transactionID) + public void RequestUpdateItems(List items, UUID transactionID) { UpdateInventoryItemPacket update = new UpdateInventoryItemPacket(); update.AgentData.AgentID = _Client.Self.AgentID; @@ -1876,7 +1876,7 @@ namespace OpenMetaverse block.OwnerMask = (uint)item.Permissions.OwnerMask; block.SalePrice = item.SalePrice; block.SaleType = (byte)item.SaleType; - block.TransactionID = LLUUID.Zero; + block.TransactionID = UUID.Zero; block.Type = (sbyte)item.AssetType; update.InventoryData[i] = block; @@ -1891,7 +1891,7 @@ namespace OpenMetaverse /// /// /// - public void RequestUploadNotecardAsset(byte[] data, LLUUID notecardID, NotecardUploadedAssetCallback callback) + public void RequestUploadNotecardAsset(byte[] data, UUID notecardID, NotecardUploadedAssetCallback callback) { if (_Client.Network.CurrentSim == null || _Client.Network.CurrentSim.Caps == null) throw new Exception("UpdateNotecardAgentInventory capability is not currently available"); @@ -1927,11 +1927,11 @@ namespace OpenMetaverse /// Rotation of the object when rezzed /// Vector of where to place object /// InventoryObject object containing item details - public LLUUID RequestRezFromInventory(Simulator simulator, LLQuaternion rotation, LLVector3 position, + public UUID RequestRezFromInventory(Simulator simulator, Quaternion rotation, Vector3 position, InventoryObject item) { return RequestRezFromInventory(simulator, rotation, position, item, _Client.Self.ActiveGroup, - LLUUID.Random(), false); + UUID.Random(), false); } /// @@ -1942,10 +1942,10 @@ namespace OpenMetaverse /// Vector of where to place object /// InventoryObject object containing item details /// LLUUID of group to own the object - public LLUUID RequestRezFromInventory(Simulator simulator, LLQuaternion rotation, LLVector3 position, - InventoryObject item, LLUUID groupOwner) + public UUID RequestRezFromInventory(Simulator simulator, Quaternion rotation, Vector3 position, + InventoryObject item, UUID groupOwner) { - return RequestRezFromInventory(simulator, rotation, position, item, groupOwner, LLUUID.Random(), false); + return RequestRezFromInventory(simulator, rotation, position, item, groupOwner, UUID.Random(), false); } /// @@ -1959,8 +1959,8 @@ namespace OpenMetaverse /// User defined queryID to correlate replies /// if set to true the simulator /// will automatically send object detail packet(s) back to the client - public LLUUID RequestRezFromInventory(Simulator simulator, LLQuaternion rotation, LLVector3 position, - InventoryObject item, LLUUID groupOwner, LLUUID queryID, bool requestObjectDetails) + public UUID RequestRezFromInventory(Simulator simulator, Quaternion rotation, Vector3 position, + InventoryObject item, UUID groupOwner, UUID queryID, bool requestObjectDetails) { RezObjectPacket add = new RezObjectPacket(); @@ -1968,11 +1968,11 @@ namespace OpenMetaverse add.AgentData.SessionID = _Client.Self.SessionID; add.AgentData.GroupID = groupOwner; - add.RezData.FromTaskID = LLUUID.Zero; + add.RezData.FromTaskID = UUID.Zero; add.RezData.BypassRaycast = 1; add.RezData.RayStart = position; add.RezData.RayEnd = position; - add.RezData.RayTargetID = LLUUID.Zero; + add.RezData.RayTargetID = UUID.Zero; add.RezData.RayEndIsIntersection = false; add.RezData.RezSelected = requestObjectDetails; add.RezData.RemoveItem = false; @@ -2014,7 +2014,7 @@ namespace OpenMetaverse public void RequestDeRezToInventory(uint objectLocalID) { RequestDeRezToInventory(objectLocalID, DeRezDestination.ObjectsFolder, - _Client.Inventory.FindFolderForType(AssetType.Object), LLUUID.Random()); + _Client.Inventory.FindFolderForType(AssetType.Object), UUID.Random()); } /// @@ -2026,14 +2026,14 @@ namespace OpenMetaverse /// if DeRezzing object to a tasks Inventory, the Tasks /// The transaction ID for this request which /// can be used to correlate this request with other packets - public void RequestDeRezToInventory(uint objectLocalID, DeRezDestination destType, LLUUID destFolder, LLUUID transactionID) + public void RequestDeRezToInventory(uint objectLocalID, DeRezDestination destType, UUID destFolder, UUID transactionID) { DeRezObjectPacket take = new DeRezObjectPacket(); take.AgentData.AgentID = _Client.Self.AgentID; take.AgentData.SessionID = _Client.Self.SessionID; take.AgentBlock = new DeRezObjectPacket.AgentBlockBlock(); - take.AgentBlock.GroupID = LLUUID.Zero; + take.AgentBlock.GroupID = UUID.Zero; take.AgentBlock.Destination = (byte)destType; take.AgentBlock.DestinationID = destFolder; take.AgentBlock.PacketCount = 1; @@ -2056,7 +2056,7 @@ namespace OpenMetaverse /// The type of the item from the enum /// The of the recipient /// true to generate a beameffect during transfer - public void GiveItem(LLUUID itemID, string itemName, AssetType assetType, LLUUID recipient, + public void GiveItem(UUID itemID, string itemName, AssetType assetType, UUID recipient, bool doEffect) { byte[] bucket; @@ -2070,7 +2070,7 @@ namespace OpenMetaverse _Client.Self.Name, recipient, itemName, - LLUUID.Random(), + UUID.Random(), InstantMessageDialog.InventoryOffered, InstantMessageOnline.Online, _Client.Self.SimPosition, @@ -2079,8 +2079,8 @@ namespace OpenMetaverse if (doEffect) { - _Client.Self.BeamEffect(_Client.Self.AgentID, recipient, LLVector3d.Zero, - _Client.Settings.DEFAULT_EFFECT_COLOR, 1f, LLUUID.Random()); + _Client.Self.BeamEffect(_Client.Self.AgentID, recipient, Vector3d.Zero, + _Client.Settings.DEFAULT_EFFECT_COLOR, 1f, UUID.Random()); } } @@ -2092,7 +2092,7 @@ namespace OpenMetaverse /// The type of the item from the enum /// The of the recipient /// true to generate a beameffect during transfer - public void GiveFolder(LLUUID folderID, string folderName, AssetType assetType, LLUUID recipient, + public void GiveFolder(UUID folderID, string folderName, AssetType assetType, UUID recipient, bool doEffect) { byte[] bucket; @@ -2121,7 +2121,7 @@ namespace OpenMetaverse _Client.Self.Name, recipient, folderName, - LLUUID.Random(), + UUID.Random(), InstantMessageDialog.InventoryOffered, InstantMessageOnline.Online, _Client.Self.SimPosition, @@ -2130,8 +2130,8 @@ namespace OpenMetaverse if (doEffect) { - _Client.Self.BeamEffect(_Client.Self.AgentID, recipient, LLVector3d.Zero, - _Client.Settings.DEFAULT_EFFECT_COLOR, 1f, LLUUID.Random()); + _Client.Self.BeamEffect(_Client.Self.AgentID, recipient, Vector3d.Zero, + _Client.Settings.DEFAULT_EFFECT_COLOR, 1f, UUID.Random()); } } @@ -2145,9 +2145,9 @@ namespace OpenMetaverse /// /// /// - public LLUUID UpdateTaskInventory(uint objectLocalID, InventoryItem item) + public UUID UpdateTaskInventory(uint objectLocalID, InventoryItem item) { - LLUUID transactionID = LLUUID.Random(); + UUID transactionID = UUID.Random(); UpdateTaskInventoryPacket update = new UpdateTaskInventoryPacket(); update.AgentData.AgentID = _Client.Self.AgentID; @@ -2189,13 +2189,13 @@ namespace OpenMetaverse /// The tasks simulator local ID /// milliseconds to wait for reply from simulator /// A List containing the inventory items inside the task - public List GetTaskInventory(LLUUID objectID, uint objectLocalID, int timeoutMS) + public List GetTaskInventory(UUID objectID, uint objectLocalID, int timeoutMS) { string filename = null; AutoResetEvent taskReplyEvent = new AutoResetEvent(false); TaskInventoryReplyCallback callback = - delegate(LLUUID itemID, short serial, string assetFilename) + delegate(UUID itemID, short serial, string assetFilename) { if (itemID == objectID) { @@ -2231,7 +2231,7 @@ namespace OpenMetaverse _Client.Assets.OnXferReceived += xferCallback; // Start the actual asset xfer - xferID = _Client.Assets.RequestAssetXfer(filename, true, false, LLUUID.Zero, AssetType.Unknown); + xferID = _Client.Assets.RequestAssetXfer(filename, true, false, UUID.Zero, AssetType.Unknown); if (taskDownloadEvent.WaitOne(timeoutMS, false)) { @@ -2292,7 +2292,7 @@ namespace OpenMetaverse /// UUID of the task item to move /// UUID of the folder to move the item to /// Simulator Object - public void MoveTaskInventory(uint objectLocalID, LLUUID taskItemID, LLUUID inventoryFolderID, Simulator simulator) + public void MoveTaskInventory(uint objectLocalID, UUID taskItemID, UUID inventoryFolderID, Simulator simulator) { MoveTaskInventoryPacket request = new MoveTaskInventoryPacket(); request.AgentData.AgentID = _Client.Self.AgentID; @@ -2312,7 +2312,7 @@ namespace OpenMetaverse /// LocalID of the object in the simulator /// LLUUID of the task item to remove /// Simulator Object - public void RemoveTaskInventory(uint objectLocalID, LLUUID taskItemID, Simulator simulator) + public void RemoveTaskInventory(uint objectLocalID, UUID taskItemID, Simulator simulator) { RemoveTaskInventoryPacket remove = new RemoveTaskInventoryPacket(); remove.AgentData.AgentID = _Client.Self.AgentID; @@ -2474,7 +2474,7 @@ namespace OpenMetaverse /// The type of item from the enum /// The of the newly created object /// An object with the type and id passed - public static InventoryItem CreateInventoryItem(InventoryType type, LLUUID id) + public static InventoryItem CreateInventoryItem(InventoryType type, UUID id) { switch (type) { @@ -2495,7 +2495,7 @@ namespace OpenMetaverse } } - private InventoryItem SafeCreateInventoryItem(InventoryType InvType, LLUUID ItemID) + private InventoryItem SafeCreateInventoryItem(InventoryType InvType, UUID ItemID) { InventoryItem ret = null; @@ -2564,8 +2564,8 @@ namespace OpenMetaverse #region inv_object // In practice this appears to only be used for folders - LLUUID itemID = LLUUID.Zero; - LLUUID parentID = LLUUID.Zero; + UUID itemID = UUID.Zero; + UUID parentID = UUID.Zero; string name = String.Empty; AssetType assetType = AssetType.Unknown; @@ -2583,11 +2583,11 @@ namespace OpenMetaverse } else if (key == "obj_id") { - LLUUID.TryParse(value, out itemID); + UUID.TryParse(value, out itemID); } else if (key == "parent_id") { - LLUUID.TryParse(value, out parentID); + UUID.TryParse(value, out parentID); } else if (key == "type") { @@ -2625,13 +2625,13 @@ namespace OpenMetaverse #region inv_item // Any inventory item that links to an assetID, has permissions, etc - LLUUID itemID = LLUUID.Zero; - LLUUID assetID = LLUUID.Zero; - LLUUID parentID = LLUUID.Zero; - LLUUID creatorID = LLUUID.Zero; - LLUUID ownerID = LLUUID.Zero; - LLUUID lastOwnerID = LLUUID.Zero; - LLUUID groupID = LLUUID.Zero; + UUID itemID = UUID.Zero; + UUID assetID = UUID.Zero; + UUID parentID = UUID.Zero; + UUID creatorID = UUID.Zero; + UUID ownerID = UUID.Zero; + UUID lastOwnerID = UUID.Zero; + UUID groupID = UUID.Zero; bool groupOwned = false; string name = String.Empty; string desc = String.Empty; @@ -2657,11 +2657,11 @@ namespace OpenMetaverse } else if (key == "item_id") { - LLUUID.TryParse(value, out itemID); + UUID.TryParse(value, out itemID); } else if (key == "parent_id") { - LLUUID.TryParse(value, out parentID); + UUID.TryParse(value, out parentID); } else if (key == "permissions") { @@ -2778,7 +2778,7 @@ namespace OpenMetaverse } else if (key == "asset_id") { - LLUUID.TryParse(value, out assetID); + UUID.TryParse(value, out assetID); } else if (key == "type") { @@ -2857,7 +2857,7 @@ namespace OpenMetaverse if (result == null) { - try { callback(false, error.Message, LLUUID.Zero, LLUUID.Zero); } + try { callback(false, error.Message, UUID.Zero, UUID.Zero); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, _Client, e); } return; } @@ -2889,14 +2889,14 @@ namespace OpenMetaverse } else { - try { callback(false, "Failed to parse asset and item UUIDs", LLUUID.Zero, LLUUID.Zero); } + try { callback(false, "Failed to parse asset and item UUIDs", UUID.Zero, UUID.Zero); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, _Client, e); } } } else { // Failure - try { callback(false, status, LLUUID.Zero, LLUUID.Zero); } + try { callback(false, status, UUID.Zero, UUID.Zero); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, _Client, e); } } } @@ -2917,7 +2917,7 @@ namespace OpenMetaverse if (reply.AgentData.Descendents > 0) { // InventoryDescendantsReply sends a null folder if the parent doesnt contain any folders - if (reply.FolderData[0].FolderID != LLUUID.Zero) + if (reply.FolderData[0].FolderID != UUID.Zero) { // Iterate folders in this packet for (int i = 0; i < reply.FolderData.Length; i++) @@ -2933,12 +2933,12 @@ namespace OpenMetaverse } // InventoryDescendantsReply sends a null item if the parent doesnt contain any items. - if (reply.ItemData[0].ItemID != LLUUID.Zero) + if (reply.ItemData[0].ItemID != UUID.Zero) { // Iterate items in this packet for (int i = 0; i < reply.ItemData.Length; i++) { - if (reply.ItemData[i].ItemID != LLUUID.Zero) + if (reply.ItemData[i].ItemID != UUID.Zero) { InventoryItem item; /* @@ -3172,7 +3172,7 @@ namespace OpenMetaverse { BulkUpdateInventoryPacket update = packet as BulkUpdateInventoryPacket; - if (update.FolderData.Length > 0 && update.FolderData[0].FolderID != LLUUID.Zero) + if (update.FolderData.Length > 0 && update.FolderData[0].FolderID != UUID.Zero) { foreach (BulkUpdateInventoryPacket.FolderDataBlock dataBlock in update.FolderData) { @@ -3187,7 +3187,7 @@ namespace OpenMetaverse } } - if (update.ItemData.Length > 0 && update.ItemData[0].ItemID != LLUUID.Zero) + if (update.ItemData.Length > 0 && update.ItemData[0].ItemID != UUID.Zero) { for (int i = 0; i < update.ItemData.Length; i++) { @@ -3201,7 +3201,7 @@ namespace OpenMetaverse InventoryItem item = SafeCreateInventoryItem((InventoryType)dataBlock.InvType, dataBlock.ItemID); item.AssetType = (AssetType)dataBlock.Type; - if (dataBlock.AssetID != LLUUID.Zero) item.AssetUUID = dataBlock.AssetID; + if (dataBlock.AssetID != UUID.Zero) item.AssetUUID = dataBlock.AssetID; item.CreationDate = Helpers.UnixTimeToDateTime(dataBlock.CreationDate); item.CreatorID = dataBlock.CreatorID; item.Description = Helpers.FieldToUTF8String(dataBlock.Description); @@ -3315,7 +3315,7 @@ namespace OpenMetaverse || im.Dialog == InstantMessageDialog.TaskInventoryOffered)) { AssetType type = AssetType.Unknown; - LLUUID objectID = LLUUID.Zero; + UUID objectID = UUID.Zero; bool fromTask = false; if (im.Dialog == InstantMessageDialog.InventoryOffered) @@ -3323,7 +3323,7 @@ namespace OpenMetaverse if (im.BinaryBucket.Length == 17) { type = (AssetType)im.BinaryBucket[0]; - objectID = new LLUUID(im.BinaryBucket, 1); + objectID = new UUID(im.BinaryBucket, 1); fromTask = false; } else @@ -3347,7 +3347,7 @@ namespace OpenMetaverse } // Find the folder where this is going to go - LLUUID destinationFolderID = FindFolderForType(type); + UUID destinationFolderID = FindFolderForType(type); // Fire the callback try @@ -3363,7 +3363,7 @@ namespace OpenMetaverse imp.MessageBlock.FromAgentName = Helpers.StringToField(_Client.Self.Name); imp.MessageBlock.Message = new byte[0]; imp.MessageBlock.ParentEstateID = 0; - imp.MessageBlock.RegionID = LLUUID.Zero; + imp.MessageBlock.RegionID = UUID.Zero; imp.MessageBlock.Position = _Client.Self.SimPosition; if (OnObjectOffered(im, type, objectID, fromTask)) @@ -3421,7 +3421,7 @@ namespace OpenMetaverse Logger.DebugLog("Setting InventoryRoot to " + replyData.InventoryRoot.ToString(), _Client); InventoryFolder rootFolder = new InventoryFolder(replyData.InventoryRoot); rootFolder.Name = String.Empty; - rootFolder.ParentUUID = LLUUID.Zero; + rootFolder.ParentUUID = UUID.Zero; _Store.RootFolder = rootFolder; for (int i = 0; i < replyData.InventorySkeleton.Length; i++) @@ -3429,7 +3429,7 @@ namespace OpenMetaverse InventoryFolder libraryRootFolder = new InventoryFolder(replyData.LibraryRoot); libraryRootFolder.Name = String.Empty; - libraryRootFolder.ParentUUID = LLUUID.Zero; + libraryRootFolder.ParentUUID = UUID.Zero; _Store.LibraryFolder = libraryRootFolder; for(int i = 0; i < replyData.LibrarySkeleton.Length; i++) @@ -3454,26 +3454,26 @@ namespace OpenMetaverse // the problem of HttpRequestState not knowing anything about simulators CapsClient upload = new CapsClient(new Uri(uploadURL)); upload.OnComplete += new CapsClient.CompleteCallback(UploadNotecardAssetResponse); - upload.UserData = new object[2] { kvp, (LLUUID)(((object[])client.UserData)[1]) }; + upload.UserData = new object[2] { kvp, (UUID)(((object[])client.UserData)[1]) }; upload.StartRequest(itemData, "application/octet-stream"); } else if (status == "complete") { if (contents.ContainsKey("new_asset")) { - try { callback(true, String.Empty, (LLUUID)(((object[])client.UserData)[1]), contents["new_asset"].AsUUID()); } + try { callback(true, String.Empty, (UUID)(((object[])client.UserData)[1]), contents["new_asset"].AsUUID()); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, _Client, e); } } else { - try { callback(false, "Failed to parse asset and item UUIDs", LLUUID.Zero, LLUUID.Zero); } + try { callback(false, "Failed to parse asset and item UUIDs", UUID.Zero, UUID.Zero); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, _Client, e); } } } else { // Failure - try { callback(false, status, LLUUID.Zero, LLUUID.Zero); } + try { callback(false, status, UUID.Zero, UUID.Zero); } catch (Exception e) { Logger.Log(e.Message, Helpers.LogLevel.Error, _Client, e); } } } diff --git a/OpenMetaverse/InventoryNodeDictionary.cs b/OpenMetaverse/InventoryNodeDictionary.cs index 002fee6b..c7d4f9a8 100644 --- a/OpenMetaverse/InventoryNodeDictionary.cs +++ b/OpenMetaverse/InventoryNodeDictionary.cs @@ -32,7 +32,7 @@ namespace OpenMetaverse { public class InventoryNodeDictionary { - protected Dictionary Dictionary = new Dictionary(); + protected Dictionary Dictionary = new Dictionary(); protected InventoryNode parent; protected object syncRoot = new object(); @@ -51,7 +51,7 @@ namespace OpenMetaverse parent = parentNode; } - public InventoryNode this[LLUUID key] + public InventoryNode this[UUID key] { get { return (InventoryNode)this.Dictionary[key]; } set @@ -61,21 +61,21 @@ namespace OpenMetaverse } } - public ICollection Keys { get { return this.Dictionary.Keys; } } + public ICollection Keys { get { return this.Dictionary.Keys; } } public ICollection Values { get { return this.Dictionary.Values; } } - public void Add(LLUUID key, InventoryNode value) + public void Add(UUID key, InventoryNode value) { value.Parent = parent; lock (syncRoot) this.Dictionary.Add(key, value); } - public void Remove(LLUUID key) + public void Remove(UUID key) { lock (syncRoot) this.Dictionary.Remove(key); } - public bool Contains(LLUUID key) + public bool Contains(UUID key) { return this.Dictionary.ContainsKey(key); } diff --git a/OpenMetaverse/LLObject.cs b/OpenMetaverse/LLObject.cs index b5431fe0..bf36df53 100644 --- a/OpenMetaverse/LLObject.cs +++ b/OpenMetaverse/LLObject.cs @@ -256,11 +256,11 @@ namespace OpenMetaverse } /// - public LLVector2 PathBeginScale + public Vector2 PathBeginScale { get { - LLVector2 begin = new LLVector2(1f, 1f); + Vector2 begin = new Vector2(1f, 1f); if (PathScaleX > 1f) begin.X = 2f - PathScaleX; if (PathScaleY > 1f) @@ -270,11 +270,11 @@ namespace OpenMetaverse } /// - public LLVector2 PathEndScale + public Vector2 PathEndScale { get { - LLVector2 end = new LLVector2(1f, 1f); + Vector2 end = new Vector2(1f, 1f); if (PathScaleX < 1f) end.X = PathScaleX; if (PathScaleY < 1f) @@ -334,14 +334,14 @@ namespace OpenMetaverse public struct ObjectProperties { /// - public LLUUID ObjectID; + public UUID ObjectID; /// - public LLUUID CreatorID; + public UUID CreatorID; /// This is a protocol hack, it will only be set if the /// object has a non-null sound so you can mute the owner - public LLUUID OwnerID; + public UUID OwnerID; /// - public LLUUID GroupID; + public UUID GroupID; /// public ulong CreationDate; /// @@ -363,13 +363,13 @@ namespace OpenMetaverse /// public short InventorySerial; /// - public LLUUID ItemID; + public UUID ItemID; /// - public LLUUID FolderID; + public UUID FolderID; /// - public LLUUID FromTaskID; + public UUID FromTaskID; /// - public LLUUID LastOwnerID; + public UUID LastOwnerID; /// public string Name; /// @@ -379,7 +379,7 @@ namespace OpenMetaverse /// public string SitName; /// - public LLUUID[] TextureIDs; + public UUID[] TextureIDs; } /// @@ -403,11 +403,11 @@ namespace OpenMetaverse /// public RequestFlagsType RequestFlags; /// - public LLUUID ObjectID; + public UUID ObjectID; /// - public LLUUID OwnerID; + public UUID OwnerID; /// - public LLUUID GroupID; + public UUID GroupID; /// public Permissions Permissions; /// @@ -419,7 +419,7 @@ namespace OpenMetaverse /// public uint Category; /// - public LLUUID LastOwnerID; + public UUID LastOwnerID; /// public string Name; /// @@ -446,9 +446,9 @@ namespace OpenMetaverse #region Public Members /// - public LLUUID ID; + public UUID ID; /// - public LLUUID GroupID; + public UUID GroupID; /// public uint LocalID; /// @@ -460,19 +460,19 @@ namespace OpenMetaverse /// Unknown public byte[] GenericData; /// - public LLVector3 Position; + public Vector3 Position; /// - public LLVector3 Scale; + public Vector3 Scale; /// - public LLQuaternion Rotation; + public Quaternion Rotation; /// - public LLVector3 Velocity; + public Vector3 Velocity; /// - public LLVector3 AngularVelocity; + public Vector3 AngularVelocity; /// - public LLVector3 Acceleration; + public Vector3 Acceleration; /// - public LLVector4 CollisionPlane; + public Vector4 CollisionPlane; /// public TextureEntry Textures; /// diff --git a/OpenMetaverse/LLSD/BinaryLLSD.cs b/OpenMetaverse/LLSD/BinaryLLSD.cs index 8964aa50..ce39cf8b 100644 --- a/OpenMetaverse/LLSD/BinaryLLSD.cs +++ b/OpenMetaverse/LLSD/BinaryLLSD.cs @@ -247,7 +247,7 @@ using System.Text; llsd = LLSD.FromReal( dbl ); break; case uuidBinaryMarker: - llsd = LLSD.FromUUID( new LLUUID( ConsumeBytes( stream, 16 ), 0)); + llsd = LLSD.FromUUID( new UUID( ConsumeBytes( stream, 16 ), 0)); break; case binaryBinaryMarker: int binaryLength = NetworkToHostInt( ConsumeBytes( stream, int32Length )); diff --git a/OpenMetaverse/LLSD/LLSD.cs b/OpenMetaverse/LLSD/LLSD.cs index b7fc671f..3f4e1f02 100644 --- a/OpenMetaverse/LLSD/LLSD.cs +++ b/OpenMetaverse/LLSD/LLSD.cs @@ -79,7 +79,7 @@ namespace OpenMetaverse.StructuredData public virtual int AsInteger() { return 0; } public virtual double AsReal() { return 0d; } public virtual string AsString() { return String.Empty; } - public virtual LLUUID AsUUID() { return LLUUID.Zero; } + public virtual UUID AsUUID() { return UUID.Zero; } public virtual DateTime AsDate() { return Helpers.Epoch; } public virtual Uri AsUri() { return new Uri(String.Empty); } public virtual byte[] AsBinary() { return new byte[0]; } @@ -95,7 +95,7 @@ namespace OpenMetaverse.StructuredData public static LLSD FromReal(double value) { return new LLSDReal(value); } public static LLSD FromReal(float value) { return new LLSDReal((double)value); } public static LLSD FromString(string value) { return new LLSDString(value); } - public static LLSD FromUUID(LLUUID value) { return new LLSDUUID(value); } + public static LLSD FromUUID(UUID value) { return new LLSDUUID(value); } public static LLSD FromDate(DateTime value) { return new LLSDDate(value); } public static LLSD FromUri(Uri value) { return new LLSDURI(value); } public static LLSD FromBinary(byte[] value) { return new LLSDBinary(value); } @@ -114,7 +114,7 @@ namespace OpenMetaverse.StructuredData else if (value is double) { return new LLSDReal((double)value); } else if (value is float) { return new LLSDReal((double)(float)value); } else if (value is string) { return new LLSDString((string)value); } - else if (value is LLUUID) { return new LLSDUUID((LLUUID)value); } + else if (value is UUID) { return new LLSDUUID((UUID)value); } else if (value is DateTime) { return new LLSDDate((DateTime)value); } else if (value is Uri) { return new LLSDURI((Uri)value); } else if (value is byte[]) { return new LLSDBinary((byte[])value); } @@ -264,13 +264,13 @@ namespace OpenMetaverse.StructuredData } public override string AsString() { return value; } public override byte[] AsBinary() { return Encoding.UTF8.GetBytes( value ); } - public override LLUUID AsUUID() + public override UUID AsUUID() { - LLUUID uuid; - if (LLUUID.TryParse(value, out uuid)) + UUID uuid; + if (UUID.TryParse(value, out uuid)) return uuid; else - return LLUUID.Zero; + return UUID.Zero; } public override DateTime AsDate() { @@ -290,18 +290,18 @@ namespace OpenMetaverse.StructuredData /// public class LLSDUUID : LLSD { - private LLUUID value; + private UUID value; public override LLSDType Type { get { return LLSDType.UUID; } } - public LLSDUUID(LLUUID value) + public LLSDUUID(UUID value) { this.value = value; } - public override bool AsBoolean() { return (value == LLUUID.Zero) ? false : true; } + public override bool AsBoolean() { return (value == UUID.Zero) ? false : true; } public override string AsString() { return value.ToString(); } - public override LLUUID AsUUID() { return value; } + public override UUID AsUUID() { return value; } public override byte[] AsBinary() { return value.GetBytes(); } public override string ToString() { return AsString(); } } diff --git a/OpenMetaverse/LLSD/NotationLLSD.cs b/OpenMetaverse/LLSD/NotationLLSD.cs index 167cfe9b..dd9f3bda 100644 --- a/OpenMetaverse/LLSD/NotationLLSD.cs +++ b/OpenMetaverse/LLSD/NotationLLSD.cs @@ -211,8 +211,8 @@ namespace OpenMetaverse.StructuredData char[] uuidBuf = new char[36]; if (reader.Read(uuidBuf, 0, 36) < 36) throw new LLSDException("Notation LLSD parsing: Unexpected end of stream in UUID."); - LLUUID lluuid; - if (!LLUUID.TryParse(new String(uuidBuf), out lluuid)) + UUID lluuid; + if (!UUID.TryParse(new String(uuidBuf), out lluuid)) throw new LLSDException("Notation LLSD parsing: Invalid UUID discovered."); llsd = LLSD.FromUUID(lluuid); break; diff --git a/OpenMetaverse/LLSD/XmlLLSD.cs b/OpenMetaverse/LLSD/XmlLLSD.cs index 44bde92c..18b3e73d 100644 --- a/OpenMetaverse/LLSD/XmlLLSD.cs +++ b/OpenMetaverse/LLSD/XmlLLSD.cs @@ -328,18 +328,18 @@ namespace OpenMetaverse.StructuredData if (reader.IsEmptyElement) { reader.Read(); - return LLSD.FromUUID(LLUUID.Zero); + return LLSD.FromUUID(UUID.Zero); } if (reader.Read()) { - LLUUID value = LLUUID.Zero; - LLUUID.TryParse(reader.ReadString().Trim(), out value); + UUID value = UUID.Zero; + UUID.TryParse(reader.ReadString().Trim(), out value); ret = LLSD.FromUUID(value); break; } - ret = LLSD.FromUUID(LLUUID.Zero); + ret = LLSD.FromUUID(UUID.Zero); break; case "date": if (reader.IsEmptyElement) diff --git a/OpenMetaverse/Login.cs b/OpenMetaverse/Login.cs index 43ff8053..a8c78acc 100644 --- a/OpenMetaverse/Login.cs +++ b/OpenMetaverse/Login.cs @@ -100,17 +100,17 @@ namespace OpenMetaverse public struct LoginResponseData { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID SecureSessionID; + public UUID AgentID; + public UUID SessionID; + public UUID SecureSessionID; public string FirstName; public string LastName; public string StartLocation; public string AgentAccess; - public LLVector3 LookAt; + public Vector3 LookAt; public ulong HomeRegion; - public LLVector3 HomePosition; - public LLVector3 HomeLookAt; + public Vector3 HomePosition; + public Vector3 HomeLookAt; public uint CircuitCode; public uint RegionX; public uint RegionY; @@ -119,11 +119,11 @@ namespace OpenMetaverse public string SeedCapability; public FriendInfo[] BuddyList; public DateTime SecondsSinceEpoch; - public LLUUID InventoryRoot; - public LLUUID LibraryRoot; + public UUID InventoryRoot; + public UUID LibraryRoot; public InventoryFolder[] InventorySkeleton; public InventoryFolder[] LibrarySkeleton; - public LLUUID LibraryOwner; + public UUID LibraryOwner; public void Parse(LLSDMap reply) { @@ -169,8 +169,8 @@ namespace OpenMetaverse else { HomeRegion = 0; - HomePosition = LLVector3.Zero; - HomeLookAt = LLVector3.Zero; + HomePosition = Vector3.Zero; + HomeLookAt = Vector3.Zero; } CircuitCode = ParseUInt("circuit_code", reply); @@ -220,13 +220,13 @@ namespace OpenMetaverse return 0; } - public static LLUUID ParseUUID(string key, LLSDMap reply) + public static UUID ParseUUID(string key, LLSDMap reply) { LLSD llsd; if (reply.TryGetValue(key, out llsd)) return llsd.AsUUID(); else - return LLUUID.Zero; + return UUID.Zero; } public static string ParseString(string key, LLSDMap reply) @@ -238,30 +238,30 @@ namespace OpenMetaverse return String.Empty; } - public static LLVector3 ParseLLVector3(string key, LLSDMap reply) + public static Vector3 ParseLLVector3(string key, LLSDMap reply) { LLSD llsd; if (reply.TryGetValue(key, out llsd)) { if (llsd.Type == LLSDType.Array) { - LLVector3 vec = new LLVector3(); + Vector3 vec = new Vector3(); vec.FromLLSD(llsd); return vec; } else if (llsd.Type == LLSDType.String) { LLSDArray array = (LLSDArray)LLSDParser.DeserializeNotation(llsd.AsString()); - LLVector3 vec = new LLVector3(); + Vector3 vec = new Vector3(); vec.FromLLSD(array); return vec; } } - return LLVector3.Zero; + return Vector3.Zero; } - public static LLUUID ParseMappedUUID(string key, string key2, LLSDMap reply) + public static UUID ParseMappedUUID(string key, string key2, LLSDMap reply) { LLSD folderLLSD; if (reply.TryGetValue(key, out folderLLSD) && folderLLSD.Type == LLSDType.Array) @@ -276,10 +276,10 @@ namespace OpenMetaverse } } - return LLUUID.Zero; + return UUID.Zero; } - public static InventoryFolder[] ParseInventoryFolders(string key, LLUUID owner, LLSDMap reply) + public static InventoryFolder[] ParseInventoryFolders(string key, UUID owner, LLSDMap reply) { List folders = new List(); diff --git a/OpenMetaverse/NameValue.cs b/OpenMetaverse/NameValue.cs index b81622ae..1e3832ac 100644 --- a/OpenMetaverse/NameValue.cs +++ b/OpenMetaverse/NameValue.cs @@ -239,7 +239,7 @@ namespace OpenMetaverse } case ValueType.VEC3: { - LLVector3 temp; + Vector3 temp; Helpers.TryParse(value, out temp); Value = temp; break; diff --git a/OpenMetaverse/NetworkManager.cs b/OpenMetaverse/NetworkManager.cs index 6028af8a..58c82658 100644 --- a/OpenMetaverse/NetworkManager.cs +++ b/OpenMetaverse/NetworkManager.cs @@ -93,7 +93,7 @@ namespace OpenMetaverse /// Assigned by the OnLogoutReply callback. Raised upone receipt of a LogoutReply packet during logout process. /// /// - public delegate void LogoutCallback(List inventoryItems); + public delegate void LogoutCallback(List inventoryItems); /// /// Triggered before a new connection to a simulator is established /// @@ -458,7 +458,7 @@ namespace OpenMetaverse { AutoResetEvent logoutEvent = new AutoResetEvent(false); LogoutCallback callback = - delegate(List inventoryItems) { logoutEvent.Set(); }; + delegate(List inventoryItems) { logoutEvent.Set(); }; OnLogoutReply += callback; // Send the packet requesting a clean logout @@ -831,7 +831,7 @@ namespace OpenMetaverse // Deal with callbacks, if any if (OnLogoutReply != null) { - List itemIDs = new List(); + List itemIDs = new List(); foreach (LogoutReplyPacket.InventoryDataBlock InventoryData in logout.InventoryData) { diff --git a/OpenMetaverse/ObjectManager.cs b/OpenMetaverse/ObjectManager.cs index cc592bfa..8713581f 100644 --- a/OpenMetaverse/ObjectManager.cs +++ b/OpenMetaverse/ObjectManager.cs @@ -293,21 +293,21 @@ namespace OpenMetaverse /// public bool Avatar; /// - public LLVector4 CollisionPlane; + public Vector4 CollisionPlane; /// public byte State; /// public uint LocalID; /// - public LLVector3 Position; + public Vector3 Position; /// - public LLVector3 Velocity; + public Vector3 Velocity; /// - public LLVector3 Acceleration; + public Vector3 Acceleration; /// - public LLQuaternion Rotation; + public Quaternion Rotation; /// - public LLVector3 AngularVelocity; + public Vector3 AngularVelocity; /// public LLObject.TextureEntry Textures; } @@ -591,8 +591,8 @@ namespace OpenMetaverse /// 100, LLUUID.Zero, Client.Self.InventoryRootFolderUUID); /// /// - public void BuyObject(Simulator simulator, uint localID, SaleType saleType, int price, LLUUID groupID, - LLUUID categoryID) + public void BuyObject(Simulator simulator, uint localID, SaleType saleType, int price, UUID groupID, + UUID categoryID) { ObjectBuyPacket buy = new ObjectBuyPacket(); @@ -684,7 +684,7 @@ namespace OpenMetaverse ObjectGrabPacket grab = new ObjectGrabPacket(); grab.AgentData.AgentID = Client.Self.AgentID; grab.AgentData.SessionID = Client.Self.SessionID; - grab.ObjectData.GrabOffset = LLVector3.Zero; + grab.ObjectData.GrabOffset = Vector3.Zero; grab.ObjectData.LocalID = localID; Client.Network.SendPacket(grab, simulator); @@ -716,8 +716,8 @@ namespace OpenMetaverse /// follow up by moving the object after it has been created. This /// function will not set textures, light and flexible data, or other /// extended primitive properties - public void AddPrim(Simulator simulator, LLObject.ObjectData prim, LLUUID groupID, LLVector3 position, - LLVector3 scale, LLQuaternion rotation) + public void AddPrim(Simulator simulator, LLObject.ObjectData prim, UUID groupID, Vector3 position, + Vector3 scale, Quaternion rotation) { ObjectAddPacket packet = new ObjectAddPacket(); @@ -756,7 +756,7 @@ namespace OpenMetaverse packet.ObjectData.RayStart = position; packet.ObjectData.RayEnd = position; packet.ObjectData.RayEndIsIntersection = 0; - packet.ObjectData.RayTargetID = LLUUID.Zero; + packet.ObjectData.RayTargetID = UUID.Zero; packet.ObjectData.BypassRaycast = 1; Client.Network.SendPacket(packet, simulator); @@ -773,8 +773,8 @@ namespace OpenMetaverse /// The of the group to set the tree to, /// or LLUUID.Zero if no group is to be set /// true to use the "new" Linden trees, false to use the old - public void AddTree(Simulator simulator, LLVector3 scale, LLQuaternion rotation, LLVector3 position, - Tree treeType, LLUUID groupOwner, bool newTree) + public void AddTree(Simulator simulator, Vector3 scale, Quaternion rotation, Vector3 position, + Tree treeType, UUID groupOwner, bool newTree) { ObjectAddPacket add = new ObjectAddPacket(); @@ -787,7 +787,7 @@ namespace OpenMetaverse add.ObjectData.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree; add.ObjectData.RayEnd = position; add.ObjectData.RayStart = position; - add.ObjectData.RayTargetID = LLUUID.Zero; + add.ObjectData.RayTargetID = UUID.Zero; add.ObjectData.Rotation = rotation; add.ObjectData.Scale = scale; add.ObjectData.State = (byte)treeType; @@ -805,8 +805,8 @@ namespace OpenMetaverse /// The type of grass from the enum /// The of the group to set the tree to, /// or LLUUID.Zero if no group is to be set - public void AddGrass(Simulator simulator, LLVector3 scale, LLQuaternion rotation, LLVector3 position, - Grass grassType, LLUUID groupOwner) + public void AddGrass(Simulator simulator, Vector3 scale, Quaternion rotation, Vector3 position, + Grass grassType, UUID groupOwner) { ObjectAddPacket add = new ObjectAddPacket(); @@ -819,7 +819,7 @@ namespace OpenMetaverse add.ObjectData.PCode = (byte)PCode.Grass; add.ObjectData.RayEnd = position; add.ObjectData.RayStart = position; - add.ObjectData.RayTargetID = LLUUID.Zero; + add.ObjectData.RayTargetID = UUID.Zero; add.ObjectData.Rotation = rotation; add.ObjectData.Scale = scale; add.ObjectData.State = (byte)grassType; @@ -1009,7 +1009,7 @@ namespace OpenMetaverse /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new rotation of the object - public void SetRotation(Simulator simulator, uint localID, LLQuaternion rotation) + public void SetRotation(Simulator simulator, uint localID, Quaternion rotation) { ObjectRotationPacket objRotPacket = new ObjectRotationPacket(); objRotPacket.AgentData.AgentID = Client.Self.AgentID; @@ -1100,7 +1100,7 @@ namespace OpenMetaverse /// The objects ID which is local to the simulator the object is in /// The point on the avatar the object will be attached /// The rotation of the attached object - public void AttachObject(Simulator simulator, uint localID, AttachmentPoint attachPoint, LLQuaternion rotation) + public void AttachObject(Simulator simulator, uint localID, AttachmentPoint attachPoint, Quaternion rotation) { ObjectAttachPacket attach = new ObjectAttachPacket(); attach.AgentData.AgentID = Client.Self.AgentID; @@ -1148,7 +1148,7 @@ namespace OpenMetaverse /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The new position of the object - public void SetPosition(Simulator simulator, uint localID, LLVector3 position) + public void SetPosition(Simulator simulator, uint localID, Vector3 position) { UpdateObject(simulator, localID, position, UpdateType.Position | UpdateType.Linked); } @@ -1160,7 +1160,7 @@ namespace OpenMetaverse /// The objects ID which is local to the simulator the object is in /// The new position of the object /// if true, will change position of (this) child prim only, not entire linkset - public void SetPosition(Simulator simulator, uint localID, LLVector3 position, bool childOnly) + public void SetPosition(Simulator simulator, uint localID, Vector3 position, bool childOnly) { UpdateType type = UpdateType.Position; @@ -1178,7 +1178,7 @@ namespace OpenMetaverse /// The new scale of the object /// If true, will change scale of this prim only, not entire linkset /// True to resize prims uniformly - public void SetScale(Simulator simulator, uint localID, LLVector3 scale, bool childOnly, bool uniform) + public void SetScale(Simulator simulator, uint localID, Vector3 scale, bool childOnly, bool uniform) { UpdateType type = UpdateType.Scale; @@ -1198,7 +1198,7 @@ namespace OpenMetaverse /// The objects ID which is local to the simulator the object is in /// The new scale of the object /// If true, will change rotation of this prim only, not entire linkset - public void SetRotation(Simulator simulator, uint localID, LLQuaternion quat, bool childOnly) + public void SetRotation(Simulator simulator, uint localID, Quaternion quat, bool childOnly) { UpdateType type = UpdateType.Rotation; @@ -1226,7 +1226,7 @@ namespace OpenMetaverse /// The objects ID which is local to the simulator the object is in /// The new rotation, size, or position of the target object /// The flags from the Enum - public void UpdateObject(Simulator simulator, uint localID, LLVector3 data, UpdateType type) + public void UpdateObject(Simulator simulator, uint localID, Vector3 data, UpdateType type) { MultipleObjectUpdatePacket multiObjectUpdate = new MultipleObjectUpdatePacket(); multiObjectUpdate.AgentData.AgentID = Client.Self.AgentID; @@ -1249,7 +1249,7 @@ namespace OpenMetaverse /// A reference to the object where the object resides /// The objects ID which is local to the simulator the object is in /// The of the group to deed the object to - public void DeedObject(Simulator simulator, uint localID, LLUUID groupOwner) + public void DeedObject(Simulator simulator, uint localID, UUID groupOwner) { ObjectOwnerPacket objDeedPacket = new ObjectOwnerPacket(); objDeedPacket.AgentData.AgentID = Client.Self.AgentID; @@ -1257,7 +1257,7 @@ namespace OpenMetaverse // Can only be use in God mode objDeedPacket.HeaderData.Override = false; - objDeedPacket.HeaderData.OwnerID = LLUUID.Zero; + objDeedPacket.HeaderData.OwnerID = UUID.Zero; objDeedPacket.HeaderData.GroupID = groupOwner; objDeedPacket.ObjectData = new ObjectOwnerPacket.ObjectDataBlock[1]; @@ -1275,7 +1275,7 @@ namespace OpenMetaverse /// A reference to the object where the object resides /// An array which contains the IDs of the objects to deed /// The of the group to deed the object to - public void DeedObjects(Simulator simulator, List localIDs, LLUUID groupOwner) + public void DeedObjects(Simulator simulator, List localIDs, UUID groupOwner) { ObjectOwnerPacket packet = new ObjectOwnerPacket(); packet.AgentData.AgentID = Client.Self.AgentID; @@ -1283,7 +1283,7 @@ namespace OpenMetaverse // Can only be use in God mode packet.HeaderData.Override = false; - packet.HeaderData.OwnerID = LLUUID.Zero; + packet.HeaderData.OwnerID = UUID.Zero; packet.HeaderData.GroupID = groupOwner; packet.ObjectData = new ObjectOwnerPacket.ObjectDataBlock[localIDs.Count]; @@ -1335,7 +1335,7 @@ namespace OpenMetaverse /// /// A reference to the object where the object resides /// - public void RequestObjectPropertiesFamily(Simulator simulator, LLUUID objectID) + public void RequestObjectPropertiesFamily(Simulator simulator, UUID objectID) { RequestObjectPropertiesFamily(simulator, objectID, true); } @@ -1346,7 +1346,7 @@ namespace OpenMetaverse /// A reference to the object where the object resides /// Absolute UUID of the object /// Whether to require server acknowledgement of this request - public void RequestObjectPropertiesFamily(Simulator simulator, LLUUID objectID, bool reliable) + public void RequestObjectPropertiesFamily(Simulator simulator, UUID objectID, bool reliable) { RequestObjectPropertiesFamilyPacket properties = new RequestObjectPropertiesFamilyPacket(); properties.AgentData.AgentID = Client.Self.AgentID; @@ -1379,12 +1379,12 @@ namespace OpenMetaverse { ObjectUpdatePacket.ObjectDataBlock block = update.ObjectData[b]; - LLVector4 collisionPlane = LLVector4.Zero; - LLVector3 position; - LLVector3 velocity; - LLVector3 acceleration; - LLQuaternion rotation; - LLVector3 angularVelocity; + Vector4 collisionPlane = Vector4.Zero; + Vector3 position; + Vector3 velocity; + Vector3 acceleration; + Quaternion rotation; + Vector3 angularVelocity; NameValue[] nameValues; bool attachment = false; PCode pcode = (PCode)block.PCode; @@ -1471,31 +1471,31 @@ namespace OpenMetaverse { case 76: // Collision normal for avatar - collisionPlane = new LLVector4(block.ObjectData, pos); + collisionPlane = new Vector4(block.ObjectData, pos); pos += 16; goto case 60; case 60: // Position - position = new LLVector3(block.ObjectData, pos); + position = new Vector3(block.ObjectData, pos); pos += 12; // Velocity - velocity = new LLVector3(block.ObjectData, pos); + velocity = new Vector3(block.ObjectData, pos); pos += 12; // Acceleration - acceleration = new LLVector3(block.ObjectData, pos); + acceleration = new Vector3(block.ObjectData, pos); pos += 12; // Rotation (theta) - rotation = new LLQuaternion(block.ObjectData, pos, true); + rotation = new Quaternion(block.ObjectData, pos, true); pos += 12; // Angular velocity (omega) - angularVelocity = new LLVector3(block.ObjectData, pos); + angularVelocity = new Vector3(block.ObjectData, pos); pos += 12; break; case 48: // Collision normal for avatar - collisionPlane = new LLVector4(block.ObjectData, pos); + collisionPlane = new Vector4(block.ObjectData, pos); pos += 16; goto case 32; @@ -1503,32 +1503,32 @@ namespace OpenMetaverse // The data is an array of unsigned shorts // Position - position = new LLVector3( + position = new Vector3( Helpers.UInt16ToFloat(block.ObjectData, pos, -0.5f * 256.0f, 1.5f * 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 2, -0.5f * 256.0f, 1.5f * 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 4, -256.0f, 3.0f * 256.0f)); pos += 6; // Velocity - velocity = new LLVector3( + velocity = new Vector3( Helpers.UInt16ToFloat(block.ObjectData, pos, -256.0f, 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 2, -256.0f, 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 4, -256.0f, 256.0f)); pos += 6; // Acceleration - acceleration = new LLVector3( + acceleration = new Vector3( Helpers.UInt16ToFloat(block.ObjectData, pos, -256.0f, 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 2, -256.0f, 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 4, -256.0f, 256.0f)); pos += 6; // Rotation (theta) - rotation = new LLQuaternion( + rotation = new Quaternion( Helpers.UInt16ToFloat(block.ObjectData, pos, -1.0f, 1.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 2, -1.0f, 1.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 4, -1.0f, 1.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 6, -1.0f, 1.0f)); pos += 8; // Angular velocity (omega) - angularVelocity = new LLVector3( + angularVelocity = new Vector3( Helpers.UInt16ToFloat(block.ObjectData, pos, -256.0f, 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 2, -256.0f, 256.0f), Helpers.UInt16ToFloat(block.ObjectData, pos + 4, -256.0f, 256.0f)); @@ -1539,32 +1539,32 @@ namespace OpenMetaverse // The data is an array of single bytes (8-bit numbers) // Position - position = new LLVector3( + position = new Vector3( Helpers.ByteToFloat(block.ObjectData, pos, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 1, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 2, -256.0f, 256.0f)); pos += 3; // Velocity - velocity = new LLVector3( + velocity = new Vector3( Helpers.ByteToFloat(block.ObjectData, pos, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 1, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 2, -256.0f, 256.0f)); pos += 3; // Accleration - acceleration = new LLVector3( + acceleration = new Vector3( Helpers.ByteToFloat(block.ObjectData, pos, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 1, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 2, -256.0f, 256.0f)); pos += 3; // Rotation - rotation = new LLQuaternion( + rotation = new Quaternion( Helpers.ByteToFloat(block.ObjectData, pos, -1.0f, 1.0f), Helpers.ByteToFloat(block.ObjectData, pos + 1, -1.0f, 1.0f), Helpers.ByteToFloat(block.ObjectData, pos + 2, -1.0f, 1.0f), Helpers.ByteToFloat(block.ObjectData, pos + 3, -1.0f, 1.0f)); pos += 4; // Angular Velocity - angularVelocity = new LLVector3( + angularVelocity = new Vector3( Helpers.ByteToFloat(block.ObjectData, pos, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 1, -256.0f, 256.0f), Helpers.ByteToFloat(block.ObjectData, pos + 2, -256.0f, 256.0f)); @@ -1613,7 +1613,7 @@ namespace OpenMetaverse prim.OwnerID = block.OwnerID; prim.MediaURL = Helpers.FieldToUTF8String(block.MediaURL); prim.Text = Helpers.FieldToUTF8String(block.Text); - prim.TextColor = new LLColor(block.TextColor, 0, false, true); + prim.TextColor = new Color4(block.TextColor, 0, false, true); // Sound information prim.Sound = block.Sound; @@ -1807,33 +1807,33 @@ namespace OpenMetaverse // Collision normal for avatar if (update.Avatar) { - update.CollisionPlane = new LLVector4(block.Data, pos); + update.CollisionPlane = new Vector4(block.Data, pos); pos += 16; } // Position - update.Position = new LLVector3(block.Data, pos); + update.Position = new Vector3(block.Data, pos); pos += 12; // Velocity - update.Velocity = new LLVector3( + update.Velocity = new Vector3( Helpers.UInt16ToFloat(block.Data, pos, -128.0f, 128.0f), Helpers.UInt16ToFloat(block.Data, pos + 2, -128.0f, 128.0f), Helpers.UInt16ToFloat(block.Data, pos + 4, -128.0f, 128.0f)); pos += 6; // Acceleration - update.Acceleration = new LLVector3( + update.Acceleration = new Vector3( Helpers.UInt16ToFloat(block.Data, pos, -64.0f, 64.0f), Helpers.UInt16ToFloat(block.Data, pos + 2, -64.0f, 64.0f), Helpers.UInt16ToFloat(block.Data, pos + 4, -64.0f, 64.0f)); pos += 6; // Rotation (theta) - update.Rotation = new LLQuaternion( + update.Rotation = new Quaternion( Helpers.UInt16ToFloat(block.Data, pos, -1.0f, 1.0f), Helpers.UInt16ToFloat(block.Data, pos + 2, -1.0f, 1.0f), Helpers.UInt16ToFloat(block.Data, pos + 4, -1.0f, 1.0f), Helpers.UInt16ToFloat(block.Data, pos + 6, -1.0f, 1.0f)); pos += 8; // Angular velocity - update.AngularVelocity = new LLVector3( + update.AngularVelocity = new Vector3( Helpers.UInt16ToFloat(block.Data, pos, -64.0f, 64.0f), Helpers.UInt16ToFloat(block.Data, pos + 2, -64.0f, 64.0f), Helpers.UInt16ToFloat(block.Data, pos + 4, -64.0f, 64.0f)); @@ -1898,7 +1898,7 @@ namespace OpenMetaverse try { // UUID - LLUUID FullID = new LLUUID(block.Data, 0); + UUID FullID = new UUID(block.Data, 0); i += 16; // Local ID uint LocalID = (uint)(block.Data[i++] + (block.Data[i++] << 8) + @@ -1946,13 +1946,13 @@ namespace OpenMetaverse // Click action prim.ClickAction = (ClickAction)block.Data[i++]; // Scale - prim.Scale = new LLVector3(block.Data, i); + prim.Scale = new Vector3(block.Data, i); i += 12; // Position - prim.Position = new LLVector3(block.Data, i); + prim.Position = new Vector3(block.Data, i); i += 12; // Rotation - prim.Rotation = new LLQuaternion(block.Data, i, true); + prim.Rotation = new Quaternion(block.Data, i, true); i += 12; #endregion Foliage Decoding @@ -1975,26 +1975,26 @@ namespace OpenMetaverse // Click action prim.ClickAction = (ClickAction)block.Data[i++]; // Scale - prim.Scale = new LLVector3(block.Data, i); + prim.Scale = new Vector3(block.Data, i); i += 12; // Position - prim.Position = new LLVector3(block.Data, i); + prim.Position = new Vector3(block.Data, i); i += 12; // Rotation - prim.Rotation = new LLQuaternion(block.Data, i, true); + prim.Rotation = new Quaternion(block.Data, i, true); i += 12; // Compressed flags CompressedFlags flags = (CompressedFlags)Helpers.BytesToUIntBig(block.Data, i); i += 4; - prim.OwnerID = new LLUUID(block.Data, i); + prim.OwnerID = new UUID(block.Data, i); i += 16; // Angular velocity if ((flags & CompressedFlags.HasAngularVelocity) != 0) { - prim.AngularVelocity = new LLVector3(block.Data, i); + prim.AngularVelocity = new Vector3(block.Data, i); i += 12; } @@ -2039,7 +2039,7 @@ namespace OpenMetaverse prim.Text = text; // Text color - prim.TextColor = new LLColor(block.Data, i, false); + prim.TextColor = new Color4(block.Data, i, false); // FIXME: Is alpha inversed here as well? i += 4; } @@ -2075,7 +2075,7 @@ namespace OpenMetaverse //Sound data if ((flags & CompressedFlags.HasSound) != 0) { - prim.Sound = new LLUUID(block.Data, i); + prim.Sound = new UUID(block.Data, i); i += 16; if (!BitConverter.IsLittleEndian) @@ -2324,9 +2324,9 @@ namespace OpenMetaverse props.TouchName = Helpers.FieldToUTF8String(objectData.TouchName); int numTextures = objectData.TextureID.Length / 16; - props.TextureIDs = new LLUUID[numTextures]; + props.TextureIDs = new UUID[numTextures]; for (int j = 0; j < numTextures; ++j) - props.TextureIDs[j] = new LLUUID(objectData.TextureID, j * 16); + props.TextureIDs[j] = new UUID(objectData.TextureID, j * 16); if (Client.Settings.OBJECT_TRACKING) { @@ -2579,7 +2579,7 @@ namespace OpenMetaverse /// /// /// - protected Primitive GetPrimitive(Simulator simulator, uint localID, LLUUID fullID) + protected Primitive GetPrimitive(Simulator simulator, uint localID, UUID fullID) { if (Client.Settings.OBJECT_TRACKING) { @@ -2613,7 +2613,7 @@ namespace OpenMetaverse /// /// /// - protected Avatar GetAvatar(Simulator simulator, uint localID, LLUUID fullID) + protected Avatar GetAvatar(Simulator simulator, uint localID, UUID fullID) { if (Client.Settings.AVATAR_TRACKING) { @@ -2663,7 +2663,7 @@ namespace OpenMetaverse #region Linear Motion // Only do movement interpolation (extrapolation) when there is a non-zero velocity but // no acceleration - if (avatar.Acceleration != LLVector3.Zero && avatar.Velocity == LLVector3.Zero) + if (avatar.Acceleration != Vector3.Zero && avatar.Velocity == Vector3.Zero) { avatar.Position += (avatar.Velocity + (0.5f * (adjSeconds - HAVOK_TIMESTEP)) * avatar.Acceleration) * adjSeconds; @@ -2680,15 +2680,15 @@ namespace OpenMetaverse if (prim.Joint == Primitive.JointType.Invalid) { #region Angular Velocity - LLVector3 angVel = prim.AngularVelocity; - float omega = LLVector3.MagSquared(angVel); + Vector3 angVel = prim.AngularVelocity; + float omega = Vector3.MagSquared(angVel); if (omega > 0.00001f) { omega = (float)Math.Sqrt(omega); float angle = omega * adjSeconds; angVel *= 1.0f / omega; - LLQuaternion dQ = new LLQuaternion(angle, angVel); + Quaternion dQ = new Quaternion(angle, angVel); prim.Rotation *= dQ; } @@ -2697,7 +2697,7 @@ namespace OpenMetaverse #region Linear Motion // Only do movement interpolation (extrapolation) when there is a non-zero velocity but // no acceleration - if (prim.Acceleration != LLVector3.Zero && prim.Velocity == LLVector3.Zero) + if (prim.Acceleration != Vector3.Zero && prim.Velocity == Vector3.Zero) { prim.Position += (prim.Velocity + (0.5f * (adjSeconds - HAVOK_TIMESTEP)) * prim.Acceleration) * adjSeconds; diff --git a/OpenMetaverse/ParcelManager.cs b/OpenMetaverse/ParcelManager.cs index 106d3e17..dce42e36 100644 --- a/OpenMetaverse/ParcelManager.cs +++ b/OpenMetaverse/ParcelManager.cs @@ -41,9 +41,9 @@ namespace OpenMetaverse public struct ParcelInfo { /// Global Key of record - public LLUUID ID; + public UUID ID; /// Parcel Owners - public LLUUID OwnerID; + public UUID OwnerID; /// Name field of parcel, limited to 128 characters public string Name; /// Description field of parcel, limited to 256 characters @@ -63,7 +63,7 @@ namespace OpenMetaverse /// Name of simulator parcel is located in public string SimName; /// Texture of parcels display picture - public LLUUID SnapshotID; + public UUID SnapshotID; /// Float representing calculated traffic based on time spent on parcel by avatars public float Dwell; /// Sale price of parcel (not used) @@ -232,7 +232,7 @@ namespace OpenMetaverse /// Simulator-local ID of this parcel public int LocalID; /// UUID of the owner of this parcel - public LLUUID OwnerID; + public UUID OwnerID; /// Whether the land is deeded to a group or not public bool IsGroupOwned; /// @@ -245,10 +245,10 @@ namespace OpenMetaverse public int RentPrice; /// Minimum corner of the axis-aligned bounding box for this /// parcel - public LLVector3 AABBMin; + public Vector3 AABBMin; /// Maximum corner of the axis-aligned bounding box for this /// parcel - public LLVector3 AABBMax; + public Vector3 AABBMax; /// Bitmap describing land layout in 4x4m squares across the /// entire region public byte[] Bitmap; @@ -295,11 +295,11 @@ namespace OpenMetaverse /// URL For other Media public string MediaURL; /// Key to Picture for Media Placeholder - public LLUUID MediaID; + public UUID MediaID; /// public byte MediaAutoScale; /// - public LLUUID GroupID; + public UUID GroupID; /// Price for a temporary pass public int PassPrice; /// How long is pass valid for @@ -307,13 +307,13 @@ namespace OpenMetaverse /// public ParcelCategory Category; /// Key of authorized buyer - public LLUUID AuthBuyerID; + public UUID AuthBuyerID; /// Key of parcel snapshot - public LLUUID SnapshotID; + public UUID SnapshotID; /// - public LLVector3 UserLocation; + public Vector3 UserLocation; /// - public LLVector3 UserLookAt; + public Vector3 UserLookAt; /// public byte LandingType; /// @@ -375,14 +375,14 @@ namespace OpenMetaverse SelfCount = 0; OtherCount = 0; PublicCount = 0; - OwnerID = LLUUID.Zero; + OwnerID = UUID.Zero; IsGroupOwned = false; AuctionID = 0; ClaimDate = Helpers.Epoch; ClaimPrice = 0; RentPrice = 0; - AABBMin = LLVector3.Zero; - AABBMax = LLVector3.Zero; + AABBMin = Vector3.Zero; + AABBMax = Vector3.Zero; Bitmap = new byte[0]; Area = 0; Status = ParcelStatus.None; @@ -402,16 +402,16 @@ namespace OpenMetaverse Desc = String.Empty; MusicURL = String.Empty; MediaURL = String.Empty; - MediaID = LLUUID.Zero; + MediaID = UUID.Zero; MediaAutoScale = 0x0; - GroupID = LLUUID.Zero; + GroupID = UUID.Zero; PassPrice = 0; PassHours = 0; Category = ParcelCategory.None; - AuthBuyerID = LLUUID.Zero; - SnapshotID = LLUUID.Zero; - UserLocation = LLVector3.Zero; - UserLookAt = LLVector3.Zero; + AuthBuyerID = UUID.Zero; + SnapshotID = UUID.Zero; + UserLocation = Vector3.Zero; + UserLookAt = Vector3.Zero; LandingType = 0x0; Dwell = 0; RegionDenyAnonymous = false; @@ -609,7 +609,7 @@ namespace OpenMetaverse public struct ParcelAccessEntry { /// Agents - public LLUUID AgentID; + public UUID AgentID; /// public DateTime Time; /// Flag to Permit access to agent, or ban agent from parcel @@ -622,7 +622,7 @@ namespace OpenMetaverse public struct ParcelPrimOwners { /// Prim Owners - public LLUUID OwnerID; + public UUID OwnerID; /// True of owner is group public bool IsGroupOwned; /// Total count of prims owned by OwnerID @@ -640,7 +640,7 @@ namespace OpenMetaverse /// UUID of the requested parcel /// Simulator-local ID of the requested parcel /// Dwell value of the requested parcel - public delegate void ParcelDwellCallback(LLUUID parcelID, int localID, float dwell); + public delegate void ParcelDwellCallback(UUID parcelID, int localID, float dwell); /// /// /// @@ -734,7 +734,7 @@ namespace OpenMetaverse /// Request basic information for a single parcel /// /// Simulator-local ID of the parcel - public void InfoRequest(LLUUID parcelID) + public void InfoRequest(UUID parcelID) { ParcelInfoRequestPacket request = new ParcelInfoRequestPacket(); request.AgentData.AgentID = Client.Self.AgentID; @@ -877,7 +877,7 @@ namespace OpenMetaverse request.AgentData.AgentID = Client.Self.AgentID; request.AgentData.SessionID = Client.Self.SessionID; request.Data.LocalID = localID; - request.Data.ParcelID = LLUUID.Zero; // Not used by clients + request.Data.ParcelID = UUID.Zero; // Not used by clients Client.Network.SendPacket(request, simulator); } @@ -893,7 +893,7 @@ namespace OpenMetaverse /// The parcels size /// The purchase price of the parcel /// - public void Buy(Simulator simulator, int localID, bool forGroup, LLUUID groupID, + public void Buy(Simulator simulator, int localID, bool forGroup, UUID groupID, bool removeContribution, int parcelArea, int parcelPrice) { ParcelBuyPacket request = new ParcelBuyPacket(); @@ -935,7 +935,7 @@ namespace OpenMetaverse /// The simulator the parcel is in /// The parcels region specific local ID /// The groups - public void DeedToGroup(Simulator simulator, int localID, LLUUID groupID) + public void DeedToGroup(Simulator simulator, int localID, UUID groupID) { ParcelDeedToGroupPacket request = new ParcelDeedToGroupPacket(); request.AgentData.AgentID = Client.Self.AgentID; @@ -970,7 +970,7 @@ namespace OpenMetaverse /// The parcels region specific local ID /// the type of objects to return, /// A list containing object owners s to return - public void ReturnObjects(Simulator simulator, int localID, ObjectReturnType type, List ownerIDs) + public void ReturnObjects(Simulator simulator, int localID, ObjectReturnType type, List ownerIDs) { ParcelReturnObjectsPacket request = new ParcelReturnObjectsPacket(); request.AgentData.AgentID = Client.Self.AgentID; @@ -982,7 +982,7 @@ namespace OpenMetaverse // A single null TaskID is (not) used for parcel object returns request.TaskIDs = new ParcelReturnObjectsPacket.TaskIDsBlock[1]; request.TaskIDs[0] = new ParcelReturnObjectsPacket.TaskIDsBlock(); - request.TaskIDs[0].TaskID = LLUUID.Zero; + request.TaskIDs[0].TaskID = UUID.Zero; // Convert the list of owner UUIDs to packet blocks if a list is given if (ownerIDs != null) @@ -1053,7 +1053,7 @@ namespace OpenMetaverse /// 0 on failure, or parcel LocalID on success. /// A call to Parcels.RequestAllSimParcels is required to populate map and /// dictionary. - public int GetParcelLocalID(Simulator simulator, LLVector3 position) + public int GetParcelLocalID(Simulator simulator, Vector3 position) { return simulator.ParcelMap[(byte)position.Y / 4, (byte)position.X / 4]; } @@ -1184,7 +1184,7 @@ namespace OpenMetaverse /// List containing keys of avatars objects to select; /// if List is null will return Objects of type selectType /// Response data is returned in the event - public void SelectObjects(int localID, ObjectReturnType selectType, List ownerIDs) + public void SelectObjects(int localID, ObjectReturnType selectType, List ownerIDs) { if (OnParcelSelectedObjects != null) { @@ -1218,7 +1218,7 @@ namespace OpenMetaverse /// /// target key of avatar to eject /// true to also ban target - public void EjectUser(LLUUID targetID, bool ban) + public void EjectUser(UUID targetID, bool ban) { EjectUserPacket eject = new EjectUserPacket(); eject.AgentData.AgentID = Client.Self.AgentID; @@ -1235,7 +1235,7 @@ namespace OpenMetaverse /// /// target key to freeze /// true to freeze, false to unfreeze - public void FreezeUser(LLUUID targetID, bool freeze) + public void FreezeUser(UUID targetID, bool freeze) { FreezeUserPacket frz = new FreezeUserPacket(); frz.AgentData.AgentID = Client.Self.AgentID; diff --git a/OpenMetaverse/ParticleSystem.cs b/OpenMetaverse/ParticleSystem.cs index 7c198052..cc046764 100644 --- a/OpenMetaverse/ParticleSystem.cs +++ b/OpenMetaverse/ParticleSystem.cs @@ -139,21 +139,21 @@ namespace OpenMetaverse /// A representing the maximum number of particles emitted per burst public byte BurstPartCount; /// A which represents the velocity (speed) from the source which particles are emitted - public LLVector3 AngularVelocity; + public Vector3 AngularVelocity; /// A which represents the Acceleration from the source which particles are emitted - public LLVector3 PartAcceleration; + public Vector3 PartAcceleration; /// The Key of the texture displayed on the particle - public LLUUID Texture; + public UUID Texture; /// The Key of the specified target object or avatar particles will follow - public LLUUID Target; + public UUID Target; /// Flags of particle from public ParticleDataFlags PartDataFlags; /// Max Age particle system will emit particles for public float PartMaxAge; /// The the particle has at the beginning of its lifecycle - public LLColor PartStartColor; + public Color4 PartStartColor; /// The the particle has at the ending of its lifecycle - public LLColor PartEndColor; + public Color4 PartEndColor; /// A that represents the starting X size of the particle /// Minimum value is 0, maximum value is 4 public float PartStartScaleX; @@ -195,11 +195,11 @@ namespace OpenMetaverse float x = pack.UnpackFixed(true, 8, 7); float y = pack.UnpackFixed(true, 8, 7); float z = pack.UnpackFixed(true, 8, 7); - AngularVelocity = new LLVector3(x, y, z); + AngularVelocity = new Vector3(x, y, z); x = pack.UnpackFixed(true, 8, 7); y = pack.UnpackFixed(true, 8, 7); z = pack.UnpackFixed(true, 8, 7); - PartAcceleration = new LLVector3(x, y, z); + PartAcceleration = new Vector3(x, y, z); Texture = pack.UnpackUUID(); Target = pack.UnpackUUID(); @@ -209,12 +209,12 @@ namespace OpenMetaverse byte g = pack.UnpackByte(); byte b = pack.UnpackByte(); byte a = pack.UnpackByte(); - PartStartColor = new LLColor(r, g, b, a); + PartStartColor = new Color4(r, g, b, a); r = pack.UnpackByte(); g = pack.UnpackByte(); b = pack.UnpackByte(); a = pack.UnpackByte(); - PartEndColor = new LLColor(r, g, b, a); + PartEndColor = new Color4(r, g, b, a); PartStartScaleX = pack.UnpackFixed(false, 3, 5); PartStartScaleY = pack.UnpackFixed(false, 3, 5); PartEndScaleX = pack.UnpackFixed(false, 3, 5); @@ -227,11 +227,11 @@ namespace OpenMetaverse MaxAge = StartAge = InnerAngle = OuterAngle = BurstRate = BurstRadius = BurstSpeedMin = BurstSpeedMax = 0.0f; BurstPartCount = 0; - AngularVelocity = PartAcceleration = LLVector3.Zero; - Texture = Target = LLUUID.Zero; + AngularVelocity = PartAcceleration = Vector3.Zero; + Texture = Target = UUID.Zero; PartDataFlags = ParticleDataFlags.None; PartMaxAge = 0.0f; - PartStartColor = PartEndColor = LLColor.Black; + PartStartColor = PartEndColor = Color4.Black; PartStartScaleX = PartStartScaleY = PartEndScaleX = PartEndScaleY = 0.0f; } } diff --git a/OpenMetaverse/Prims.cs b/OpenMetaverse/Prims.cs index 7785a2c4..649d76f2 100644 --- a/OpenMetaverse/Prims.cs +++ b/OpenMetaverse/Prims.cs @@ -227,7 +227,7 @@ namespace OpenMetaverse /// public float Tension; /// - public LLVector3 Force; + public Vector3 Force; /// /// @@ -244,7 +244,7 @@ namespace OpenMetaverse Drag = (float)(data[pos++] & 0x7F) / 10.0f; Gravity = (float)(data[pos++] / 10.0f) - 10.0f; Wind = (float)data[pos++] / 10.0f; - Force = new LLVector3(data, pos); + Force = new Vector3(data, pos); } else { @@ -254,7 +254,7 @@ namespace OpenMetaverse Drag = 0.0f; Gravity = 0.0f; Wind = 0.0f; - Force = LLVector3.Zero; + Force = Vector3.Zero; } } @@ -325,7 +325,7 @@ namespace OpenMetaverse public struct LightData { /// - public LLColor Color; + public Color4 Color; /// public float Intensity; /// @@ -344,7 +344,7 @@ namespace OpenMetaverse { if (data.Length - pos >= 16) { - Color = new LLColor(data, pos, false); + Color = new Color4(data, pos, false); Radius = Helpers.BytesToFloat(data, pos + 4); Cutoff = Helpers.BytesToFloat(data, pos + 8); Falloff = Helpers.BytesToFloat(data, pos + 12); @@ -355,7 +355,7 @@ namespace OpenMetaverse } else { - Color = LLColor.Black; + Color = Color4.Black; Radius = 0f; Cutoff = 0f; Falloff = 0f; @@ -372,7 +372,7 @@ namespace OpenMetaverse byte[] data = new byte[16]; // Alpha channel in color is intensity - LLColor tmpColor = Color; + Color4 tmpColor = Color; tmpColor.A = Intensity; tmpColor.GetBytes().CopyTo(data, 0); Helpers.FloatToBytes(Radius).CopyTo(data, 4); @@ -429,19 +429,19 @@ namespace OpenMetaverse /// public struct SculptData { - public LLUUID SculptTexture; + public UUID SculptTexture; public SculptType Type; public SculptData(byte[] data, int pos) { if (data.Length >= 17) { - SculptTexture = new LLUUID(data, pos); + SculptTexture = new UUID(data, pos); Type = (SculptType)data[pos + 16]; } else { - SculptTexture = LLUUID.Zero; + SculptTexture = UUID.Zero; Type = SculptType.None; } } @@ -499,9 +499,9 @@ namespace OpenMetaverse /// public ClickAction ClickAction; /// - public LLUUID Sound; + public UUID Sound; /// Identifies the owner of the audio or particle system - public LLUUID OwnerID; + public UUID OwnerID; /// public byte SoundFlags; /// @@ -511,15 +511,15 @@ namespace OpenMetaverse /// public string Text; /// - public LLColor TextColor; + public Color4 TextColor; /// public string MediaURL; /// public JointType Joint; /// - public LLVector3 JointPivot; + public Vector3 JointPivot; /// - public LLVector3 JointAxisOrAnchor; + public Vector3 JointAxisOrAnchor; #endregion Public Members diff --git a/OpenMetaverse/Rendering/LindenMesh.cs b/OpenMetaverse/Rendering/LindenMesh.cs index bc46604b..69e57599 100644 --- a/OpenMetaverse/Rendering/LindenMesh.cs +++ b/OpenMetaverse/Rendering/LindenMesh.cs @@ -44,11 +44,11 @@ namespace OpenMetaverse.Rendering public struct Vertex { - public LLVector3 Coord; - public LLVector3 Normal; - public LLVector3 BiNormal; - public LLVector2 TexCoord; - public LLVector2 DetailTexCoord; + public Vector3 Coord; + public Vector3 Normal; + public Vector3 BiNormal; + public Vector2 TexCoord; + public Vector2 DetailTexCoord; public float Weight; public override string ToString() @@ -60,10 +60,10 @@ namespace OpenMetaverse.Rendering public struct MorphVertex { public uint VertexIndex; - public LLVector3 Coord; - public LLVector3 Normal; - public LLVector3 BiNormal; - public LLVector2 TexCoord; + public Vector3 Coord; + public Vector3 Normal; + public Vector3 BiNormal; + public Vector2 TexCoord; public override string ToString() { @@ -106,10 +106,10 @@ namespace OpenMetaverse.Rendering protected string _header; protected bool _hasWeights; protected bool _hasDetailTexCoords; - protected LLVector3 _position; - protected LLVector3 _rotationAngles; + protected Vector3 _position; + protected Vector3 _rotationAngles; protected byte _rotationOrder; - protected LLVector3 _scale; + protected Vector3 _scale; protected ushort _numFaces; protected Face[] _faces; @@ -125,10 +125,10 @@ namespace OpenMetaverse.Rendering // Populate base mesh variables _hasWeights = (input.UnpackByte() != 0); _hasDetailTexCoords = (input.UnpackByte() != 0); - _position = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); - _rotationAngles = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _position = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _rotationAngles = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); _rotationOrder = input.UnpackByte(); - _scale = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _scale = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); _numFaces = (ushort)input.UnpackUShort(); _faces = new Face[_numFaces]; @@ -144,10 +144,10 @@ namespace OpenMetaverse.Rendering public string Header { get { return _header; } } public bool HasWeights { get { return _hasWeights; } } public bool HasDetailTexCoords { get { return _hasDetailTexCoords; } } - public LLVector3 Position { get { return _position; } } - public LLVector3 RotationAngles { get { return _rotationAngles; } } + public Vector3 Position { get { return _position; } } + public Vector3 RotationAngles { get { return _rotationAngles; } } //public byte RotationOrder - public LLVector3 Scale { get { return _scale; } } + public Vector3 Scale { get { return _scale; } } public ushort NumVertices { get { return _numVertices; } } public Vertex[] Vertices { get { return _vertices; } } public ushort NumFaces { get { return _numFaces; } } @@ -163,10 +163,10 @@ namespace OpenMetaverse.Rendering protected string _header; protected bool _hasWeights; protected bool _hasDetailTexCoords; - protected LLVector3 _position; - protected LLVector3 _rotationAngles; + protected Vector3 _position; + protected Vector3 _rotationAngles; protected byte _rotationOrder; - protected LLVector3 _scale; + protected Vector3 _scale; protected ushort _numVertices; protected Vertex[] _vertices; protected ushort _numFaces; @@ -196,31 +196,31 @@ namespace OpenMetaverse.Rendering // Populate base mesh variables _hasWeights = (input.UnpackByte() != 0); _hasDetailTexCoords = (input.UnpackByte() != 0); - _position = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); - _rotationAngles = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _position = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _rotationAngles = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); _rotationOrder = input.UnpackByte(); - _scale = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _scale = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); _numVertices = (ushort)input.UnpackUShort(); // Populate the vertex array _vertices = new Vertex[_numVertices]; for (int i = 0; i < _numVertices; i++) - _vertices[i].Coord = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _vertices[i].Coord = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); for (int i = 0; i < _numVertices; i++) - _vertices[i].Normal = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _vertices[i].Normal = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); for (int i = 0; i < _numVertices; i++) - _vertices[i].BiNormal = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + _vertices[i].BiNormal = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); for (int i = 0; i < _numVertices; i++) - _vertices[i].TexCoord = new LLVector2(input.UnpackFloat(), input.UnpackFloat()); + _vertices[i].TexCoord = new Vector2(input.UnpackFloat(), input.UnpackFloat()); if (_hasDetailTexCoords) { for (int i = 0; i < _numVertices; i++) - _vertices[i].DetailTexCoord = new LLVector2(input.UnpackFloat(), input.UnpackFloat()); + _vertices[i].DetailTexCoord = new Vector2(input.UnpackFloat(), input.UnpackFloat()); } if (_hasWeights) @@ -267,10 +267,10 @@ namespace OpenMetaverse.Rendering { MorphVertex vertex; vertex.VertexIndex = input.UnpackUInt(); - vertex.Coord = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); - vertex.Normal = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); - vertex.BiNormal = new LLVector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); - vertex.TexCoord = new LLVector2(input.UnpackFloat(), input.UnpackFloat()); + vertex.Coord = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + vertex.Normal = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + vertex.BiNormal = new Vector3(input.UnpackFloat(), input.UnpackFloat(), input.UnpackFloat()); + vertex.TexCoord = new Vector2(input.UnpackFloat(), input.UnpackFloat()); } morphs.Add(morph); diff --git a/OpenMetaverse/Rendering/Rendering.cs b/OpenMetaverse/Rendering/Rendering.cs index e34b0cba..6d98eb4e 100644 --- a/OpenMetaverse/Rendering/Rendering.cs +++ b/OpenMetaverse/Rendering/Rendering.cs @@ -78,10 +78,10 @@ namespace OpenMetaverse.Rendering public struct Vertex { - public LLVector3 Position; - public LLVector3 Normal; - public LLVector3 Binormal; - public LLVector2 TexCoord; + public Vector3 Position; + public Vector3 Normal; + public Vector3 Binormal; + public Vector2 TexCoord; } public struct ProfileFace @@ -106,15 +106,15 @@ namespace OpenMetaverse.Rendering public bool Open; public bool Concave; public int TotalOutsidePoints; - public List Positions; + public List Positions; public List Faces; } public struct PathPoint { - public LLVector3 Position; - public LLVector2 Scale; - public LLQuaternion Rotation; + public Vector3 Position; + public Vector2 Scale; + public Quaternion Rotation; public float TexT; } @@ -133,9 +133,9 @@ namespace OpenMetaverse.Rendering public int NumT; public int ID; - public LLVector3 Center; - public LLVector3 MinExtent; - public LLVector3 MaxExtent; + public Vector3 Center; + public Vector3 MinExtent; + public Vector3 MaxExtent; public List Vertices; public List Indices; public List Edge; diff --git a/OpenMetaverse/Settings.cs b/OpenMetaverse/Settings.cs index ee24d13f..4048a979 100644 --- a/OpenMetaverse/Settings.cs +++ b/OpenMetaverse/Settings.cs @@ -261,7 +261,7 @@ namespace OpenMetaverse #region Misc /// Default color used for viewer particle effects - public LLColor DEFAULT_EFFECT_COLOR = new LLColor(255, 0, 0, 255); + public Color4 DEFAULT_EFFECT_COLOR = new Color4(255, 0, 0, 255); /// Cost of uploading an asset /// Read-only since this value is dynamically fetched at login diff --git a/OpenMetaverse/Simulator.cs b/OpenMetaverse/Simulator.cs index fecab066..a11a02c6 100644 --- a/OpenMetaverse/Simulator.cs +++ b/OpenMetaverse/Simulator.cs @@ -234,7 +234,7 @@ namespace OpenMetaverse /// is attached to public GridClient Client; /// - public LLUUID ID = LLUUID.Zero; + public UUID ID = UUID.Zero; /// The capabilities for this simulator public Caps Caps = null; /// @@ -266,23 +266,23 @@ namespace OpenMetaverse /// public float WaterHeight; /// - public LLUUID SimOwner = LLUUID.Zero; + public UUID SimOwner = UUID.Zero; /// - public LLUUID TerrainBase0 = LLUUID.Zero; + public UUID TerrainBase0 = UUID.Zero; /// - public LLUUID TerrainBase1 = LLUUID.Zero; + public UUID TerrainBase1 = UUID.Zero; /// - public LLUUID TerrainBase2 = LLUUID.Zero; + public UUID TerrainBase2 = UUID.Zero; /// - public LLUUID TerrainBase3 = LLUUID.Zero; + public UUID TerrainBase3 = UUID.Zero; /// - public LLUUID TerrainDetail0 = LLUUID.Zero; + public UUID TerrainDetail0 = UUID.Zero; /// - public LLUUID TerrainDetail1 = LLUUID.Zero; + public UUID TerrainDetail1 = UUID.Zero; /// - public LLUUID TerrainDetail2 = LLUUID.Zero; + public UUID TerrainDetail2 = UUID.Zero; /// - public LLUUID TerrainDetail3 = LLUUID.Zero; + public UUID TerrainDetail3 = UUID.Zero; /// public bool IsEstateManager; /// @@ -368,7 +368,7 @@ namespace OpenMetaverse /// not public bool Connected { get { return connected; } } /// Coarse locations of avatars in this simulator - public List AvatarPositions { get { return avatarPositions; } } + public List AvatarPositions { get { return avatarPositions; } } /// AvatarPositions index representing your avatar public int PositionIndexYou { get { return positionIndexYou; } } /// AvatarPositions index representing TrackAgent target @@ -386,7 +386,7 @@ namespace OpenMetaverse /// to the property Connected internal bool connected; /// Coarse locations of avatars in this simulator - internal List avatarPositions = new List(); + internal List avatarPositions = new List(); /// AvatarPositions index representing your avatar internal int positionIndexYou = -1; /// AvatarPositions index representing TrackAgent target diff --git a/OpenMetaverse/SoundManager.cs b/OpenMetaverse/SoundManager.cs index ac83d64d..33d51a34 100644 --- a/OpenMetaverse/SoundManager.cs +++ b/OpenMetaverse/SoundManager.cs @@ -34,10 +34,10 @@ namespace OpenMetaverse { public readonly GridClient Client; - public delegate void AttachSoundCallback(LLUUID soundID, LLUUID ownerID, LLUUID objectID, float gain, byte flags); - public delegate void AttachedSoundGainChangeCallback(LLUUID objectID, float gain); - public delegate void SoundTriggerCallback(LLUUID soundID, LLUUID ownerID, LLUUID objectID, LLUUID parentID, float gain, ulong regionHandle, LLVector3 position); - public delegate void PreloadSoundCallback(LLUUID soundID, LLUUID ownerID, LLUUID objectID); + public delegate void AttachSoundCallback(UUID soundID, UUID ownerID, UUID objectID, float gain, byte flags); + public delegate void AttachedSoundGainChangeCallback(UUID objectID, float gain); + public delegate void SoundTriggerCallback(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, float gain, ulong regionHandle, Vector3 position); + public delegate void PreloadSoundCallback(UUID soundID, UUID ownerID, UUID objectID); public event AttachSoundCallback OnAttachSound; public event AttachedSoundGainChangeCallback OnAttachSoundGainChange; @@ -60,7 +60,7 @@ namespace OpenMetaverse /// Plays a sound in the current region at full volume from avatar position /// /// UUID of the sound to be played - public void SoundTrigger(LLUUID soundID) + public void SoundTrigger(UUID soundID) { SoundTrigger(soundID, Client.Self.SimPosition, 1.0f); } @@ -70,7 +70,7 @@ namespace OpenMetaverse /// /// UUID of the sound to be played. /// position for the sound to be played at. Normally the avatar. - public void SoundTrigger(LLUUID soundID, LLVector3 position) + public void SoundTrigger(UUID soundID, Vector3 position) { SoundTrigger(soundID, Client.Self.SimPosition, 1.0f); } @@ -81,7 +81,7 @@ namespace OpenMetaverse /// UUID of the sound to be played. /// position for the sound to be played at. Normally the avatar. /// volume of the sound, from 0.0 to 1.0 - public void SoundTrigger(LLUUID soundID, LLVector3 position, float gain) + public void SoundTrigger(UUID soundID, Vector3 position, float gain) { SoundTrigger(soundID, Client.Network.CurrentSim.Handle, position, 1.0f); } @@ -92,7 +92,7 @@ namespace OpenMetaverse /// UUID of the sound to be played. /// position for the sound to be played at. Normally the avatar. /// volume of the sound, from 0.0 to 1.0 - public void SoundTrigger(LLUUID soundID, Simulator sim, LLVector3 position, float gain) + public void SoundTrigger(UUID soundID, Simulator sim, Vector3 position, float gain) { SoundTrigger(soundID, sim.Handle, position, 1.0f); } @@ -104,14 +104,14 @@ namespace OpenMetaverse /// handle id for the sim to be played in. /// position for the sound to be played at. Normally the avatar. /// volume of the sound, from 0.0 to 1.0 - public void SoundTrigger(LLUUID soundID, ulong handle, LLVector3 position, float gain) + public void SoundTrigger(UUID soundID, ulong handle, Vector3 position, float gain) { SoundTriggerPacket soundtrigger = new SoundTriggerPacket(); soundtrigger.SoundData = new SoundTriggerPacket.SoundDataBlock(); soundtrigger.SoundData.SoundID = soundID; - soundtrigger.SoundData.ObjectID = LLUUID.Zero; - soundtrigger.SoundData.OwnerID = LLUUID.Zero; - soundtrigger.SoundData.ParentID = LLUUID.Zero; + soundtrigger.SoundData.ObjectID = UUID.Zero; + soundtrigger.SoundData.OwnerID = UUID.Zero; + soundtrigger.SoundData.ParentID = UUID.Zero; soundtrigger.SoundData.Handle = handle; soundtrigger.SoundData.Position = position; soundtrigger.SoundData.Gain = gain; diff --git a/OpenMetaverse/TextureEntry.cs b/OpenMetaverse/TextureEntry.cs index 79f187b0..5675ed83 100644 --- a/OpenMetaverse/TextureEntry.cs +++ b/OpenMetaverse/TextureEntry.cs @@ -159,7 +159,7 @@ namespace OpenMetaverse private const byte MEDIA_MASK = 0x01; private const byte TEX_MAP_MASK = 0x06; - private LLColor rgba; + private Color4 rgba; private float repeatU; private float repeatV; private float offsetU; @@ -167,7 +167,7 @@ namespace OpenMetaverse private float rotation; private float glow; private TextureAttributes hasAttribute; - private LLUUID textureID; + private UUID textureID; private TextureEntryFace DefaultTexture; internal byte material; @@ -176,7 +176,7 @@ namespace OpenMetaverse #region Properties /// - public LLColor RGBA + public Color4 RGBA { get { @@ -397,7 +397,7 @@ namespace OpenMetaverse } /// - public LLUUID TextureID + public UUID TextureID { get { @@ -451,7 +451,7 @@ namespace OpenMetaverse if (TextureID != LLObject.TextureEntry.WHITE_TEXTURE) tex["imageid"] = LLSD.FromUUID(TextureID); else - tex["imageid"] = LLSD.FromUUID(LLUUID.Zero); + tex["imageid"] = LLSD.FromUUID(UUID.Zero); return tex; } @@ -462,7 +462,7 @@ namespace OpenMetaverse TextureEntryFace face = new TextureEntryFace(defaultFace); faceNumber = (map.ContainsKey("face_number")) ? map["face_number"].AsInteger() : -1; - LLColor rgba = face.RGBA; + Color4 rgba = face.RGBA; rgba.FromLLSD(map["colors"]); face.RGBA = rgba; face.RepeatU = (float)map["scales"].AsReal(); @@ -506,7 +506,7 @@ namespace OpenMetaverse public class TextureEntry { public const int MAX_FACES = 32; - public static readonly LLUUID WHITE_TEXTURE = new LLUUID("5748decc-f629-461c-9a36-a35a221fe21f"); + public static readonly UUID WHITE_TEXTURE = new UUID("5748decc-f629-461c-9a36-a35a221fe21f"); /// public TextureEntryFace DefaultTexture; @@ -517,7 +517,7 @@ namespace OpenMetaverse /// Constructor that takes a default texture UUID /// /// Texture UUID to use as the default texture - public TextureEntry(LLUUID defaultTextureID) + public TextureEntry(UUID defaultTextureID) { DefaultTexture = new TextureEntryFace(null); DefaultTexture.TextureID = defaultTextureID; @@ -657,12 +657,12 @@ namespace OpenMetaverse int i = pos; #region Texture - DefaultTexture.TextureID = new LLUUID(data, i); + DefaultTexture.TextureID = new UUID(data, i); i += 16; while (ReadFaceBitfield(data, ref i, ref faceBits, ref bitfieldSize)) { - LLUUID tmpUUID = new LLUUID(data, i); + UUID tmpUUID = new UUID(data, i); i += 16; for (uint face = 0, bit = 1; face < bitfieldSize; face++, bit <<= 1) @@ -672,12 +672,12 @@ namespace OpenMetaverse #endregion Texture #region Color - DefaultTexture.RGBA = new LLColor(data, i, true); + DefaultTexture.RGBA = new Color4(data, i, true); i += 4; while (ReadFaceBitfield(data, ref i, ref faceBits, ref bitfieldSize)) { - LLColor tmpColor = new LLColor(data, i, true); + Color4 tmpColor = new Color4(data, i, true); i += 4; for (uint face = 0, bit = 1; face < bitfieldSize; face++, bit <<= 1) diff --git a/OpenMetaverse/Types.cs b/OpenMetaverse/Types.cs index a58f5e0a..8169cfe6 100644 --- a/OpenMetaverse/Types.cs +++ b/OpenMetaverse/Types.cs @@ -35,10 +35,10 @@ namespace OpenMetaverse /// Life networking protocol /// [Serializable] - public struct LLUUID : IComparable + public struct UUID : IComparable { /// The System.Guid object this struct wraps around - public Guid UUID; + public Guid Guid; #region Constructors @@ -48,12 +48,12 @@ namespace OpenMetaverse /// A string representation of a UUID, case /// insensitive and can either be hyphenated or non-hyphenated /// LLUUID("11f8aa9c-b071-4242-836b-13b7abe0d489") - public LLUUID(string val) + public UUID(string val) { if (String.IsNullOrEmpty(val)) - UUID = new Guid(); + Guid = new Guid(); else - UUID = new Guid(val); + Guid = new Guid(val); } /// @@ -61,9 +61,9 @@ namespace OpenMetaverse /// /// A Guid object that contains the unique identifier /// to be represented by this LLUUID - public LLUUID(Guid val) + public UUID(Guid val) { - UUID = val; + Guid = val; } /// @@ -71,9 +71,9 @@ namespace OpenMetaverse /// /// Byte array containing a 16 byte UUID /// Beginning offset in the array - public LLUUID(byte[] source, int pos) + public UUID(byte[] source, int pos) { - UUID = LLUUID.Zero.UUID; + Guid = UUID.Zero.Guid; FromBytes(source, pos); } @@ -82,18 +82,18 @@ namespace OpenMetaverse /// convert to a UUID /// /// 64-bit unsigned integer to convert to a UUID - public LLUUID(ulong val) + public UUID(ulong val) { - UUID = new Guid(0, 0, 0, BitConverter.GetBytes(val)); + Guid = new Guid(0, 0, 0, BitConverter.GetBytes(val)); } /// /// Copy constructor /// /// UUID to copy - public LLUUID(LLUUID val) + public UUID(UUID val) { - UUID = val.UUID; + Guid = val.Guid; } #endregion Constructors @@ -105,10 +105,10 @@ namespace OpenMetaverse /// public int CompareTo(object obj) { - if (obj is LLUUID) + if (obj is UUID) { - LLUUID ID = (LLUUID)obj; - return this.UUID.CompareTo(ID.UUID); + UUID ID = (UUID)obj; + return this.Guid.CompareTo(ID.Guid); } throw new ArgumentException("object is not a LLUUID"); @@ -121,7 +121,7 @@ namespace OpenMetaverse /// public void FromBytes(byte[] source, int pos) { - UUID = new Guid( + Guid = new Guid( (source[pos + 0] << 24) | (source[pos + 1] << 16) | (source[pos + 2] << 8) | source[pos + 3], (short)((source[pos + 4] << 8) | source[pos + 5]), (short)((source[pos + 6] << 8) | source[pos + 7]), @@ -135,7 +135,7 @@ namespace OpenMetaverse /// A 16 byte array containing this UUID public byte[] GetBytes() { - byte[] bytes = UUID.ToByteArray(); + byte[] bytes = Guid.ToByteArray(); byte[] output = new byte[16]; output[0] = bytes[3]; output[1] = bytes[2]; @@ -173,7 +173,7 @@ namespace OpenMetaverse /// An integer created from the first eight bytes of this UUID public ulong GetULong() { - return Helpers.BytesToUInt64(UUID.ToByteArray()); + return Helpers.BytesToUInt64(Guid.ToByteArray()); } #endregion Public Methods @@ -186,9 +186,9 @@ namespace OpenMetaverse /// A string representation of a UUID, case /// insensitive and can either be hyphenated or non-hyphenated /// LLUUID.Parse("11f8aa9c-b071-4242-836b-13b7abe0d489") - public static LLUUID Parse(string val) + public static UUID Parse(string val) { - return new LLUUID(val); + return new UUID(val); } /// @@ -200,7 +200,7 @@ namespace OpenMetaverse /// otherwise null /// True if the string was successfully parse, otherwise false /// LLUUID.TryParse("11f8aa9c-b071-4242-836b-13b7abe0d489", result) - public static bool TryParse(string val, out LLUUID result) + public static bool TryParse(string val, out UUID result) { try { @@ -209,7 +209,7 @@ namespace OpenMetaverse } catch (Exception) { - result = LLUUID.Zero; + result = UUID.Zero; return false; } } @@ -221,23 +221,23 @@ namespace OpenMetaverse /// First LLUUID to combine /// Second LLUUID to combine /// The UUID product of the combination - public static LLUUID Combine(LLUUID first, LLUUID second) + public static UUID Combine(UUID first, UUID second) { // Construct the buffer that MD5ed byte[] input = new byte[32]; Buffer.BlockCopy(first.GetBytes(), 0, input, 0, 16); Buffer.BlockCopy(second.GetBytes(), 0, input, 16, 16); - return new LLUUID(Helpers.MD5Builder.ComputeHash(input), 0); + return new UUID(Helpers.MD5Builder.ComputeHash(input), 0); } /// /// /// /// - public static LLUUID Random() + public static UUID Random() { - return new LLUUID(Guid.NewGuid()); + return new UUID(Guid.NewGuid()); } #endregion Static Methods @@ -250,7 +250,7 @@ namespace OpenMetaverse /// An integer composed of all the UUID bytes XORed together public override int GetHashCode() { - return UUID.GetHashCode(); + return Guid.GetHashCode(); } /// @@ -261,10 +261,10 @@ namespace OpenMetaverse /// byte for byte identical to this public override bool Equals(object o) { - if (!(o is LLUUID)) return false; + if (!(o is UUID)) return false; - LLUUID uuid = (LLUUID)o; - return UUID == uuid.UUID; + UUID uuid = (UUID)o; + return Guid == uuid.Guid; } /// @@ -275,7 +275,7 @@ namespace OpenMetaverse /// 11f8aa9c-b071-4242-836b-13b7abe0d489 public override string ToString() { - return UUID.ToString(); + return Guid.ToString(); } #endregion Overrides @@ -288,9 +288,9 @@ namespace OpenMetaverse /// First LLUUID for comparison /// Second LLUUID for comparison /// True if the UUIDs are byte for byte equal, otherwise false - public static bool operator==(LLUUID lhs, LLUUID rhs) + public static bool operator==(UUID lhs, UUID rhs) { - return lhs.UUID == rhs.UUID; + return lhs.Guid == rhs.Guid; } /// @@ -299,7 +299,7 @@ namespace OpenMetaverse /// First LLUUID for comparison /// Second LLUUID for comparison /// True if the UUIDs are not equal, otherwise true - public static bool operator!=(LLUUID lhs, LLUUID rhs) + public static bool operator!=(UUID lhs, UUID rhs) { return !(lhs == rhs); } @@ -310,7 +310,7 @@ namespace OpenMetaverse /// First LLUUID /// Second LLUUID /// A UUID that is a XOR combination of the two input UUIDs - public static LLUUID operator ^(LLUUID lhs, LLUUID rhs) + public static UUID operator ^(UUID lhs, UUID rhs) { byte[] lhsbytes = lhs.GetBytes(); byte[] rhsbytes = rhs.GetBytes(); @@ -321,7 +321,7 @@ namespace OpenMetaverse output[i] = (byte)(lhsbytes[i] ^ rhsbytes[i]); } - return new LLUUID(output, 0); + return new UUID(output, 0); } /// @@ -330,22 +330,22 @@ namespace OpenMetaverse /// A UUID in string form. Case insensitive, /// hyphenated or non-hyphenated /// A UUID built from the string representation - public static implicit operator LLUUID(string val) + public static implicit operator UUID(string val) { - return new LLUUID(val); + return new UUID(val); } #endregion Operators /// An LLUUID with a value of all zeroes - public static readonly LLUUID Zero = new LLUUID(); + public static readonly UUID Zero = new UUID(); } /// /// A two-dimensional vector with floating-point values /// [Serializable] - public struct LLVector2 + public struct Vector2 { /// X value public float X; @@ -415,7 +415,7 @@ namespace OpenMetaverse /// /// X value /// Y value - public LLVector2(float x, float y) + public Vector2(float x, float y) { conversionBuffer = null; X = x; @@ -426,7 +426,7 @@ namespace OpenMetaverse /// Copy constructor /// /// Vector to copy - public LLVector2(LLVector2 vector) + public Vector2(Vector2 vector) { conversionBuffer = null; X = vector.X; @@ -453,9 +453,9 @@ namespace OpenMetaverse /// public override bool Equals(object o) { - if (!(o is LLVector2)) return false; + if (!(o is Vector2)) return false; - LLVector2 vector = (LLVector2)o; + Vector2 vector = (Vector2)o; return (X == vector.X && Y == vector.Y); } @@ -473,67 +473,67 @@ namespace OpenMetaverse #region Operators - public static bool operator ==(LLVector2 lhs, LLVector2 rhs) + public static bool operator ==(Vector2 lhs, Vector2 rhs) { return (lhs.X == rhs.X && lhs.Y == rhs.Y); } - public static bool operator !=(LLVector2 lhs, LLVector2 rhs) + public static bool operator !=(Vector2 lhs, Vector2 rhs) { return !(lhs == rhs); } - public static LLVector2 operator +(LLVector2 lhs, LLVector2 rhs) + public static Vector2 operator +(Vector2 lhs, Vector2 rhs) { - return new LLVector2(lhs.X + rhs.X, lhs.Y + rhs.Y); + return new Vector2(lhs.X + rhs.X, lhs.Y + rhs.Y); } - public static LLVector2 operator -(LLVector2 vec) + public static Vector2 operator -(Vector2 vec) { - return new LLVector2(-vec.X, -vec.Y); + return new Vector2(-vec.X, -vec.Y); } - public static LLVector2 operator -(LLVector2 lhs, LLVector2 rhs) + public static Vector2 operator -(Vector2 lhs, Vector2 rhs) { - return new LLVector2(lhs.X - rhs.X, lhs.Y - rhs.Y); + return new Vector2(lhs.X - rhs.X, lhs.Y - rhs.Y); } - public static LLVector2 operator *(LLVector2 vec, float val) + public static Vector2 operator *(Vector2 vec, float val) { - return new LLVector2(vec.X * val, vec.Y * val); + return new Vector2(vec.X * val, vec.Y * val); } - public static LLVector2 operator *(float val, LLVector2 vec) + public static Vector2 operator *(float val, Vector2 vec) { - return new LLVector2(vec.X * val, vec.Y * val); + return new Vector2(vec.X * val, vec.Y * val); } - public static LLVector2 operator *(LLVector2 lhs, LLVector2 rhs) + public static Vector2 operator *(Vector2 lhs, Vector2 rhs) { - return new LLVector2(lhs.X * rhs.X, lhs.Y * rhs.Y); + return new Vector2(lhs.X * rhs.X, lhs.Y * rhs.Y); } - public static LLVector2 operator /(LLVector2 lhs, LLVector2 rhs) + public static Vector2 operator /(Vector2 lhs, Vector2 rhs) { - return new LLVector2(lhs.X / rhs.X, lhs.Y / rhs.Y); + return new Vector2(lhs.X / rhs.X, lhs.Y / rhs.Y); } - public static LLVector2 operator /(LLVector2 vec, float val) + public static Vector2 operator /(Vector2 vec, float val) { - return new LLVector2(vec.X / val, vec.Y / val); + return new Vector2(vec.X / val, vec.Y / val); } #endregion Operators /// An LLVector2 with a value of 0,0,0 - public readonly static LLVector2 Zero = new LLVector2(); + public readonly static Vector2 Zero = new Vector2(); } /// /// A three-dimensional vector with floating-point values /// [Serializable] - public struct LLVector3 + public struct Vector3 { /// X value public float X; @@ -552,7 +552,7 @@ namespace OpenMetaverse /// /// Byte array containing three four-byte floats /// Beginning position in the byte array - public LLVector3(byte[] byteArray, int pos) + public Vector3(byte[] byteArray, int pos) { conversionBuffer = null; X = Y = Z = 0; @@ -565,7 +565,7 @@ namespace OpenMetaverse /// X value /// Y value /// Z value - public LLVector3(float x, float y, float z) + public Vector3(float x, float y, float z) { conversionBuffer = null; X = x; @@ -577,7 +577,7 @@ namespace OpenMetaverse /// Copy constructor /// /// Vector to copy - public LLVector3(LLVector3 vector) + public Vector3(Vector3 vector) { conversionBuffer = null; X = (float)vector.X; @@ -678,7 +678,7 @@ namespace OpenMetaverse } } - this = LLVector3.Zero; + this = Vector3.Zero; } //FIXME: Need comprehensive testing for this @@ -705,7 +705,7 @@ namespace OpenMetaverse /// /// Calculate the magnitude of the supplied vector /// - public static float Mag(LLVector3 v) + public static float Mag(Vector3 v) { return (float)Math.Sqrt(v.X * v.X + v.Y * v.Y + v.Z * v.Z); } @@ -715,7 +715,7 @@ namespace OpenMetaverse /// /// /// - public static float MagSquared(LLVector3 v) + public static float MagSquared(Vector3 v) { return v.X * v.X + v.Y * v.Y + v.Z * v.Z; } @@ -725,10 +725,10 @@ namespace OpenMetaverse /// /// The vector to normalize /// A normalized version of the vector - public static LLVector3 Norm(LLVector3 vector) + public static Vector3 Norm(Vector3 vector) { float mag = Mag(vector); - return new LLVector3(vector.X / mag, vector.Y / mag, vector.Z / mag); + return new Vector3(vector.X / mag, vector.Y / mag, vector.Z / mag); } /// @@ -737,9 +737,9 @@ namespace OpenMetaverse /// First vector /// Second vector /// Cross product of first and second vector - public static LLVector3 Cross(LLVector3 v1, LLVector3 v2) + public static Vector3 Cross(Vector3 v1, Vector3 v2) { - return new LLVector3 + return new Vector3 ( v1.Y * v2.Z - v1.Z * v2.Y, v1.Z * v2.X - v1.X * v2.Z, @@ -750,7 +750,7 @@ namespace OpenMetaverse /// /// Returns the dot product of two vectors /// - public static float Dot(LLVector3 v1, LLVector3 v2) + public static float Dot(Vector3 v1, Vector3 v2) { return (v1.X * v2.X) + (v1.Y * v2.Y) + (v1.Z * v2.Z); } @@ -758,7 +758,7 @@ namespace OpenMetaverse /// /// Calculates the distance between two vectors /// - public static float Dist(LLVector3 pointA, LLVector3 pointB) + public static float Dist(Vector3 pointA, Vector3 pointB) { float xd = pointB.X - pointA.X; float yd = pointB.Y - pointA.Y; @@ -766,12 +766,12 @@ namespace OpenMetaverse return (float)Math.Sqrt(xd * xd + yd * yd + zd * zd); } - public static LLVector3 Rot(LLVector3 vector, LLQuaternion rotation) + public static Vector3 Rot(Vector3 vector, Quaternion rotation) { return vector * rotation; } - public static LLVector3 Rot(LLVector3 vector, LLMatrix3 rotation) + public static Vector3 Rot(Vector3 vector, Matrix3 rotation) { return vector * rotation; } @@ -781,28 +781,28 @@ namespace OpenMetaverse /// /// Directional vector, such as 1,0,0 for the forward face /// Target vector - normalize first with VecNorm - public static LLQuaternion RotBetween(LLVector3 a, LLVector3 b) + public static Quaternion RotBetween(Vector3 a, Vector3 b) { //A and B should both be normalized float dotProduct = Dot(a, b); - LLVector3 crossProduct = Cross(a, b); + Vector3 crossProduct = Cross(a, b); float magProduct = Mag(a) * Mag(b); double angle = Math.Acos(dotProduct / magProduct); - LLVector3 axis = Norm(crossProduct); + Vector3 axis = Norm(crossProduct); float s = (float)Math.Sin(angle / 2); - return new LLQuaternion( + return new Quaternion( axis.X * s, axis.Y * s, axis.Z * s, (float)Math.Cos(angle / 2)); } - public static LLVector3 Transform(LLVector3 vector, LLMatrix3 matrix) + public static Vector3 Transform(Vector3 vector, Matrix3 matrix) { // Operates "from the right" on row vector - return new LLVector3( + return new Vector3( vector.X * matrix.M11 + vector.Y * matrix.M21 + vector.Z * matrix.M31, vector.X * matrix.M12 + vector.Y * matrix.M22 + vector.Z * matrix.M32, vector.X * matrix.M13 + vector.Y * matrix.M23 + vector.Z * matrix.M33 @@ -814,17 +814,17 @@ namespace OpenMetaverse /// /// A string representation of a 3D vector, enclosed /// in arrow brackets and separated by commas - public static LLVector3 Parse(string val) + public static Vector3 Parse(string val) { char[] splitChar = { ',' }; string[] split = val.Replace("<", String.Empty).Replace(">", String.Empty).Split(splitChar); - return new LLVector3( + return new Vector3( float.Parse(split[0].Trim(), Helpers.EnUsCulture), float.Parse(split[1].Trim(), Helpers.EnUsCulture), float.Parse(split[2].Trim(), Helpers.EnUsCulture)); } - public static bool TryParse(string val, out LLVector3 result) + public static bool TryParse(string val, out Vector3 result) { try { @@ -833,7 +833,7 @@ namespace OpenMetaverse } catch (Exception) { - result = new LLVector3(); + result = new Vector3(); return false; } } @@ -858,9 +858,9 @@ namespace OpenMetaverse /// public override bool Equals(object o) { - if (!(o is LLVector3)) return false; + if (!(o is Vector3)) return false; - LLVector3 vector = (LLVector3)o; + Vector3 vector = (Vector3)o; return (X == vector.X && Y == vector.Y && Z == vector.Z); } @@ -878,47 +878,47 @@ namespace OpenMetaverse #region Operators - public static bool operator==(LLVector3 lhs, LLVector3 rhs) + public static bool operator==(Vector3 lhs, Vector3 rhs) { return (lhs.X == rhs.X && lhs.Y == rhs.Y && lhs.Z == rhs.Z); } - public static bool operator!=(LLVector3 lhs, LLVector3 rhs) + public static bool operator!=(Vector3 lhs, Vector3 rhs) { return !(lhs.X == rhs.X && lhs.Y == rhs.Y && lhs.Z == rhs.Z); } - public static LLVector3 operator +(LLVector3 lhs, LLVector3 rhs) + public static Vector3 operator +(Vector3 lhs, Vector3 rhs) { - return new LLVector3(lhs.X + rhs.X, lhs.Y + rhs.Y, lhs.Z + rhs.Z); + return new Vector3(lhs.X + rhs.X, lhs.Y + rhs.Y, lhs.Z + rhs.Z); } - public static LLVector3 operator -(LLVector3 vec) + public static Vector3 operator -(Vector3 vec) { - return new LLVector3(-vec.X, -vec.Y, -vec.Z); + return new Vector3(-vec.X, -vec.Y, -vec.Z); } - public static LLVector3 operator -(LLVector3 lhs, LLVector3 rhs) + public static Vector3 operator -(Vector3 lhs, Vector3 rhs) { - return new LLVector3(lhs.X - rhs.X,lhs.Y - rhs.Y, lhs.Z - rhs.Z); + return new Vector3(lhs.X - rhs.X,lhs.Y - rhs.Y, lhs.Z - rhs.Z); } - public static LLVector3 operator *(LLVector3 vec, float val) + public static Vector3 operator *(Vector3 vec, float val) { - return new LLVector3(vec.X * val, vec.Y * val, vec.Z * val); + return new Vector3(vec.X * val, vec.Y * val, vec.Z * val); } - public static LLVector3 operator *(float val, LLVector3 vec) + public static Vector3 operator *(float val, Vector3 vec) { - return new LLVector3(vec.X * val, vec.Y * val, vec.Z * val); + return new Vector3(vec.X * val, vec.Y * val, vec.Z * val); } - public static LLVector3 operator *(LLVector3 lhs, LLVector3 rhs) + public static Vector3 operator *(Vector3 lhs, Vector3 rhs) { - return new LLVector3(lhs.X * rhs.X, lhs.Y * rhs.Y, lhs.Z * rhs.Z); + return new Vector3(lhs.X * rhs.X, lhs.Y * rhs.Y, lhs.Z * rhs.Z); } - public static LLVector3 operator *(LLVector3 vec, LLQuaternion rot) + public static Vector3 operator *(Vector3 vec, Quaternion rot) { float rw = -rot.X * vec.X - rot.Y * vec.Y - rot.Z * vec.Z; float rx = rot.W * vec.X + rot.Y * vec.Z - rot.Z * vec.Y; @@ -929,27 +929,27 @@ namespace OpenMetaverse float ny = -rw * rot.Y + ry * rot.W - rz * rot.X + rx * rot.Z; float nz = -rw * rot.Z + rz * rot.W - rx * rot.Y + ry * rot.X; - return new LLVector3(nx, ny, nz); + return new Vector3(nx, ny, nz); } - public static LLVector3 operator *(LLVector3 vector, LLMatrix3 matrix) + public static Vector3 operator *(Vector3 vector, Matrix3 matrix) { - return LLVector3.Transform(vector, matrix); + return Vector3.Transform(vector, matrix); } - public static LLVector3 operator /(LLVector3 lhs, LLVector3 rhs) + public static Vector3 operator /(Vector3 lhs, Vector3 rhs) { - return new LLVector3(lhs.X / rhs.X, lhs.Y / rhs.Y, lhs.Z / rhs.Z); + return new Vector3(lhs.X / rhs.X, lhs.Y / rhs.Y, lhs.Z / rhs.Z); } - public static LLVector3 operator /(LLVector3 vec, float val) + public static Vector3 operator /(Vector3 vec, float val) { - return new LLVector3(vec.X / val, vec.Y / val, vec.Z / val); + return new Vector3(vec.X / val, vec.Y / val, vec.Z / val); } - public static LLVector3 operator %(LLVector3 lhs, LLVector3 rhs) + public static Vector3 operator %(Vector3 lhs, Vector3 rhs) { - return new LLVector3( + return new Vector3( lhs.Y * rhs.Z - rhs.Y * lhs.Z, lhs.Z * rhs.X - rhs.Z * lhs.X, lhs.X * rhs.Y - rhs.X * lhs.Y); @@ -958,20 +958,20 @@ namespace OpenMetaverse #endregion Operators /// An LLVector3 with a value of 0,0,0 - public readonly static LLVector3 Zero = new LLVector3(); + public readonly static Vector3 Zero = new Vector3(); /// A unit vector facing up (Z axis) - public readonly static LLVector3 Up = new LLVector3(0f, 0f, 1f); + public readonly static Vector3 Up = new Vector3(0f, 0f, 1f); /// A unit vector facing forward (X axis) - public readonly static LLVector3 Fwd = new LLVector3(1f, 0f, 0f); + public readonly static Vector3 Fwd = new Vector3(1f, 0f, 0f); /// A unit vector facing left (Y axis) - public readonly static LLVector3 Left = new LLVector3(0f, 1f, 0f); + public readonly static Vector3 Left = new Vector3(0f, 1f, 0f); } /// /// A double-precision three-dimensional vector /// [Serializable] - public struct LLVector3d + public struct Vector3d { /// X value public double X; @@ -991,7 +991,7 @@ namespace OpenMetaverse /// /// /// - public LLVector3d(double x, double y, double z) + public Vector3d(double x, double y, double z) { conversionBuffer = null; X = x; @@ -1003,7 +1003,7 @@ namespace OpenMetaverse /// Create a double precision vector from a float vector /// /// - public LLVector3d(LLVector3 llv3) + public Vector3d(Vector3 llv3) { conversionBuffer = null; X = llv3.X; @@ -1016,7 +1016,7 @@ namespace OpenMetaverse /// /// /// - public LLVector3d(byte[] byteArray, int pos) + public Vector3d(byte[] byteArray, int pos) { conversionBuffer = null; X = Y = Z = 0; @@ -1027,7 +1027,7 @@ namespace OpenMetaverse /// Copy constructor /// /// Vector to copy - public LLVector3d(LLVector3d vector) + public Vector3d(Vector3d vector) { conversionBuffer = null; X = vector.X; @@ -1118,7 +1118,7 @@ namespace OpenMetaverse } } - this = LLVector3d.Zero; + this = Vector3d.Zero; } #endregion Public Methods @@ -1128,7 +1128,7 @@ namespace OpenMetaverse /// /// Calculates the distance between two vectors /// - public static double Dist(LLVector3d pointA, LLVector3d pointB) + public static double Dist(Vector3d pointA, Vector3d pointB) { double xd = pointB.X - pointA.X; double yd = pointB.Y - pointA.Y; @@ -1141,17 +1141,17 @@ namespace OpenMetaverse /// /// A string representation of a 3D vector, enclosed /// in arrow brackets and separated by commas - public static LLVector3d Parse(string val) + public static Vector3d Parse(string val) { char[] splitChar = { ',' }; string[] split = val.Replace("<", String.Empty).Replace(">", String.Empty).Split(splitChar); - return new LLVector3d( + return new Vector3d( double.Parse(split[0].Trim(), Helpers.EnUsCulture), double.Parse(split[1].Trim(), Helpers.EnUsCulture), double.Parse(split[2].Trim(), Helpers.EnUsCulture)); } - public static bool TryParse(string val, out LLVector3d result) + public static bool TryParse(string val, out Vector3d result) { try { @@ -1160,7 +1160,7 @@ namespace OpenMetaverse } catch (Exception) { - result = new LLVector3d(); + result = new Vector3d(); return false; } } @@ -1185,9 +1185,9 @@ namespace OpenMetaverse /// public override bool Equals(object o) { - if (!(o is LLVector3d)) return false; + if (!(o is Vector3d)) return false; - LLVector3d vector = (LLVector3d)o; + Vector3d vector = (Vector3d)o; return (X == vector.X && Y == vector.Y && Z == vector.Z); } @@ -1205,59 +1205,59 @@ namespace OpenMetaverse #region Operators - public static bool operator ==(LLVector3d lhs, LLVector3d rhs) + public static bool operator ==(Vector3d lhs, Vector3d rhs) { return (lhs.X == rhs.X && lhs.Y == rhs.Y && lhs.Z == rhs.Z); } - public static bool operator !=(LLVector3d lhs, LLVector3d rhs) + public static bool operator !=(Vector3d lhs, Vector3d rhs) { return !(lhs == rhs); } - public static LLVector3d operator +(LLVector3d lhs, LLVector3d rhs) + public static Vector3d operator +(Vector3d lhs, Vector3d rhs) { - return new LLVector3d(lhs.X + rhs.X, lhs.Y + rhs.Y, lhs.Z + rhs.Z); + return new Vector3d(lhs.X + rhs.X, lhs.Y + rhs.Y, lhs.Z + rhs.Z); } - public static LLVector3d operator -(LLVector3d vec) + public static Vector3d operator -(Vector3d vec) { - return new LLVector3d(-vec.X, -vec.Y, -vec.Z); + return new Vector3d(-vec.X, -vec.Y, -vec.Z); } - public static LLVector3d operator -(LLVector3d lhs, LLVector3d rhs) + public static Vector3d operator -(Vector3d lhs, Vector3d rhs) { - return new LLVector3d(lhs.X - rhs.X, lhs.Y - rhs.Y, lhs.Z - rhs.Z); + return new Vector3d(lhs.X - rhs.X, lhs.Y - rhs.Y, lhs.Z - rhs.Z); } - public static LLVector3d operator *(LLVector3d vec, float val) + public static Vector3d operator *(Vector3d vec, float val) { - return new LLVector3d(vec.X * val, vec.Y * val, vec.Z * val); + return new Vector3d(vec.X * val, vec.Y * val, vec.Z * val); } - public static LLVector3d operator *(double val, LLVector3d vec) + public static Vector3d operator *(double val, Vector3d vec) { - return new LLVector3d(vec.X * val, vec.Y * val, vec.Z * val); + return new Vector3d(vec.X * val, vec.Y * val, vec.Z * val); } - public static LLVector3d operator *(LLVector3d lhs, LLVector3d rhs) + public static Vector3d operator *(Vector3d lhs, Vector3d rhs) { - return new LLVector3d(lhs.X * rhs.X, lhs.Y * rhs.Y, lhs.Z * rhs.Z); + return new Vector3d(lhs.X * rhs.X, lhs.Y * rhs.Y, lhs.Z * rhs.Z); } - public static LLVector3d operator /(LLVector3d lhs, LLVector3d rhs) + public static Vector3d operator /(Vector3d lhs, Vector3d rhs) { - return new LLVector3d(lhs.X / rhs.X, lhs.Y / rhs.Y, lhs.Z / rhs.Z); + return new Vector3d(lhs.X / rhs.X, lhs.Y / rhs.Y, lhs.Z / rhs.Z); } - public static LLVector3d operator /(LLVector3d vec, double val) + public static Vector3d operator /(Vector3d vec, double val) { - return new LLVector3d(vec.X / val, vec.Y / val, vec.Z / val); + return new Vector3d(vec.X / val, vec.Y / val, vec.Z / val); } - public static LLVector3d operator %(LLVector3d lhs, LLVector3d rhs) + public static Vector3d operator %(Vector3d lhs, Vector3d rhs) { - return new LLVector3d( + return new Vector3d( lhs.Y * rhs.Z - rhs.Y * lhs.Z, lhs.Z * rhs.X - rhs.Z * lhs.X, lhs.X * rhs.Y - rhs.X * lhs.Y); @@ -1266,14 +1266,14 @@ namespace OpenMetaverse #endregion Operators /// An LLVector3d with a value of 0,0,0 - public static readonly LLVector3d Zero = new LLVector3d(); + public static readonly Vector3d Zero = new Vector3d(); } /// /// A four-dimensional vector /// [Serializable] - public struct LLVector4 + public struct Vector4 { /// public float X; @@ -1296,7 +1296,7 @@ namespace OpenMetaverse /// Y value /// Z value /// S value - public LLVector4(float x, float y, float z, float s) + public Vector4(float x, float y, float z, float s) { conversionBuffer = null; X = x; @@ -1310,7 +1310,7 @@ namespace OpenMetaverse /// /// /// - public LLVector4(byte[] byteArray, int pos) + public Vector4(byte[] byteArray, int pos) { conversionBuffer = null; X = Y = Z = S = 0; @@ -1321,7 +1321,7 @@ namespace OpenMetaverse /// Copy constructor /// /// Vector to copy - public LLVector4(LLVector4 vector) + public Vector4(Vector4 vector) { conversionBuffer = null; X = vector.X; @@ -1420,25 +1420,25 @@ namespace OpenMetaverse } } - this = LLVector4.Zero; + this = Vector4.Zero; } #endregion Public Methods #region Static Methods - public static LLVector4 Parse(string val) + public static Vector4 Parse(string val) { char[] splitChar = { ',' }; string[] split = val.Replace("<", String.Empty).Replace(">", String.Empty).Split(splitChar); - return new LLVector4( + return new Vector4( float.Parse(split[0].Trim(), Helpers.EnUsCulture), float.Parse(split[1].Trim(), Helpers.EnUsCulture), float.Parse(split[2].Trim(), Helpers.EnUsCulture), float.Parse(split[3].Trim(), Helpers.EnUsCulture)); } - public static bool TryParse(string val, out LLVector4 result) + public static bool TryParse(string val, out Vector4 result) { try { @@ -1447,7 +1447,7 @@ namespace OpenMetaverse } catch (Exception) { - result = new LLVector4(); + result = new Vector4(); return false; } } @@ -1471,9 +1471,9 @@ namespace OpenMetaverse /// public override bool Equals(object o) { - if (!(o is LLVector4)) return false; + if (!(o is Vector4)) return false; - LLVector4 vector = (LLVector4)o; + Vector4 vector = (Vector4)o; return (X == vector.X && Y == vector.Y && Z == vector.Z && S == vector.S); } /// @@ -1489,67 +1489,67 @@ namespace OpenMetaverse #region Operators - public static bool operator ==(LLVector4 lhs, LLVector4 rhs) + public static bool operator ==(Vector4 lhs, Vector4 rhs) { return (lhs.X == rhs.X && lhs.Y == rhs.Y && lhs.Z == rhs.Z && lhs.S == rhs.S); } - public static bool operator !=(LLVector4 lhs, LLVector4 rhs) + public static bool operator !=(Vector4 lhs, Vector4 rhs) { return !(lhs == rhs); } - public static LLVector4 operator +(LLVector4 lhs, LLVector4 rhs) + public static Vector4 operator +(Vector4 lhs, Vector4 rhs) { - return new LLVector4(lhs.X + rhs.X, lhs.Y + rhs.Y, lhs.Z + rhs.Z, lhs.S + rhs.S); + return new Vector4(lhs.X + rhs.X, lhs.Y + rhs.Y, lhs.Z + rhs.Z, lhs.S + rhs.S); } - public static LLVector4 operator -(LLVector4 vec) + public static Vector4 operator -(Vector4 vec) { - return new LLVector4(-vec.X, -vec.Y, -vec.Z, -vec.S); + return new Vector4(-vec.X, -vec.Y, -vec.Z, -vec.S); } - public static LLVector4 operator -(LLVector4 lhs, LLVector4 rhs) + public static Vector4 operator -(Vector4 lhs, Vector4 rhs) { - return new LLVector4(lhs.X - rhs.X, lhs.Y - rhs.Y, lhs.Z - rhs.Z, lhs.S - rhs.S); + return new Vector4(lhs.X - rhs.X, lhs.Y - rhs.Y, lhs.Z - rhs.Z, lhs.S - rhs.S); } - public static LLVector4 operator *(LLVector4 vec, float val) + public static Vector4 operator *(Vector4 vec, float val) { - return new LLVector4(vec.X * val, vec.Y * val, vec.Z * val, vec.S * val); + return new Vector4(vec.X * val, vec.Y * val, vec.Z * val, vec.S * val); } - public static LLVector4 operator *(float val, LLVector4 vec) + public static Vector4 operator *(float val, Vector4 vec) { - return new LLVector4(vec.X * val, vec.Y * val, vec.Z * val, vec.S * val); + return new Vector4(vec.X * val, vec.Y * val, vec.Z * val, vec.S * val); } - public static LLVector4 operator *(LLVector4 lhs, LLVector4 rhs) + public static Vector4 operator *(Vector4 lhs, Vector4 rhs) { - return new LLVector4(lhs.X * rhs.X, lhs.Y * rhs.Y, lhs.Z * rhs.Z, lhs.S * rhs.S); + return new Vector4(lhs.X * rhs.X, lhs.Y * rhs.Y, lhs.Z * rhs.Z, lhs.S * rhs.S); } - public static LLVector4 operator /(LLVector4 lhs, LLVector4 rhs) + public static Vector4 operator /(Vector4 lhs, Vector4 rhs) { - return new LLVector4(lhs.X / rhs.X, lhs.Y / rhs.Y, lhs.Z / rhs.Z, lhs.S / rhs.S); + return new Vector4(lhs.X / rhs.X, lhs.Y / rhs.Y, lhs.Z / rhs.Z, lhs.S / rhs.S); } - public static LLVector4 operator /(LLVector4 vec, float val) + public static Vector4 operator /(Vector4 vec, float val) { - return new LLVector4(vec.X / val, vec.Y / val, vec.Z / val, vec.S / val); + return new Vector4(vec.X / val, vec.Y / val, vec.Z / val, vec.S / val); } #endregion Operators /// An LLVector4 with a value of 0,0,0,0 - public readonly static LLVector4 Zero = new LLVector4(); + public readonly static Vector4 Zero = new Vector4(); } /// /// An 8-bit color structure including an alpha channel /// [Serializable] - public struct LLColor + public struct Color4 { /// Red public float R; @@ -1569,7 +1569,7 @@ namespace OpenMetaverse /// /// /// - public LLColor(byte r, byte g, byte b, byte a) + public Color4(byte r, byte g, byte b, byte a) { const float quanta = 1.0f / 255.0f; @@ -1579,7 +1579,7 @@ namespace OpenMetaverse A = (float)a * quanta; } - public LLColor(float r, float g, float b, float a) + public Color4(float r, float g, float b, float a) { if (r > 1f || g > 1f || b > 1f || a > 1f) Logger.Log( @@ -1593,13 +1593,13 @@ namespace OpenMetaverse A = Helpers.Clamp(a, 0f, 1f); } - public LLColor(byte[] byteArray, int pos, bool inverted) + public Color4(byte[] byteArray, int pos, bool inverted) { R = G = B = A = 0f; FromBytes(byteArray, pos, inverted); } - public LLColor(byte[] byteArray, int pos, bool inverted, bool alphaInverted) + public Color4(byte[] byteArray, int pos, bool inverted, bool alphaInverted) { R = G = B = A = 0f; FromBytes(byteArray, pos, inverted, alphaInverted); @@ -1609,7 +1609,7 @@ namespace OpenMetaverse /// Copy constructor /// /// Color to copy - public LLColor(LLColor color) + public Color4(Color4 color) { R = color.R; G = color.G; @@ -1719,7 +1719,7 @@ namespace OpenMetaverse } } - this = LLColor.Black; + this = Color4.Black; } /// @@ -1755,9 +1755,9 @@ namespace OpenMetaverse /// public override bool Equals(object obj) { - if (obj is LLColor) + if (obj is Color4) { - LLColor c = (LLColor)obj; + Color4 c = (Color4)obj; return (R == c.R) && (G == c.G) && (B == c.B) && (A == c.A); } return false; @@ -1782,7 +1782,7 @@ namespace OpenMetaverse /// /// /// - public static bool operator ==(LLColor lhs, LLColor rhs) + public static bool operator ==(Color4 lhs, Color4 rhs) { // Return true if the fields match: return lhs.R == rhs.R && lhs.G == rhs.G && lhs.B == rhs.B && lhs.A == rhs.A; @@ -1794,7 +1794,7 @@ namespace OpenMetaverse /// /// /// - public static bool operator !=(LLColor lhs, LLColor rhs) + public static bool operator !=(Color4 lhs, Color4 rhs) { return !(lhs == rhs); } @@ -1802,14 +1802,14 @@ namespace OpenMetaverse #endregion Operators /// An LLColor with zero RGB values and full alpha - public readonly static LLColor Black = new LLColor(0f, 0f, 0f, 1f); + public readonly static Color4 Black = new Color4(0f, 0f, 0f, 1f); } /// /// A quaternion, used for rotations /// [Serializable] - public struct LLQuaternion + public struct Quaternion { /// X value public float X; @@ -1828,11 +1828,11 @@ namespace OpenMetaverse /// /// Returns the conjugate (spatial inverse) of this quaternion /// - public LLQuaternion Conjugate + public Quaternion Conjugate { get { - return new LLQuaternion(-this.X, -this.Y, -this.Z, this.W); + return new Quaternion(-this.X, -this.Y, -this.Z, this.W); } } @@ -1848,7 +1848,7 @@ namespace OpenMetaverse /// Whether the source data is normalized or /// not. If this is true 12 bytes will be read, otherwise 16 bytes will /// be read. - public LLQuaternion(byte[] byteArray, int pos, bool normalized) + public Quaternion(byte[] byteArray, int pos, bool normalized) { conversionBuffer = null; X = Y = Z = W = 0; @@ -1861,7 +1861,7 @@ namespace OpenMetaverse /// X value from -1.0 to 1.0 /// Y value from -1.0 to 1.0 /// Z value from -1.0 to 1.0 - public LLQuaternion(float x, float y, float z) + public Quaternion(float x, float y, float z) { conversionBuffer = null; X = x; @@ -1879,7 +1879,7 @@ namespace OpenMetaverse /// Y value /// Z value /// W value - public LLQuaternion(float x, float y, float z, float w) + public Quaternion(float x, float y, float z, float w) { conversionBuffer = null; X = x; @@ -1893,7 +1893,7 @@ namespace OpenMetaverse /// /// Angle value /// Vector value - public LLQuaternion(float angle, LLVector3 vec) + public Quaternion(float angle, Vector3 vec) { conversionBuffer = null; X = Y = Z = W = 0f; @@ -1904,7 +1904,7 @@ namespace OpenMetaverse /// Copy constructor /// /// Quaternion to copy - public LLQuaternion(LLQuaternion quaternion) + public Quaternion(Quaternion quaternion) { conversionBuffer = null; X = quaternion.X; @@ -2056,7 +2056,7 @@ namespace OpenMetaverse } } - this = LLQuaternion.Identity; + this = Quaternion.Identity; } //FIXME: Need comprehensive testing for this @@ -2073,9 +2073,9 @@ namespace OpenMetaverse /// matrix if the quaternion is inverse /// /// A matrix representation of this quaternion - public LLMatrix3 ToMatrix() + public Matrix3 ToMatrix() { - LLMatrix3 m; + Matrix3 m; float xx, xy, xz, xw, yy, yz, yw, zz, zw; xx = X * X; @@ -2107,13 +2107,13 @@ namespace OpenMetaverse public void SetQuaternion(float angle, float x, float y, float z) { - LLVector3 vec = new LLVector3(x, y, z); + Vector3 vec = new Vector3(x, y, z); SetQuaternion(angle, vec); } - public void SetQuaternion(float angle, LLVector3 vec) + public void SetQuaternion(float angle, Vector3 vec) { - vec = LLVector3.Norm(vec); + vec = Vector3.Norm(vec); angle *= 0.5f; float c = (float)Math.Cos(angle); @@ -2124,7 +2124,7 @@ namespace OpenMetaverse Z = vec.Z * s; W = c; - this = LLQuaternion.Norm(this); + this = Quaternion.Norm(this); } #endregion Public Methods @@ -2136,7 +2136,7 @@ namespace OpenMetaverse /// /// Vector representation of the euler angle /// Quaternion representation of Euler angle - public static LLQuaternion FromEuler(LLVector3 euler) + public static Quaternion FromEuler(Vector3 euler) { double atCos = Math.Cos(euler.X / 2); double atSin = Math.Sin(euler.X / 2); @@ -2146,7 +2146,7 @@ namespace OpenMetaverse double upSin = Math.Sin(euler.Z / 2); double atLeftCos = atCos * leftCos; double atLeftSin = atSin * leftSin; - return new LLQuaternion( + return new Quaternion( (float)(atSin * leftCos * upCos + atCos * leftSin * upSin), (float)(atCos * leftSin * upCos - atSin * leftCos * upSin), (float)(atLeftCos * upSin + atLeftSin * upCos), @@ -2157,7 +2157,7 @@ namespace OpenMetaverse /// /// Calculate the magnitude of the supplied quaternion /// - public static float Mag(LLQuaternion q) + public static float Mag(Quaternion q) { return (float)Math.Sqrt(q.W * q.W + q.X * q.X + q.Y * q.Y + q.Z * q.Z); } @@ -2167,7 +2167,7 @@ namespace OpenMetaverse /// /// The quaternion to normalize /// A normalized version of the quaternion - public static LLQuaternion Norm(LLQuaternion q) + public static Quaternion Norm(Quaternion q) { const float MAG_THRESHOLD = 0.0000001f; float mag = (float)Math.Sqrt(q.X * q.X + q.Y * q.Y + q.Z * q.Z + q.W * q.W); @@ -2191,20 +2191,20 @@ namespace OpenMetaverse return q; } - public static LLQuaternion Parse(string val) + public static Quaternion Parse(string val) { char[] splitChar = { ',' }; string[] split = val.Replace("<", String.Empty).Replace(">", String.Empty).Split(splitChar); if (split.Length == 3) { - return new LLQuaternion( + return new Quaternion( float.Parse(split[0].Trim(), Helpers.EnUsCulture), float.Parse(split[1].Trim(), Helpers.EnUsCulture), float.Parse(split[2].Trim(), Helpers.EnUsCulture)); } else { - return new LLQuaternion( + return new Quaternion( float.Parse(split[0].Trim(), Helpers.EnUsCulture), float.Parse(split[1].Trim(), Helpers.EnUsCulture), float.Parse(split[2].Trim(), Helpers.EnUsCulture), @@ -2212,7 +2212,7 @@ namespace OpenMetaverse } } - public static bool TryParse(string val, out LLQuaternion result) + public static bool TryParse(string val, out Quaternion result) { try { @@ -2221,7 +2221,7 @@ namespace OpenMetaverse } catch (Exception) { - result = new LLQuaternion(); + result = new Quaternion(); return false; } } @@ -2246,9 +2246,9 @@ namespace OpenMetaverse /// public override bool Equals(object o) { - if (!(o is LLQuaternion)) return false; + if (!(o is Quaternion)) return false; - LLQuaternion quaternion = (LLQuaternion)o; + Quaternion quaternion = (Quaternion)o; return X == quaternion.X && Y == quaternion.Y && Z == quaternion.Z && W == quaternion.W; } @@ -2266,13 +2266,13 @@ namespace OpenMetaverse #region Operators - public static bool operator ==(LLQuaternion lhs, LLQuaternion rhs) + public static bool operator ==(Quaternion lhs, Quaternion rhs) { // Return true if the fields match: return lhs.X == rhs.X && lhs.Y == rhs.Y && lhs.Z == rhs.Z && lhs.W == rhs.W; } - public static bool operator !=(LLQuaternion lhs, LLQuaternion rhs) + public static bool operator !=(Quaternion lhs, Quaternion rhs) { return !(lhs == rhs); } @@ -2283,9 +2283,9 @@ namespace OpenMetaverse /// /// /// - public static LLQuaternion operator *(LLQuaternion lhs, LLQuaternion rhs) + public static Quaternion operator *(Quaternion lhs, Quaternion rhs) { - LLQuaternion ret = new LLQuaternion( + Quaternion ret = new Quaternion( (lhs.W * rhs.X) + (lhs.X * rhs.W) + (lhs.Y * rhs.Z) - (lhs.Z * rhs.Y), (lhs.W * rhs.Y) - (lhs.X * rhs.Z) + (lhs.Y * rhs.W) + (lhs.Z * rhs.X), (lhs.W * rhs.Z) + (lhs.X * rhs.Y) - (lhs.Y * rhs.X) + (lhs.Z * rhs.W), @@ -2301,7 +2301,7 @@ namespace OpenMetaverse /// /// /// - public static LLQuaternion operator /(LLQuaternion lhs, LLQuaternion rhs) + public static Quaternion operator /(Quaternion lhs, Quaternion rhs) { return lhs * rhs.Conjugate; } @@ -2309,14 +2309,14 @@ namespace OpenMetaverse #endregion Operators /// An LLQuaternion with a value of 0,0,0,1 - public readonly static LLQuaternion Identity = new LLQuaternion(0f, 0f, 0f, 1f); + public readonly static Quaternion Identity = new Quaternion(0f, 0f, 0f, 1f); } /// /// A 3x3 matrix /// [Serializable] - public struct LLMatrix3 + public struct Matrix3 { public float M11, M12, M13; public float M21, M22, M23; @@ -2345,7 +2345,7 @@ namespace OpenMetaverse #region Constructors - public LLMatrix3(float m11, float m12, float m13, float m21, float m22, float m23, float m31, float m32, float m33) + public Matrix3(float m11, float m12, float m13, float m21, float m22, float m23, float m31, float m32, float m33) { M11 = m11; M12 = m12; @@ -2358,7 +2358,7 @@ namespace OpenMetaverse M33 = m33; } - public LLMatrix3(LLQuaternion q) + public Matrix3(Quaternion q) { this = q.ToMatrix(); } @@ -2374,7 +2374,7 @@ namespace OpenMetaverse /// Copy constructor /// /// Matrix to copy - public LLMatrix3(LLMatrix3 m) + public Matrix3(Matrix3 m) { M11 = m.M11; M12 = m.M12; @@ -2458,9 +2458,9 @@ namespace OpenMetaverse yaw = (float)angleZ; } - public LLQuaternion ToQuaternion() + public Quaternion ToQuaternion() { - LLQuaternion quat = new LLQuaternion(); + Quaternion quat = new Quaternion(); float tr, s; float[] q = new float[4]; int i, j, k; @@ -2514,45 +2514,45 @@ namespace OpenMetaverse #region Static Methods - public static LLMatrix3 Add(LLMatrix3 left, LLMatrix3 right) + public static Matrix3 Add(Matrix3 left, Matrix3 right) { - return new LLMatrix3( + return new Matrix3( left.M11 + right.M11, left.M12 + right.M12, left.M13 + right.M13, left.M21 + right.M21, left.M22 + right.M22, left.M23 + right.M23, left.M31 + right.M31, left.M32 + right.M32, left.M33 + right.M33 ); } - public static LLMatrix3 Add(LLMatrix3 matrix, float scalar) + public static Matrix3 Add(Matrix3 matrix, float scalar) { - return new LLMatrix3( + return new Matrix3( matrix.M11 + scalar, matrix.M12 + scalar, matrix.M13 + scalar, matrix.M21 + scalar, matrix.M22 + scalar, matrix.M23 + scalar, matrix.M31 + scalar, matrix.M32 + scalar, matrix.M33 + scalar ); } - public static LLMatrix3 Subtract(LLMatrix3 left, LLMatrix3 right) + public static Matrix3 Subtract(Matrix3 left, Matrix3 right) { - return new LLMatrix3( + return new Matrix3( left.M11 - right.M11, left.M12 - right.M12, left.M13 - right.M13, left.M21 - right.M21, left.M22 - right.M22, left.M23 - right.M23, left.M31 - right.M31, left.M32 - right.M32, left.M33 - right.M33 ); } - public static LLMatrix3 Subtract(LLMatrix3 matrix, float scalar) + public static Matrix3 Subtract(Matrix3 matrix, float scalar) { - return new LLMatrix3( + return new Matrix3( matrix.M11 - scalar, matrix.M12 - scalar, matrix.M13 - scalar, matrix.M21 - scalar, matrix.M22 - scalar, matrix.M23 - scalar, matrix.M31 - scalar, matrix.M32 - scalar, matrix.M33 - scalar ); } - public static LLMatrix3 Multiply(LLMatrix3 left, LLMatrix3 right) + public static Matrix3 Multiply(Matrix3 left, Matrix3 right) { - return new LLMatrix3( + return new Matrix3( left.M11 * right.M11 + left.M12 * right.M21 + left.M13 * right.M31, left.M11 * right.M12 + left.M12 * right.M22 + left.M13 * right.M32, left.M11 * right.M13 + left.M12 * right.M23 + left.M13 * right.M33, @@ -2572,7 +2572,7 @@ namespace OpenMetaverse /// /// Matrix to transpose /// Transposed matrix - public static LLMatrix3 Transpose(LLMatrix3 m) + public static Matrix3 Transpose(Matrix3 m) { Helpers.Swap(ref m.M12, ref m.M21); Helpers.Swap(ref m.M13, ref m.M31); @@ -2581,16 +2581,16 @@ namespace OpenMetaverse return m; } - public static LLMatrix3 Orthogonalize(LLMatrix3 m) + public static Matrix3 Orthogonalize(Matrix3 m) { - LLVector3 xAxis = m[0]; - LLVector3 yAxis = m[1]; - LLVector3 zAxis = m[2]; + Vector3 xAxis = m[0]; + Vector3 yAxis = m[1]; + Vector3 zAxis = m[2]; - xAxis = LLVector3.Norm(xAxis); + xAxis = Vector3.Norm(xAxis); yAxis -= xAxis * (xAxis * yAxis); - yAxis = LLVector3.Norm(yAxis); - zAxis = LLVector3.Cross(xAxis, yAxis); + yAxis = Vector3.Norm(yAxis); + zAxis = Vector3.Cross(xAxis, yAxis); m[0] = xAxis; m[1] = yAxis; @@ -2613,9 +2613,9 @@ namespace OpenMetaverse public override bool Equals(object obj) { - if (obj is LLMatrix3) + if (obj is Matrix3) { - LLMatrix3 m = (LLMatrix3)obj; + Matrix3 m = (Matrix3)obj; return (M11 == m.M11) && (M12 == m.M12) && (M13 == m.M13) && (M21 == m.M21) && (M22 == m.M22) && (M23 == m.M23) && @@ -2634,58 +2634,58 @@ namespace OpenMetaverse #region Operators - public static bool operator ==(LLMatrix3 left, LLMatrix3 right) + public static bool operator ==(Matrix3 left, Matrix3 right) { return ValueType.Equals(left, right); } - public static bool operator !=(LLMatrix3 left, LLMatrix3 right) + public static bool operator !=(Matrix3 left, Matrix3 right) { return !ValueType.Equals(left, right); } - public static LLMatrix3 operator +(LLMatrix3 left, LLMatrix3 right) + public static Matrix3 operator +(Matrix3 left, Matrix3 right) { - return LLMatrix3.Add(left, right); + return Matrix3.Add(left, right); } - public static LLMatrix3 operator +(LLMatrix3 matrix, float scalar) + public static Matrix3 operator +(Matrix3 matrix, float scalar) { - return LLMatrix3.Add(matrix, scalar); + return Matrix3.Add(matrix, scalar); } - public static LLMatrix3 operator +(float scalar, LLMatrix3 matrix) + public static Matrix3 operator +(float scalar, Matrix3 matrix) { - return LLMatrix3.Add(matrix, scalar); + return Matrix3.Add(matrix, scalar); } - public static LLMatrix3 operator -(LLMatrix3 left, LLMatrix3 right) + public static Matrix3 operator -(Matrix3 left, Matrix3 right) { - return LLMatrix3.Subtract(left, right); ; + return Matrix3.Subtract(left, right); ; } - public static LLMatrix3 operator -(LLMatrix3 matrix, float scalar) + public static Matrix3 operator -(Matrix3 matrix, float scalar) { - return LLMatrix3.Subtract(matrix, scalar); + return Matrix3.Subtract(matrix, scalar); } - public static LLMatrix3 operator *(LLMatrix3 left, LLMatrix3 right) + public static Matrix3 operator *(Matrix3 left, Matrix3 right) { - return LLMatrix3.Multiply(left, right); ; + return Matrix3.Multiply(left, right); ; } - public LLVector3 this[int row] + public Vector3 this[int row] { get { switch (row) { case 0: - return new LLVector3(M11, M12, M13); + return new Vector3(M11, M12, M13); case 1: - return new LLVector3(M21, M22, M23); + return new Vector3(M21, M22, M23); case 2: - return new LLVector3(M31, M32, M33); + return new Vector3(M31, M32, M33); default: throw new IndexOutOfRangeException("LLMatrix3 row index must be from 0-2"); } @@ -2771,9 +2771,9 @@ namespace OpenMetaverse #endregion Operators /// A 3x3 matrix set to all zeroes - public static readonly LLMatrix3 Zero = new LLMatrix3(); + public static readonly Matrix3 Zero = new Matrix3(); /// A 3x3 identity matrix - public static readonly LLMatrix3 Identity = new LLMatrix3( + public static readonly Matrix3 Identity = new Matrix3( 1f, 0f, 0f, 0f, 1f, 0f, 0f, 0f, 1f diff --git a/OpenMetaverse/Voice/VoiceDefinitions.cs b/OpenMetaverse/Voice/VoiceDefinitions.cs index 91baa5de..bf5e184a 100644 --- a/OpenMetaverse/Voice/VoiceDefinitions.cs +++ b/OpenMetaverse/Voice/VoiceDefinitions.cs @@ -347,15 +347,15 @@ namespace OpenMetaverse.Voice public class VoicePosition { /// Positional vector of the users position - public LLVector3d Position; + public Vector3d Position; /// Velocity vector of the position - public LLVector3d Velocity; + public Vector3d Velocity; /// At Orientation (X axis) of the position - public LLVector3d AtOrientation; + public Vector3d AtOrientation; /// Up Orientation (Y axis) of the position - public LLVector3d UpOrientation; + public Vector3d UpOrientation; /// Left Orientation (Z axis) of the position - public LLVector3d LeftOrientation; + public Vector3d LeftOrientation; } #endregion XML Serialization Classes diff --git a/OpenMetaverse/_Packets_.cs b/OpenMetaverse/_Packets_.cs index 80750649..a973c250 100644 --- a/OpenMetaverse/_Packets_.cs +++ b/OpenMetaverse/_Packets_.cs @@ -2241,8 +2241,8 @@ namespace OpenMetaverse.Packets public class CircuitCodeBlock { public uint Code; - public LLUUID SessionID; - public LLUUID ID; + public UUID SessionID; + public UUID ID; public int Length { @@ -2368,7 +2368,7 @@ namespace OpenMetaverse.Packets /// public class TelehubBlockBlock { - public LLUUID ObjectID; + public UUID ObjectID; private byte[] _objectname; public byte[] ObjectName { @@ -2380,8 +2380,8 @@ namespace OpenMetaverse.Packets else { _objectname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _objectname, 0, value.Length); } } } - public LLVector3 TelehubPos; - public LLQuaternion TelehubRot; + public Vector3 TelehubPos; + public Quaternion TelehubRot; public int Length { @@ -2443,7 +2443,7 @@ namespace OpenMetaverse.Packets /// public class SpawnPointBlockBlock { - public LLVector3 SpawnPointPos; + public Vector3 SpawnPointPos; public int Length { @@ -2883,9 +2883,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID QueryID; + public UUID AgentID; + public UUID SessionID; + public UUID QueryID; public int Length { @@ -3076,8 +3076,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID QueryID; + public UUID AgentID; + public UUID QueryID; public int Length { @@ -3125,7 +3125,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID AvatarID; + public UUID AvatarID; private byte[] _firstname; public byte[] FirstName { @@ -3307,9 +3307,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID QueryID; + public UUID AgentID; + public UUID SessionID; + public UUID QueryID; public int Length { @@ -3360,7 +3360,7 @@ namespace OpenMetaverse.Packets /// public class TransactionDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -3582,8 +3582,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID QueryID; + public UUID AgentID; + public UUID QueryID; public int Length { @@ -3631,7 +3631,7 @@ namespace OpenMetaverse.Packets /// public class TransactionDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -3676,7 +3676,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID OwnerID; + public UUID OwnerID; private byte[] _name; public byte[] Name { @@ -3716,7 +3716,7 @@ namespace OpenMetaverse.Packets else { _simname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _simname, 0, value.Length); } } } - public LLUUID SnapshotID; + public UUID SnapshotID; public float Dwell; public int Price; @@ -3943,8 +3943,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -3992,7 +3992,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; private byte[] _querytext; public byte[] QueryText { @@ -4151,8 +4151,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -4200,7 +4200,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; private byte[] _querytext; public byte[] QueryText { @@ -4383,7 +4383,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -4428,7 +4428,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public int Length { @@ -4473,7 +4473,7 @@ namespace OpenMetaverse.Packets /// public class QueryRepliesBlock { - public LLUUID ParcelID; + public UUID ParcelID; private byte[] _name; public byte[] Name { @@ -4676,7 +4676,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -4721,7 +4721,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public int Length { @@ -4766,7 +4766,7 @@ namespace OpenMetaverse.Packets /// public class QueryRepliesBlock { - public LLUUID AgentID; + public UUID AgentID; private byte[] _firstname; public byte[] FirstName { @@ -4986,7 +4986,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -5031,7 +5031,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public int Length { @@ -5076,7 +5076,7 @@ namespace OpenMetaverse.Packets /// public class QueryRepliesBlock { - public LLUUID OwnerID; + public UUID OwnerID; private byte[] _name; public byte[] Name { @@ -5286,7 +5286,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -5331,7 +5331,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public int Length { @@ -5376,7 +5376,7 @@ namespace OpenMetaverse.Packets /// public class QueryRepliesBlock { - public LLUUID GroupID; + public UUID GroupID; private byte[] _groupname; public byte[] GroupName { @@ -5560,8 +5560,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -5609,7 +5609,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; private byte[] _querytext; public byte[] QueryText { @@ -5775,7 +5775,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -5820,7 +5820,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public int Length { @@ -5865,7 +5865,7 @@ namespace OpenMetaverse.Packets /// public class QueryRepliesBlock { - public LLUUID ClassifiedID; + public UUID ClassifiedID; private byte[] _name; public byte[] Name { @@ -6059,8 +6059,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID TargetID; + public UUID AgentID; + public UUID TargetID; public int Length { @@ -6108,7 +6108,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ClassifiedID; + public UUID ClassifiedID; private byte[] _name; public byte[] Name { @@ -6270,8 +6270,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -6319,7 +6319,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ClassifiedID; + public UUID ClassifiedID; public int Length { @@ -6442,7 +6442,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -6487,8 +6487,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ClassifiedID; - public LLUUID CreatorID; + public UUID ClassifiedID; + public UUID CreatorID; public uint CreationDate; public uint ExpirationDate; public uint Category; @@ -6514,9 +6514,9 @@ namespace OpenMetaverse.Packets else { _desc = new byte[value.Length]; Buffer.BlockCopy(value, 0, _desc, 0, value.Length); } } } - public LLUUID ParcelID; + public UUID ParcelID; public uint ParentEstate; - public LLUUID SnapshotID; + public UUID SnapshotID; private byte[] _simname; public byte[] SimName { @@ -6528,7 +6528,7 @@ namespace OpenMetaverse.Packets else { _simname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _simname, 0, value.Length); } } } - public LLVector3d PosGlobal; + public Vector3d PosGlobal; private byte[] _parcelname; public byte[] ParcelName { @@ -6748,8 +6748,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -6797,7 +6797,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ClassifiedID; + public UUID ClassifiedID; public uint Category; private byte[] _name; public byte[] Name @@ -6821,10 +6821,10 @@ namespace OpenMetaverse.Packets else { _desc = new byte[value.Length]; Buffer.BlockCopy(value, 0, _desc, 0, value.Length); } } } - public LLUUID ParcelID; + public UUID ParcelID; public uint ParentEstate; - public LLUUID SnapshotID; - public LLVector3d PosGlobal; + public UUID SnapshotID; + public Vector3d PosGlobal; public byte ClassifiedFlags; public int PriceForListing; @@ -7000,8 +7000,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -7049,7 +7049,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ClassifiedID; + public UUID ClassifiedID; public int Length { @@ -7172,8 +7172,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -7221,8 +7221,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ClassifiedID; - public LLUUID QueryID; + public UUID ClassifiedID; + public UUID QueryID; public int Length { @@ -7348,8 +7348,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -7397,7 +7397,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public uint QueryFlags; public uint SearchType; public int Price; @@ -7555,7 +7555,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -7600,7 +7600,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public int Length { @@ -7645,7 +7645,7 @@ namespace OpenMetaverse.Packets /// public class QueryRepliesBlock { - public LLUUID ParcelID; + public UUID ParcelID; private byte[] _name; public byte[] Name { @@ -7836,8 +7836,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -7885,7 +7885,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public uint QueryFlags; public int Length @@ -8015,7 +8015,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -8060,7 +8060,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; public int Length { @@ -8105,7 +8105,7 @@ namespace OpenMetaverse.Packets /// public class QueryRepliesBlock { - public LLUUID ParcelID; + public UUID ParcelID; private byte[] _name; public byte[] Name { @@ -8282,8 +8282,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -8331,7 +8331,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ParcelID; + public UUID ParcelID; public int Length { @@ -8454,7 +8454,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -8499,8 +8499,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ParcelID; - public LLUUID OwnerID; + public UUID ParcelID; + public UUID OwnerID; private byte[] _name; public byte[] Name { @@ -8540,7 +8540,7 @@ namespace OpenMetaverse.Packets else { _simname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _simname, 0, value.Length); } } } - public LLUUID SnapshotID; + public UUID SnapshotID; public float Dwell; public int SalePrice; public int AuctionID; @@ -8753,8 +8753,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -8928,7 +8928,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID OwnerID; + public UUID OwnerID; public bool IsGroupOwned; public int Count; public bool OnlineStatus; @@ -9078,8 +9078,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -9127,7 +9127,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -9250,8 +9250,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public int Length { @@ -9299,7 +9299,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID NoticeID; + public UUID NoticeID; public uint Timestamp; private byte[] _fromname; public byte[] FromName @@ -9499,8 +9499,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -9548,7 +9548,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID GroupNoticeID; + public UUID GroupNoticeID; public int Length { @@ -9671,8 +9671,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -9720,9 +9720,9 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLUUID RegionID; - public LLVector3 Position; - public LLVector3 LookAt; + public UUID RegionID; + public Vector3 Position; + public Vector3 LookAt; public int Length { @@ -9851,8 +9851,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -9901,8 +9901,8 @@ namespace OpenMetaverse.Packets public class InfoBlock { public ulong RegionHandle; - public LLVector3 Position; - public LLVector3 LookAt; + public Vector3 Position; + public Vector3 LookAt; public int Length { @@ -10038,10 +10038,10 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLUUID AgentID; + public UUID AgentID; public uint LocationID; - public LLVector3 Position; - public LLVector3 LookAt; + public Vector3 Position; + public Vector3 LookAt; public uint TeleportFlags; public int Length @@ -10177,9 +10177,9 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID LandmarkID; + public UUID AgentID; + public UUID SessionID; + public UUID LandmarkID; public int Length { @@ -10302,7 +10302,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -10494,7 +10494,7 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLUUID AgentID; + public UUID AgentID; public uint LocationID; public uint SimIP; public ushort SimPort; @@ -10675,8 +10675,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -10790,7 +10790,7 @@ namespace OpenMetaverse.Packets /// public class TargetDataBlock { - public LLUUID TargetID; + public UUID TargetID; public int Length { @@ -10937,9 +10937,9 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID LureID; + public UUID AgentID; + public UUID SessionID; + public UUID LureID; public uint TeleportFlags; public int Length @@ -11069,8 +11069,8 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -11310,7 +11310,7 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLUUID AgentID; + public UUID AgentID; private byte[] _reason; public byte[] Reason { @@ -11448,9 +11448,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -11501,7 +11501,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -11642,9 +11642,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -11695,7 +11695,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -11836,8 +11836,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -11957,8 +11957,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint SerialNum; public int Length @@ -12085,8 +12085,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint SerialNum; public int Length @@ -12213,8 +12213,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -12415,8 +12415,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint CircuitCode; public int Length @@ -12618,8 +12618,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint CircuitCode; public int Length @@ -12808,8 +12808,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint CircuitCode; public int Length @@ -13000,10 +13000,10 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint SerialNum; - public LLVector3 Size; + public Vector3 Size; public int Length { @@ -13060,7 +13060,7 @@ namespace OpenMetaverse.Packets /// public class WearableDataBlock { - public LLUUID CacheID; + public UUID CacheID; public byte TextureIndex; public int Length @@ -13343,8 +13343,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -13518,7 +13518,7 @@ namespace OpenMetaverse.Packets /// public class ImageIDBlock { - public LLUUID ID; + public UUID ID; public int Length { @@ -13635,7 +13635,7 @@ namespace OpenMetaverse.Packets /// public class TextureDataBlock { - public LLUUID TextureID; + public UUID TextureID; public int Length { @@ -13752,8 +13752,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public bool AlwaysRun; public int Length @@ -13877,8 +13877,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public bool Force; public int Length @@ -14074,9 +14074,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -14127,7 +14127,7 @@ namespace OpenMetaverse.Packets /// public class SharedDataBlock { - public LLVector3 Offset; + public Vector3 Offset; public uint DuplicateFlags; public int Length @@ -14329,16 +14329,16 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; - public LLVector3 RayStart; - public LLVector3 RayEnd; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; + public Vector3 RayStart; + public Vector3 RayEnd; public bool BypassRaycast; public bool RayEndIsIntersection; public bool CopyCenters; public bool CopyRotates; - public LLUUID RayTargetID; + public UUID RayTargetID; public uint DuplicateFlags; public int Length @@ -14561,8 +14561,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -14611,7 +14611,7 @@ namespace OpenMetaverse.Packets public class ObjectDataBlock { public uint ObjectLocalID; - public LLVector3 Scale; + public Vector3 Scale; public int Length { @@ -14758,8 +14758,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -14808,7 +14808,7 @@ namespace OpenMetaverse.Packets public class ObjectDataBlock { public uint ObjectLocalID; - public LLQuaternion Rotation; + public Quaternion Rotation; public int Length { @@ -14955,8 +14955,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint ObjectLocalID; public bool UsePhysics; public bool IsTemporary; @@ -15099,8 +15099,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -15296,8 +15296,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -15531,8 +15531,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -15728,8 +15728,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -15998,8 +15998,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -16228,8 +16228,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -16278,8 +16278,8 @@ namespace OpenMetaverse.Packets public class HeaderDataBlock { public bool Override; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID OwnerID; + public UUID GroupID; public int Length { @@ -16480,9 +16480,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -16677,10 +16677,10 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; - public LLUUID CategoryID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; + public UUID CategoryID; public int Length { @@ -16889,8 +16889,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -16938,9 +16938,9 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ObjectID; - public LLUUID ItemID; - public LLUUID FolderID; + public UUID ObjectID; + public UUID ItemID; + public UUID FolderID; public int Length { @@ -17069,7 +17069,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public bool Delete; public int Length @@ -17190,8 +17190,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -17449,8 +17449,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -17653,8 +17653,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -17867,8 +17867,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -18081,8 +18081,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -18281,8 +18281,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -18474,8 +18474,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -18667,8 +18667,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public byte AttachmentPoint; public int Length @@ -18721,7 +18721,7 @@ namespace OpenMetaverse.Packets public class ObjectDataBlock { public uint ObjectLocalID; - public LLQuaternion Rotation; + public Quaternion Rotation; public int Length { @@ -18868,8 +18868,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -19061,8 +19061,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -19254,8 +19254,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -19447,8 +19447,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -19640,8 +19640,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -19690,7 +19690,7 @@ namespace OpenMetaverse.Packets public class ObjectDataBlock { public uint LocalID; - public LLVector3 GrabOffset; + public Vector3 GrabOffset; public int Length { @@ -19819,8 +19819,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -19868,9 +19868,9 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; - public LLVector3 GrabOffsetInitial; - public LLVector3 GrabPosition; + public UUID ObjectID; + public Vector3 GrabOffsetInitial; + public Vector3 GrabPosition; public uint TimeSinceLast; public int Length @@ -20006,8 +20006,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -20181,8 +20181,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -20230,7 +20230,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -20353,8 +20353,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -20402,8 +20402,8 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; - public LLQuaternion Rotation; + public UUID ObjectID; + public Quaternion Rotation; public int Length { @@ -20529,8 +20529,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -20578,7 +20578,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -20701,8 +20701,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID RequestID; + public UUID AgentID; + public UUID RequestID; public short VolumeDetail; public int Length @@ -20755,7 +20755,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -20896,8 +20896,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -21188,8 +21188,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -21309,8 +21309,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -21430,8 +21430,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -21746,8 +21746,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -21795,7 +21795,7 @@ namespace OpenMetaverse.Packets /// public class DataBlockBlock { - public LLUUID TargetID; + public UUID TargetID; public uint Flags; public int Length @@ -21925,8 +21925,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -21974,7 +21974,7 @@ namespace OpenMetaverse.Packets /// public class TargetDataBlock { - public LLUUID PreyID; + public UUID PreyID; public int Length { @@ -22097,8 +22097,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint IP; public uint StartTime; public float RunTime; @@ -22673,8 +22673,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -22722,8 +22722,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID TaskID; - public LLUUID ItemID; + public UUID TaskID; + public UUID ItemID; public int Questions; public int Length @@ -22856,8 +22856,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -22907,11 +22907,11 @@ namespace OpenMetaverse.Packets { public byte ReportType; public byte Category; - public LLVector3 Position; + public Vector3 Position; public byte CheckFlags; - public LLUUID ScreenshotID; - public LLUUID ObjectID; - public LLUUID AbuserID; + public UUID ScreenshotID; + public UUID ObjectID; + public UUID AbuserID; private byte[] _abuseregionname; public byte[] AbuseRegionName { @@ -22923,7 +22923,7 @@ namespace OpenMetaverse.Packets else { _abuseregionname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _abuseregionname, 0, value.Length); } } } - public LLUUID AbuseRegionID; + public UUID AbuseRegionID; private byte[] _summary; public byte[] Summary { @@ -23272,7 +23272,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -23461,8 +23461,8 @@ namespace OpenMetaverse.Packets /// public class MeanCollisionBlock { - public LLUUID Victim; - public LLUUID Perp; + public UUID Victim; + public UUID Perp; public uint Time; public float Mag; public byte Type; @@ -23868,12 +23868,12 @@ namespace OpenMetaverse.Packets else { _fromname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _fromname, 0, value.Length); } } } - public LLUUID SourceID; - public LLUUID OwnerID; + public UUID SourceID; + public UUID OwnerID; public byte SourceType; public byte ChatType; public byte Audible; - public LLVector3 Position; + public Vector3 Position; private byte[] _message; public byte[] Message { @@ -24311,8 +24311,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -24432,8 +24432,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -24719,8 +24719,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -25096,19 +25096,19 @@ namespace OpenMetaverse.Packets else { _simname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _simname, 0, value.Length); } } } - public LLUUID SimOwner; + public UUID SimOwner; public bool IsEstateManager; public float WaterHeight; public float BillableFactor; - public LLUUID CacheID; - public LLUUID TerrainBase0; - public LLUUID TerrainBase1; - public LLUUID TerrainBase2; - public LLUUID TerrainBase3; - public LLUUID TerrainDetail0; - public LLUUID TerrainDetail1; - public LLUUID TerrainDetail2; - public LLUUID TerrainDetail3; + public UUID CacheID; + public UUID TerrainBase0; + public UUID TerrainBase1; + public UUID TerrainBase2; + public UUID TerrainBase3; + public UUID TerrainDetail0; + public UUID TerrainDetail1; + public UUID TerrainDetail2; + public UUID TerrainDetail3; public float TerrainStartHeight00; public float TerrainStartHeight01; public float TerrainStartHeight10; @@ -25272,7 +25272,7 @@ namespace OpenMetaverse.Packets /// public class RegionInfo2Block { - public LLUUID RegionID; + public UUID RegionID; public int Length { @@ -25395,8 +25395,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -25573,9 +25573,9 @@ namespace OpenMetaverse.Packets public ulong UsecSinceStart; public uint SecPerDay; public uint SecPerYear; - public LLVector3 SunDirection; + public Vector3 SunDirection; public float SunPhase; - public LLVector3 SunAngVelocity; + public Vector3 SunAngVelocity; public int Length { @@ -25926,7 +25926,7 @@ namespace OpenMetaverse.Packets /// public class TransferInfoBlock { - public LLUUID TransferID; + public UUID TransferID; public int ChannelType; public int SourceType; public float Priority; @@ -26087,7 +26087,7 @@ namespace OpenMetaverse.Packets /// public class TransferInfoBlock { - public LLUUID TransferID; + public UUID TransferID; public int ChannelType; public int TargetType; public int Status; @@ -26254,7 +26254,7 @@ namespace OpenMetaverse.Packets /// public class TransferInfoBlock { - public LLUUID TransferID; + public UUID TransferID; public int ChannelType; public int Length @@ -26393,7 +26393,7 @@ namespace OpenMetaverse.Packets public byte FilePath; public bool DeleteOnCompletion; public bool UseBigPackets; - public LLUUID VFileID; + public UUID VFileID; public short VFileType; public int Length @@ -26676,7 +26676,7 @@ namespace OpenMetaverse.Packets /// public class SenderBlock { - public LLUUID ID; + public UUID ID; public bool IsTrial; public int Length @@ -26935,7 +26935,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -27132,7 +27132,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -27249,7 +27249,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -27366,7 +27366,7 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int DefaultPayPrice; public int Length @@ -27615,8 +27615,8 @@ namespace OpenMetaverse.Packets /// public class UserInfoBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; private byte[] _reason; public byte[] Reason { @@ -27764,7 +27764,7 @@ namespace OpenMetaverse.Packets /// public class UserInfoBlock { - public LLUUID SessionID; + public UUID SessionID; public uint Flags; public int Length @@ -27888,9 +27888,9 @@ namespace OpenMetaverse.Packets /// public class UserInfoBlock { - public LLUUID GodID; - public LLUUID GodSessionID; - public LLUUID AgentID; + public UUID GodID; + public UUID GodSessionID; + public UUID AgentID; public uint KickFlags; private byte[] _reason; public byte[] Reason @@ -28042,8 +28042,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -28091,7 +28091,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID TargetID; + public UUID TargetID; public uint Flags; public int Length @@ -28221,8 +28221,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -28270,7 +28270,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID TargetID; + public UUID TargetID; public uint Flags; public int Length @@ -28400,9 +28400,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID AvatarID; + public UUID AgentID; + public UUID SessionID; + public UUID AvatarID; public int Length { @@ -28525,8 +28525,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID AvatarID; + public UUID AgentID; + public UUID AvatarID; public int Length { @@ -28574,9 +28574,9 @@ namespace OpenMetaverse.Packets /// public class PropertiesDataBlock { - public LLUUID ImageID; - public LLUUID FLImageID; - public LLUUID PartnerID; + public UUID ImageID; + public UUID FLImageID; + public UUID PartnerID; private byte[] _abouttext; public byte[] AboutText { @@ -28815,8 +28815,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID AvatarID; + public UUID AgentID; + public UUID AvatarID; public int Length { @@ -29058,8 +29058,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID AvatarID; + public UUID AgentID; + public UUID AvatarID; public int Length { @@ -29120,7 +29120,7 @@ namespace OpenMetaverse.Packets else { _grouptitle = new byte[value.Length]; Buffer.BlockCopy(value, 0, _grouptitle, 0, value.Length); } } } - public LLUUID GroupID; + public UUID GroupID; private byte[] _groupname; public byte[] GroupName { @@ -29132,7 +29132,7 @@ namespace OpenMetaverse.Packets else { _groupname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _groupname, 0, value.Length); } } } - public LLUUID GroupInsigniaID; + public UUID GroupInsigniaID; public int Length { @@ -29360,8 +29360,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -29409,8 +29409,8 @@ namespace OpenMetaverse.Packets /// public class PropertiesDataBlock { - public LLUUID ImageID; - public LLUUID FLImageID; + public UUID ImageID; + public UUID FLImageID; private byte[] _abouttext; public byte[] AboutText { @@ -29606,8 +29606,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -29849,7 +29849,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -29894,7 +29894,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID TargetID; + public UUID TargetID; private byte[] _notes; public byte[] Notes { @@ -30039,8 +30039,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -30088,7 +30088,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID TargetID; + public UUID TargetID; private byte[] _notes; public byte[] Notes { @@ -30233,8 +30233,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID TargetID; + public UUID AgentID; + public UUID TargetID; public int Length { @@ -30282,7 +30282,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID PickID; + public UUID PickID; private byte[] _pickname; public byte[] PickName { @@ -30444,8 +30444,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -30619,7 +30619,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -30735,7 +30735,7 @@ namespace OpenMetaverse.Packets else { _simname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _simname, 0, value.Length); } } } - public LLVector3d GlobalPos; + public Vector3d GlobalPos; public uint EventFlags; public int Length @@ -30952,8 +30952,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -31127,8 +31127,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -31302,8 +31302,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -31399,7 +31399,7 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; + public UUID QueryID; private byte[] _querytext; public byte[] QueryText { @@ -31564,7 +31564,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -31609,10 +31609,10 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID PickID; - public LLUUID CreatorID; + public UUID PickID; + public UUID CreatorID; public bool TopPick; - public LLUUID ParcelID; + public UUID ParcelID; private byte[] _name; public byte[] Name { @@ -31635,7 +31635,7 @@ namespace OpenMetaverse.Packets else { _desc = new byte[value.Length]; Buffer.BlockCopy(value, 0, _desc, 0, value.Length); } } } - public LLUUID SnapshotID; + public UUID SnapshotID; private byte[] _user; public byte[] User { @@ -31669,7 +31669,7 @@ namespace OpenMetaverse.Packets else { _simname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _simname, 0, value.Length); } } } - public LLVector3d PosGlobal; + public Vector3d PosGlobal; public int SortOrder; public bool Enabled; @@ -31866,8 +31866,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -31915,10 +31915,10 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID PickID; - public LLUUID CreatorID; + public UUID PickID; + public UUID CreatorID; public bool TopPick; - public LLUUID ParcelID; + public UUID ParcelID; private byte[] _name; public byte[] Name { @@ -31941,8 +31941,8 @@ namespace OpenMetaverse.Packets else { _desc = new byte[value.Length]; Buffer.BlockCopy(value, 0, _desc, 0, value.Length); } } } - public LLUUID SnapshotID; - public LLVector3d PosGlobal; + public UUID SnapshotID; + public Vector3d PosGlobal; public int SortOrder; public bool Enabled; @@ -32112,8 +32112,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -32161,7 +32161,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID PickID; + public UUID PickID; public int Length { @@ -32284,8 +32284,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -32333,8 +32333,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID PickID; - public LLUUID QueryID; + public UUID PickID; + public UUID QueryID; public int Length { @@ -32460,8 +32460,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID TaskID; - public LLUUID ItemID; + public UUID TaskID; + public UUID ItemID; private byte[] _objectname; public byte[] ObjectName { @@ -32776,7 +32776,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ObjectID; + public UUID ObjectID; private byte[] _firstname; public byte[] FirstName { @@ -32822,7 +32822,7 @@ namespace OpenMetaverse.Packets } } public int ChatChannel; - public LLUUID ImageID; + public UUID ImageID; public int Length { @@ -33073,8 +33073,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -33122,7 +33122,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int ChatChannel; public int ButtonIndex; private byte[] _buttonlabel; @@ -33280,8 +33280,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -33401,8 +33401,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -33450,7 +33450,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ObjectID; + public UUID ObjectID; public uint ObjectPermissions; public int Length @@ -33591,8 +33591,8 @@ namespace OpenMetaverse.Packets else { _objectname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _objectname, 0, value.Length); } } } - public LLUUID ObjectID; - public LLUUID OwnerID; + public UUID ObjectID; + public UUID OwnerID; public bool OwnerIsGroup; private byte[] _message; public byte[] Message @@ -33788,8 +33788,8 @@ namespace OpenMetaverse.Packets else { _simname = new byte[value.Length]; Buffer.BlockCopy(value, 0, _simname, 0, value.Length); } } } - public LLVector3 SimPosition; - public LLVector3 LookAt; + public Vector3 SimPosition; + public Vector3 LookAt; public int Length { @@ -34071,8 +34071,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -34253,8 +34253,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -34350,16 +34350,16 @@ namespace OpenMetaverse.Packets else { _mediaurl = new byte[value.Length]; Buffer.BlockCopy(value, 0, _mediaurl, 0, value.Length); } } } - public LLUUID MediaID; + public UUID MediaID; public byte MediaAutoScale; - public LLUUID GroupID; + public UUID GroupID; public int PassPrice; public float PassHours; public byte Category; - public LLUUID AuthBuyerID; - public LLUUID SnapshotID; - public LLVector3 UserLocation; - public LLVector3 UserLookAt; + public UUID AuthBuyerID; + public UUID SnapshotID; + public Vector3 UserLocation; + public Vector3 UserLookAt; public byte LandingType; public int Length @@ -34582,8 +34582,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -34686,7 +34686,7 @@ namespace OpenMetaverse.Packets /// public class TaskIDsBlock { - public LLUUID TaskID; + public UUID TaskID; public int Length { @@ -34731,7 +34731,7 @@ namespace OpenMetaverse.Packets /// public class OwnerIDsBlock { - public LLUUID OwnerID; + public UUID OwnerID; public int Length { @@ -34902,8 +34902,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -35084,8 +35084,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -35188,7 +35188,7 @@ namespace OpenMetaverse.Packets /// public class TaskIDsBlock { - public LLUUID TaskID; + public UUID TaskID; public int Length { @@ -35233,7 +35233,7 @@ namespace OpenMetaverse.Packets /// public class OwnerIDsBlock { - public LLUUID OwnerID; + public UUID OwnerID; public int Length { @@ -35404,8 +35404,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -35508,7 +35508,7 @@ namespace OpenMetaverse.Packets /// public class ReturnIDsBlock { - public LLUUID ReturnID; + public UUID ReturnID; public int Length { @@ -35655,8 +35655,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -35776,7 +35776,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID CovenantID; + public UUID CovenantID; public uint CovenantTimestamp; private byte[] _estatename; public byte[] EstateName @@ -35789,7 +35789,7 @@ namespace OpenMetaverse.Packets else { _estatename = new byte[value.Length]; Buffer.BlockCopy(value, 0, _estatename, 0, value.Length); } } } - public LLUUID EstateOwnerID; + public UUID EstateOwnerID; public int Length { @@ -36115,8 +36115,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -36290,8 +36290,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -36339,7 +36339,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID GroupID; + public UUID GroupID; public int LocalID; public int Length @@ -36469,8 +36469,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -36644,8 +36644,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -36693,7 +36693,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID GroupID; + public UUID GroupID; public bool IsGroupOwned; public bool Final; @@ -36918,8 +36918,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -37115,8 +37115,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -37312,8 +37312,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -37487,8 +37487,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -37536,7 +37536,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID GroupID; + public UUID GroupID; public bool IsGroupOwned; public bool RemoveContribution; public int LocalID; @@ -37739,8 +37739,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -37788,7 +37788,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID OwnerID; + public UUID OwnerID; public int LocalID; public int Length @@ -37918,8 +37918,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -38107,7 +38107,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID AgentID; + public UUID AgentID; public int SequenceID; public uint Flags; public int LocalID; @@ -38173,7 +38173,7 @@ namespace OpenMetaverse.Packets /// public class ListBlock { - public LLUUID ID; + public UUID ID; public int Time; public uint Flags; @@ -38328,8 +38328,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -38379,7 +38379,7 @@ namespace OpenMetaverse.Packets { public uint Flags; public int LocalID; - public LLUUID TransactionID; + public UUID TransactionID; public int SequenceID; public int Sections; @@ -38450,7 +38450,7 @@ namespace OpenMetaverse.Packets /// public class ListBlock { - public LLUUID ID; + public UUID ID; public int Time; public uint Flags; @@ -38611,8 +38611,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -38661,7 +38661,7 @@ namespace OpenMetaverse.Packets public class DataBlock { public int LocalID; - public LLUUID ParcelID; + public UUID ParcelID; public int Length { @@ -38790,7 +38790,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -38836,7 +38836,7 @@ namespace OpenMetaverse.Packets public class DataBlock { public int LocalID; - public LLUUID ParcelID; + public UUID ParcelID; public float Dwell; public int Length @@ -38973,8 +38973,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -39148,8 +39148,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -39198,7 +39198,7 @@ namespace OpenMetaverse.Packets public class ParcelDataBlock { public int LocalID; - public LLUUID SnapshotID; + public UUID SnapshotID; public int Length { @@ -39327,7 +39327,7 @@ namespace OpenMetaverse.Packets /// public class UUIDNameBlockBlock { - public LLUUID ID; + public UUID ID; public int Length { @@ -39462,7 +39462,7 @@ namespace OpenMetaverse.Packets /// public class UUIDNameBlockBlock { - public LLUUID ID; + public UUID ID; private byte[] _firstname; public byte[] FirstName { @@ -39638,7 +39638,7 @@ namespace OpenMetaverse.Packets /// public class UUIDNameBlockBlock { - public LLUUID ID; + public UUID ID; public int Length { @@ -39773,7 +39773,7 @@ namespace OpenMetaverse.Packets /// public class UUIDNameBlockBlock { - public LLUUID ID; + public UUID ID; private byte[] _groupname; public byte[] GroupName { @@ -39929,8 +39929,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -40050,8 +40050,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -40171,8 +40171,8 @@ namespace OpenMetaverse.Packets /// public class ScriptBlock { - public LLUUID ObjectID; - public LLUUID ItemID; + public UUID ObjectID; + public UUID ItemID; public int Length { @@ -40292,8 +40292,8 @@ namespace OpenMetaverse.Packets /// public class ScriptBlock { - public LLUUID ObjectID; - public LLUUID ItemID; + public UUID ObjectID; + public UUID ItemID; public bool Running; public int Length @@ -40417,8 +40417,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -40466,8 +40466,8 @@ namespace OpenMetaverse.Packets /// public class ScriptBlock { - public LLUUID ObjectID; - public LLUUID ItemID; + public UUID ObjectID; + public UUID ItemID; public bool Running; public int Length @@ -40597,8 +40597,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -40646,8 +40646,8 @@ namespace OpenMetaverse.Packets /// public class ScriptBlock { - public LLUUID ObjectID; - public LLUUID ItemID; + public UUID ObjectID; + public UUID ItemID; public int Length { @@ -40773,11 +40773,11 @@ namespace OpenMetaverse.Packets /// public class RequesterBlock { - public LLUUID SourceID; - public LLUUID RequestID; - public LLUUID SearchID; - public LLVector3 SearchPos; - public LLQuaternion SearchDir; + public UUID SourceID; + public UUID RequestID; + public UUID SearchID; + public Vector3 SearchPos; + public Quaternion SearchDir; private byte[] _searchname; public byte[] SearchName { @@ -40965,7 +40965,7 @@ namespace OpenMetaverse.Packets /// public class RequesterBlock { - public LLUUID SourceID; + public UUID SourceID; public int Length { @@ -41010,12 +41010,12 @@ namespace OpenMetaverse.Packets /// public class SensedDataBlock { - public LLUUID ObjectID; - public LLUUID OwnerID; - public LLUUID GroupID; - public LLVector3 Position; - public LLVector3 Velocity; - public LLQuaternion Rotation; + public UUID ObjectID; + public UUID OwnerID; + public UUID GroupID; + public Vector3 Position; + public Vector3 Velocity; + public Quaternion Rotation; private byte[] _name; public byte[] Name { @@ -41208,8 +41208,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint CircuitCode; public int Length @@ -41336,8 +41336,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -41385,8 +41385,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLVector3 Position; - public LLVector3 LookAt; + public Vector3 Position; + public Vector3 LookAt; public ulong RegionHandle; public uint Timestamp; @@ -41599,8 +41599,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -41720,8 +41720,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -41769,7 +41769,7 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; + public UUID ItemID; public int Length { @@ -41910,8 +41910,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -41960,13 +41960,13 @@ namespace OpenMetaverse.Packets public class MessageBlockBlock { public bool FromGroup; - public LLUUID ToAgentID; + public UUID ToAgentID; public uint ParentEstateID; - public LLUUID RegionID; - public LLVector3 Position; + public UUID RegionID; + public Vector3 Position; public byte Offline; public byte Dialog; - public LLUUID ID; + public UUID ID; public uint Timestamp; private byte[] _fromagentname; public byte[] FromAgentName @@ -42183,8 +42183,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -42304,8 +42304,8 @@ namespace OpenMetaverse.Packets /// public class AgentBlockBlock { - public LLUUID Hunter; - public LLUUID Prey; + public UUID Hunter; + public UUID Prey; public uint SpaceIP; public int Length @@ -42512,8 +42512,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -42562,7 +42562,7 @@ namespace OpenMetaverse.Packets public class RequestBlockBlock { public bool Godlike; - public LLUUID Token; + public UUID Token; public int Length { @@ -42688,8 +42688,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -42738,7 +42738,7 @@ namespace OpenMetaverse.Packets public class GrantDataBlock { public byte GodLevel; - public LLUUID Token; + public UUID Token; public int Length { @@ -42864,9 +42864,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID TransactionID; + public UUID AgentID; + public UUID SessionID; + public UUID TransactionID; public int Length { @@ -42928,7 +42928,7 @@ namespace OpenMetaverse.Packets else { _method = new byte[value.Length]; Buffer.BlockCopy(value, 0, _method, 0, value.Length); } } } - public LLUUID Invoice; + public UUID Invoice; public int Length { @@ -43148,9 +43148,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID TransactionID; + public UUID AgentID; + public UUID SessionID; + public UUID TransactionID; public int Length { @@ -43212,7 +43212,7 @@ namespace OpenMetaverse.Packets else { _method = new byte[value.Length]; Buffer.BlockCopy(value, 0, _method, 0, value.Length); } } } - public LLUUID Invoice; + public UUID Invoice; public int Length { @@ -43432,9 +43432,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID TransactionID; + public UUID AgentID; + public UUID SessionID; + public UUID TransactionID; public int Length { @@ -43496,7 +43496,7 @@ namespace OpenMetaverse.Packets else { _method = new byte[value.Length]; Buffer.BlockCopy(value, 0, _method, 0, value.Length); } } } - public LLUUID Invoice; + public UUID Invoice; public int Length { @@ -43716,8 +43716,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -43891,8 +43891,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -43940,7 +43940,7 @@ namespace OpenMetaverse.Packets /// public class MuteDataBlock { - public LLUUID MuteID; + public UUID MuteID; private byte[] _mutename; public byte[] MuteName { @@ -44099,8 +44099,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -44148,7 +44148,7 @@ namespace OpenMetaverse.Packets /// public class MuteDataBlock { - public LLUUID MuteID; + public UUID MuteID; private byte[] _mutename; public byte[] MuteName { @@ -44292,8 +44292,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -44341,8 +44341,8 @@ namespace OpenMetaverse.Packets /// public class NotecardDataBlock { - public LLUUID NotecardItemID; - public LLUUID ObjectID; + public UUID NotecardItemID; + public UUID ObjectID; public int Length { @@ -44390,8 +44390,8 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; + public UUID ItemID; + public UUID FolderID; public int Length { @@ -44541,9 +44541,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID TransactionID; + public UUID AgentID; + public UUID SessionID; + public UUID TransactionID; public int Length { @@ -44594,19 +44594,19 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; + public UUID ItemID; + public UUID FolderID; public uint CallbackID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID TransactionID; + public UUID TransactionID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -44883,9 +44883,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public bool SimApproved; - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -44936,19 +44936,19 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; + public UUID ItemID; + public UUID FolderID; public uint CallbackID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID AssetID; + public UUID AssetID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -45225,8 +45225,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public bool Stamp; public int Length @@ -45278,8 +45278,8 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; + public UUID ItemID; + public UUID FolderID; private byte[] _newname; public byte[] NewName { @@ -45444,8 +45444,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -45494,9 +45494,9 @@ namespace OpenMetaverse.Packets public class InventoryDataBlock { public uint CallbackID; - public LLUUID OldAgentID; - public LLUUID OldItemID; - public LLUUID NewFolderID; + public UUID OldAgentID; + public UUID OldItemID; + public UUID NewFolderID; private byte[] _newname; public byte[] NewName { @@ -45670,8 +45670,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -45719,7 +45719,7 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; + public UUID ItemID; public int Length { @@ -45860,8 +45860,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -45909,7 +45909,7 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; + public UUID ItemID; public uint Flags; public int Length @@ -46057,7 +46057,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -46102,8 +46102,8 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID NewAssetID; + public UUID ItemID; + public UUID NewAssetID; public int Length { @@ -46229,8 +46229,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -46278,8 +46278,8 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; - public LLUUID ParentID; + public UUID FolderID; + public UUID ParentID; public sbyte Type; private byte[] _name; public byte[] Name @@ -46430,8 +46430,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -46479,8 +46479,8 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; - public LLUUID ParentID; + public UUID FolderID; + public UUID ParentID; public sbyte Type; private byte[] _name; public byte[] Name @@ -46649,8 +46649,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public bool Stamp; public int Length @@ -46702,8 +46702,8 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID FolderID; - public LLUUID ParentID; + public UUID FolderID; + public UUID ParentID; public int Length { @@ -46847,8 +46847,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -46896,7 +46896,7 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; + public UUID FolderID; public int Length { @@ -47037,8 +47037,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -47086,8 +47086,8 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID FolderID; - public LLUUID OwnerID; + public UUID FolderID; + public UUID OwnerID; public int SortOrder; public bool FetchFolders; public bool FetchItems; @@ -47228,9 +47228,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID FolderID; - public LLUUID OwnerID; + public UUID AgentID; + public UUID FolderID; + public UUID OwnerID; public int Version; public int Descendents; @@ -47295,8 +47295,8 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; - public LLUUID ParentID; + public UUID FolderID; + public UUID ParentID; public sbyte Type; private byte[] _name; public byte[] Name @@ -47369,18 +47369,18 @@ namespace OpenMetaverse.Packets /// public class ItemDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID ItemID; + public UUID FolderID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID AssetID; + public UUID AssetID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -47675,8 +47675,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -47724,8 +47724,8 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID OwnerID; - public LLUUID ItemID; + public UUID OwnerID; + public UUID ItemID; public int Length { @@ -47869,7 +47869,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -47914,18 +47914,18 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID ItemID; + public UUID FolderID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID AssetID; + public UUID AssetID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -48196,8 +48196,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID TransactionID; + public UUID AgentID; + public UUID TransactionID; public int Length { @@ -48245,8 +48245,8 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; - public LLUUID ParentID; + public UUID FolderID; + public UUID ParentID; public sbyte Type; private byte[] _name; public byte[] Name @@ -48319,19 +48319,19 @@ namespace OpenMetaverse.Packets /// public class ItemDataBlock { - public LLUUID ItemID; + public UUID ItemID; public uint CallbackID; - public LLUUID FolderID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID FolderID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID AssetID; + public UUID AssetID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -48632,10 +48632,10 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; - public LLUUID AgentID; - public LLUUID OwnerID; - public LLUUID ItemID; + public UUID QueryID; + public UUID AgentID; + public UUID OwnerID; + public UUID ItemID; public int Length { @@ -48761,8 +48761,8 @@ namespace OpenMetaverse.Packets /// public class QueryDataBlock { - public LLUUID QueryID; - public LLUUID AssetID; + public UUID QueryID; + public UUID AssetID; public bool IsReadable; public int Length @@ -48886,8 +48886,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -48935,7 +48935,7 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; + public UUID FolderID; public int Length { @@ -48980,7 +48980,7 @@ namespace OpenMetaverse.Packets /// public class ItemDataBlock { - public LLUUID ItemID; + public UUID ItemID; public int Length { @@ -49145,8 +49145,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -49194,7 +49194,7 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID FolderID; + public UUID FolderID; public int Length { @@ -49317,8 +49317,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -49418,18 +49418,18 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID ItemID; + public UUID FolderID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID TransactionID; + public UUID TransactionID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -49688,8 +49688,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -49738,7 +49738,7 @@ namespace OpenMetaverse.Packets public class InventoryDataBlock { public uint LocalID; - public LLUUID ItemID; + public UUID ItemID; public int Length { @@ -49867,9 +49867,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID FolderID; + public UUID AgentID; + public UUID SessionID; + public UUID FolderID; public int Length { @@ -49921,7 +49921,7 @@ namespace OpenMetaverse.Packets public class InventoryDataBlock { public uint LocalID; - public LLUUID ItemID; + public UUID ItemID; public int Length { @@ -50050,8 +50050,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -50225,7 +50225,7 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID TaskID; + public UUID TaskID; public short Serial; private byte[] _filename; public byte[] Filename @@ -50368,8 +50368,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -50417,10 +50417,10 @@ namespace OpenMetaverse.Packets /// public class AgentBlockBlock { - public LLUUID GroupID; + public UUID GroupID; public byte Destination; - public LLUUID DestinationID; - public LLUUID TransactionID; + public UUID DestinationID; + public UUID TransactionID; public byte PacketCount; public byte PacketNumber; @@ -50632,7 +50632,7 @@ namespace OpenMetaverse.Packets /// public class TransactionDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public bool Success; public int Length @@ -50753,9 +50753,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -50806,11 +50806,11 @@ namespace OpenMetaverse.Packets /// public class RezDataBlock { - public LLUUID FromTaskID; + public UUID FromTaskID; public byte BypassRaycast; - public LLVector3 RayStart; - public LLVector3 RayEnd; - public LLUUID RayTargetID; + public Vector3 RayStart; + public Vector3 RayEnd; + public UUID RayTargetID; public bool RayEndIsIntersection; public bool RezSelected; public bool RemoveItem; @@ -50907,18 +50907,18 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; - public LLUUID FolderID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID ItemID; + public UUID FolderID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID TransactionID; + public UUID TransactionID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -51177,9 +51177,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -51230,11 +51230,11 @@ namespace OpenMetaverse.Packets /// public class RezDataBlock { - public LLUUID FromTaskID; + public UUID FromTaskID; public byte BypassRaycast; - public LLVector3 RayStart; - public LLVector3 RayEnd; - public LLUUID RayTargetID; + public Vector3 RayStart; + public Vector3 RayEnd; + public UUID RayTargetID; public bool RayEndIsIntersection; public bool RezSelected; public bool RemoveItem; @@ -51331,8 +51331,8 @@ namespace OpenMetaverse.Packets /// public class NotecardDataBlock { - public LLUUID NotecardItemID; - public LLUUID ObjectID; + public UUID NotecardItemID; + public UUID ObjectID; public int Length { @@ -51380,7 +51380,7 @@ namespace OpenMetaverse.Packets /// public class InventoryDataBlock { - public LLUUID ItemID; + public UUID ItemID; public int Length { @@ -51533,8 +51533,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -51582,7 +51582,7 @@ namespace OpenMetaverse.Packets /// public class TransactionBlockBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -51627,7 +51627,7 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; + public UUID FolderID; public int Length { @@ -51774,8 +51774,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -51823,7 +51823,7 @@ namespace OpenMetaverse.Packets /// public class TransactionBlockBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -51946,8 +51946,8 @@ namespace OpenMetaverse.Packets /// public class AgentBlockBlock { - public LLUUID SourceID; - public LLUUID DestID; + public UUID SourceID; + public UUID DestID; public int Length { @@ -52067,8 +52067,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -52116,7 +52116,7 @@ namespace OpenMetaverse.Packets /// public class ExBlockBlock { - public LLUUID OtherID; + public UUID OtherID; public int Length { @@ -52239,8 +52239,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -52288,8 +52288,8 @@ namespace OpenMetaverse.Packets /// public class AgentBlockBlock { - public LLUUID DestID; - public LLUUID TransactionID; + public UUID DestID; + public UUID TransactionID; public int Length { @@ -52415,8 +52415,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -52464,7 +52464,7 @@ namespace OpenMetaverse.Packets /// public class TransactionBlockBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -52509,7 +52509,7 @@ namespace OpenMetaverse.Packets /// public class FolderDataBlock { - public LLUUID FolderID; + public UUID FolderID; public int Length { @@ -52656,8 +52656,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -52705,7 +52705,7 @@ namespace OpenMetaverse.Packets /// public class TransactionBlockBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -52828,9 +52828,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -52933,18 +52933,18 @@ namespace OpenMetaverse.Packets /// public class InventoryBlockBlock { - public LLUUID ItemID; - public LLUUID FolderID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID ItemID; + public UUID FolderID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; public uint EveryoneMask; public uint NextOwnerMask; public bool GroupOwned; - public LLUUID TransactionID; + public UUID TransactionID; public sbyte Type; public sbyte InvType; public uint Flags; @@ -53203,8 +53203,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -53253,8 +53253,8 @@ namespace OpenMetaverse.Packets public class InventoryBlockBlock { public uint CallbackID; - public LLUUID FolderID; - public LLUUID TransactionID; + public UUID FolderID; + public UUID TransactionID; public uint NextOwnerMask; public sbyte Type; public sbyte InvType; @@ -53446,8 +53446,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -53543,7 +53543,7 @@ namespace OpenMetaverse.Packets /// public class InventoryBlockBlock { - public LLUUID FolderID; + public UUID FolderID; private byte[] _name; public byte[] Name { @@ -53693,7 +53693,7 @@ namespace OpenMetaverse.Packets /// public class RequestBlockBlock { - public LLUUID RegionID; + public UUID RegionID; public int Length { @@ -53810,7 +53810,7 @@ namespace OpenMetaverse.Packets /// public class ReplyBlockBlock { - public LLUUID RegionID; + public UUID RegionID; public ulong RegionHandle; public int Length @@ -53938,8 +53938,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -53987,8 +53987,8 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID SourceID; - public LLUUID DestID; + public UUID SourceID; + public UUID DestID; public byte Flags; public int Amount; public byte AggregatePermNextOwner; @@ -54161,8 +54161,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -54210,7 +54210,7 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -54333,8 +54333,8 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID AgentID; - public LLUUID TransactionID; + public UUID AgentID; + public UUID TransactionID; public bool TransactionSuccess; public int MoneyBalance; public int SquareMetersCredit; @@ -54553,8 +54553,8 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID AgentID; - public LLUUID TransactionID; + public UUID AgentID; + public UUID TransactionID; public bool TransactionSuccess; public int MoneyBalance; public int SquareMetersCredit; @@ -54726,8 +54726,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint Flags; public int Length @@ -54782,8 +54782,8 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ItemID; - public LLUUID AssetID; + public UUID ItemID; + public UUID AssetID; public uint GestureFlags; public int Length @@ -54934,8 +54934,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint Flags; public int Length @@ -54990,7 +54990,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID ItemID; + public UUID ItemID; public uint GestureFlags; public int Length @@ -55138,7 +55138,7 @@ namespace OpenMetaverse.Packets /// public class MuteDataBlock { - public LLUUID AgentID; + public UUID AgentID; private byte[] _filename; public byte[] Filename { @@ -55276,7 +55276,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -55393,8 +55393,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -55442,7 +55442,7 @@ namespace OpenMetaverse.Packets /// public class RightsBlock { - public LLUUID AgentRelated; + public UUID AgentRelated; public int RelatedRights; public int Length @@ -55590,7 +55590,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -55635,7 +55635,7 @@ namespace OpenMetaverse.Packets /// public class RightsBlock { - public LLUUID AgentRelated; + public UUID AgentRelated; public int RelatedRights; public int Length @@ -55783,7 +55783,7 @@ namespace OpenMetaverse.Packets /// public class AgentBlockBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -55918,7 +55918,7 @@ namespace OpenMetaverse.Packets /// public class AgentBlockBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -56053,8 +56053,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -56114,8 +56114,8 @@ namespace OpenMetaverse.Packets } } public uint LocationID; - public LLVector3 LocationPos; - public LLVector3 LocationLookAt; + public Vector3 LocationPos; + public Vector3 LocationLookAt; public int Length { @@ -56258,7 +56258,7 @@ namespace OpenMetaverse.Packets /// public class AssetBlockBlock { - public LLUUID TransactionID; + public UUID TransactionID; public sbyte Type; public bool Tempfile; public bool StoreLocal; @@ -56409,7 +56409,7 @@ namespace OpenMetaverse.Packets /// public class AssetBlockBlock { - public LLUUID UUID; + public UUID UUID; public sbyte Type; public bool Success; @@ -56534,8 +56534,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -56606,7 +56606,7 @@ namespace OpenMetaverse.Packets } } public bool ShowInList; - public LLUUID InsigniaID; + public UUID InsigniaID; public int MembershipFee; public bool OpenEnrollment; public bool AllowPublish; @@ -56772,7 +56772,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -56817,7 +56817,7 @@ namespace OpenMetaverse.Packets /// public class ReplyDataBlock { - public LLUUID GroupID; + public UUID GroupID; public bool Success; private byte[] _message; public byte[] Message @@ -56965,8 +56965,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -57014,7 +57014,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; private byte[] _charter; public byte[] Charter { @@ -57027,7 +57027,7 @@ namespace OpenMetaverse.Packets } } public bool ShowInList; - public LLUUID InsigniaID; + public UUID InsigniaID; public int MembershipFee; public bool OpenEnrollment; public bool AllowPublish; @@ -57187,9 +57187,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -57240,8 +57240,8 @@ namespace OpenMetaverse.Packets /// public class RoleChangeBlock { - public LLUUID RoleID; - public LLUUID MemberID; + public UUID RoleID; + public UUID MemberID; public uint Change; public int Length @@ -57392,8 +57392,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -57441,7 +57441,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -57564,7 +57564,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -57609,7 +57609,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public bool Success; public int Length @@ -57736,8 +57736,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -57785,7 +57785,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -57830,7 +57830,7 @@ namespace OpenMetaverse.Packets /// public class EjectDataBlock { - public LLUUID EjecteeID; + public UUID EjecteeID; public int Length { @@ -57977,7 +57977,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -58022,7 +58022,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -58196,8 +58196,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -58245,7 +58245,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -58368,7 +58368,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -58413,7 +58413,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public bool Success; public int Length @@ -58540,8 +58540,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -58589,7 +58589,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -58634,8 +58634,8 @@ namespace OpenMetaverse.Packets /// public class InviteDataBlock { - public LLUUID InviteeID; - public LLUUID RoleID; + public UUID InviteeID; + public UUID RoleID; public int Length { @@ -58785,8 +58785,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -58834,7 +58834,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -58957,7 +58957,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -59002,7 +59002,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; private byte[] _name; public byte[] Name { @@ -59038,8 +59038,8 @@ namespace OpenMetaverse.Packets } } public ulong PowersMask; - public LLUUID InsigniaID; - public LLUUID FounderID; + public UUID InsigniaID; + public UUID FounderID; public int MembershipFee; public bool OpenEnrollment; public int Money; @@ -59047,7 +59047,7 @@ namespace OpenMetaverse.Packets public int GroupRolesCount; public bool AllowPublish; public bool MaturePublish; - public LLUUID OwnerRole; + public UUID OwnerRole; public int Length { @@ -59255,9 +59255,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -59308,7 +59308,7 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID RequestID; + public UUID RequestID; public int IntervalDays; public int CurrentInterval; @@ -59445,8 +59445,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public int Length { @@ -59494,7 +59494,7 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID RequestID; + public UUID RequestID; public int IntervalDays; public int CurrentInterval; private byte[] _startdate; @@ -59790,9 +59790,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -59843,7 +59843,7 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID RequestID; + public UUID RequestID; public int IntervalDays; public int CurrentInterval; @@ -59980,8 +59980,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public int Length { @@ -60029,7 +60029,7 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID RequestID; + public UUID RequestID; public int IntervalDays; public int CurrentInterval; private byte[] _startdate; @@ -60281,9 +60281,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -60334,7 +60334,7 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID RequestID; + public UUID RequestID; public int IntervalDays; public int CurrentInterval; @@ -60471,8 +60471,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public int Length { @@ -60520,7 +60520,7 @@ namespace OpenMetaverse.Packets /// public class MoneyDataBlock { - public LLUUID RequestID; + public UUID RequestID; public int IntervalDays; public int CurrentInterval; private byte[] _startdate; @@ -60819,8 +60819,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -60868,7 +60868,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -60913,7 +60913,7 @@ namespace OpenMetaverse.Packets /// public class TransactionDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -61042,8 +61042,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public int Length { @@ -61091,7 +61091,7 @@ namespace OpenMetaverse.Packets /// public class TransactionDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public uint TotalNumItems; public int Length @@ -61143,8 +61143,8 @@ namespace OpenMetaverse.Packets /// public class ProposalDataBlock { - public LLUUID VoteID; - public LLUUID VoteInitiator; + public UUID VoteID; + public UUID VoteInitiator; private byte[] _tersedateid; public byte[] TerseDateID { @@ -61414,8 +61414,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -61463,7 +61463,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Length { @@ -61508,7 +61508,7 @@ namespace OpenMetaverse.Packets /// public class TransactionDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public int Length { @@ -61637,8 +61637,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public int Length { @@ -61686,7 +61686,7 @@ namespace OpenMetaverse.Packets /// public class TransactionDataBlock { - public LLUUID TransactionID; + public UUID TransactionID; public uint TotalNumItems; public int Length @@ -61738,7 +61738,7 @@ namespace OpenMetaverse.Packets /// public class HistoryItemDataBlock { - public LLUUID VoteID; + public UUID VoteID; private byte[] _tersedateid; public byte[] TerseDateID { @@ -61772,7 +61772,7 @@ namespace OpenMetaverse.Packets else { _enddatetime = new byte[value.Length]; Buffer.BlockCopy(value, 0, _enddatetime, 0, value.Length); } } } - public LLUUID VoteInitiator; + public UUID VoteInitiator; private byte[] _votetype; public byte[] VoteType { @@ -61924,7 +61924,7 @@ namespace OpenMetaverse.Packets /// public class VoteItemBlock { - public LLUUID CandidateID; + public UUID CandidateID; private byte[] _votecast; public byte[] VoteCast { @@ -62106,8 +62106,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -62155,7 +62155,7 @@ namespace OpenMetaverse.Packets /// public class ProposalDataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Quorum; public float Majority; public int Duration; @@ -62321,8 +62321,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -62370,8 +62370,8 @@ namespace OpenMetaverse.Packets /// public class ProposalDataBlock { - public LLUUID ProposalID; - public LLUUID GroupID; + public UUID ProposalID; + public UUID GroupID; private byte[] _votecast; public byte[] VoteCast { @@ -62518,8 +62518,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -62567,8 +62567,8 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; - public LLUUID RequestID; + public UUID GroupID; + public UUID RequestID; public int Length { @@ -62694,7 +62694,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -62739,8 +62739,8 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; - public LLUUID RequestID; + public UUID GroupID; + public UUID RequestID; public int MemberCount; public int Length @@ -62795,7 +62795,7 @@ namespace OpenMetaverse.Packets /// public class MemberDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Contribution; private byte[] _onlinestatus; public byte[] OnlineStatus @@ -63006,9 +63006,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -63131,8 +63131,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -63180,7 +63180,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID GroupID; + public UUID GroupID; public int Contribution; public int Length @@ -63310,8 +63310,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -63359,7 +63359,7 @@ namespace OpenMetaverse.Packets /// public class DataBlock { - public LLUUID GroupID; + public UUID GroupID; public bool AcceptNotices; public int Length @@ -63537,8 +63537,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -63586,8 +63586,8 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; - public LLUUID RequestID; + public UUID GroupID; + public UUID RequestID; public int Length { @@ -63713,7 +63713,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -63758,8 +63758,8 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; - public LLUUID RequestID; + public UUID GroupID; + public UUID RequestID; public int RoleCount; public int Length @@ -63814,7 +63814,7 @@ namespace OpenMetaverse.Packets /// public class RoleDataBlock { - public LLUUID RoleID; + public UUID RoleID; private byte[] _name; public byte[] Name { @@ -64041,8 +64041,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -64090,8 +64090,8 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; - public LLUUID RequestID; + public UUID GroupID; + public UUID RequestID; public int Length { @@ -64217,9 +64217,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; - public LLUUID RequestID; + public UUID AgentID; + public UUID GroupID; + public UUID RequestID; public uint TotalPairs; public int Length @@ -64277,8 +64277,8 @@ namespace OpenMetaverse.Packets /// public class MemberDataBlock { - public LLUUID RoleID; - public LLUUID MemberID; + public UUID RoleID; + public UUID MemberID; public int Length { @@ -64422,10 +64422,10 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; - public LLUUID RequestID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; + public UUID RequestID; public int Length { @@ -64551,9 +64551,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; - public LLUUID RequestID; + public UUID AgentID; + public UUID GroupID; + public UUID RequestID; public int Length { @@ -64615,7 +64615,7 @@ namespace OpenMetaverse.Packets else { _title = new byte[value.Length]; Buffer.BlockCopy(value, 0, _title, 0, value.Length); } } } - public LLUUID RoleID; + public UUID RoleID; public bool Selected; public int Length @@ -64771,10 +64771,10 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; - public LLUUID TitleRoleID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; + public UUID TitleRoleID; public int Length { @@ -64900,9 +64900,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -64953,7 +64953,7 @@ namespace OpenMetaverse.Packets /// public class RoleDataBlock { - public LLUUID RoleID; + public UUID RoleID; private byte[] _name; public byte[] Name { @@ -65171,8 +65171,8 @@ namespace OpenMetaverse.Packets /// public class RequestDataBlock { - public LLUUID RequestID; - public LLUUID AgentID; + public UUID RequestID; + public UUID AgentID; public int Length { @@ -65292,8 +65292,8 @@ namespace OpenMetaverse.Packets /// public class ReplyDataBlock { - public LLUUID RequestID; - public LLUUID GroupID; + public UUID RequestID; + public UUID GroupID; private byte[] _selection; public byte[] Selection { @@ -65434,8 +65434,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -65555,8 +65555,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint SerialNum; public int Length @@ -65611,8 +65611,8 @@ namespace OpenMetaverse.Packets /// public class WearableDataBlock { - public LLUUID ItemID; - public LLUUID AssetID; + public UUID ItemID; + public UUID AssetID; public byte WearableType; public int Length @@ -65760,8 +65760,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -65809,7 +65809,7 @@ namespace OpenMetaverse.Packets /// public class WearableDataBlock { - public LLUUID ItemID; + public UUID ItemID; public byte WearableType; public int Length @@ -65954,8 +65954,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int SerialNum; public int Length @@ -66010,7 +66010,7 @@ namespace OpenMetaverse.Packets /// public class WearableDataBlock { - public LLUUID ID; + public UUID ID; public byte TextureIndex; public int Length @@ -66155,8 +66155,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int SerialNum; public int Length @@ -66211,7 +66211,7 @@ namespace OpenMetaverse.Packets /// public class WearableDataBlock { - public LLUUID TextureID; + public UUID TextureID; public byte TextureIndex; private byte[] _hostname; public byte[] HostName @@ -66377,8 +66377,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -66498,7 +66498,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; private byte[] _firstname; public byte[] FirstName { @@ -66532,7 +66532,7 @@ namespace OpenMetaverse.Packets else { _grouptitle = new byte[value.Length]; Buffer.BlockCopy(value, 0, _grouptitle, 0, value.Length); } } } - public LLUUID ActiveGroupID; + public UUID ActiveGroupID; public ulong GroupPowers; private byte[] _groupname; public byte[] GroupName @@ -66711,8 +66711,8 @@ namespace OpenMetaverse.Packets /// public class AgentGroupDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public ulong AgentPowers; private byte[] _grouptitle; public byte[] GroupTitle @@ -66882,7 +66882,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -66927,10 +66927,10 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public ulong GroupPowers; public bool AcceptNotices; - public LLUUID GroupInsigniaID; + public UUID GroupInsigniaID; public int Contribution; private byte[] _groupname; public byte[] GroupName @@ -67115,8 +67115,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID GroupID; + public UUID AgentID; + public UUID GroupID; public int Length { @@ -67236,7 +67236,7 @@ namespace OpenMetaverse.Packets /// public class DataBlockBlock { - public LLUUID EndPointID; + public UUID EndPointID; public byte[] Digest; public int Length @@ -67358,7 +67358,7 @@ namespace OpenMetaverse.Packets /// public class DataBlockBlock { - public LLUUID EndPointID; + public UUID EndPointID; public int Length { @@ -67541,8 +67541,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -67590,8 +67590,8 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ItemID; - public LLUUID OwnerID; + public UUID ItemID; + public UUID OwnerID; public byte AttachmentPt; public uint ItemFlags; public uint GroupMask; @@ -67790,8 +67790,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -67839,7 +67839,7 @@ namespace OpenMetaverse.Packets /// public class HeaderDataBlock { - public LLUUID CompoundMsgID; + public UUID CompoundMsgID; public byte TotalObjects; public bool FirstDetachAll; @@ -67892,8 +67892,8 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ItemID; - public LLUUID OwnerID; + public UUID ItemID; + public UUID OwnerID; public byte AttachmentPt; public uint ItemFlags; public uint GroupMask; @@ -68116,8 +68116,8 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID AgentID; - public LLUUID ItemID; + public UUID AgentID; + public UUID ItemID; public int Length { @@ -68237,8 +68237,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -68286,7 +68286,7 @@ namespace OpenMetaverse.Packets /// public class HeaderDataBlock { - public LLUUID NewFolderID; + public UUID NewFolderID; public int Length { @@ -68331,8 +68331,8 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID OldItemID; - public LLUUID OldFolderID; + public UUID OldItemID; + public UUID OldFolderID; public int Length { @@ -68482,8 +68482,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -68603,7 +68603,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -68813,8 +68813,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -69006,7 +69006,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -69222,7 +69222,7 @@ namespace OpenMetaverse.Packets else { _method = new byte[value.Length]; Buffer.BlockCopy(value, 0, _method, 0, value.Length); } } } - public LLUUID Invoice; + public UUID Invoice; public byte[] Digest; public int Length @@ -69441,8 +69441,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint Flags; public uint EstateID; public bool Godlike; @@ -69580,7 +69580,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public uint Flags; public int Length @@ -69636,7 +69636,7 @@ namespace OpenMetaverse.Packets public uint Right; public uint Top; public uint Bottom; - public LLUUID ImageID; + public UUID ImageID; public int Length { @@ -69801,8 +69801,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint Flags; public uint EstateID; public bool Godlike; @@ -70007,8 +70007,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint Flags; public uint EstateID; public bool Godlike; @@ -70214,7 +70214,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public uint Flags; public int Length @@ -70283,7 +70283,7 @@ namespace OpenMetaverse.Packets public uint RegionFlags; public byte WaterHeight; public byte Agents; - public LLUUID MapImageID; + public UUID MapImageID; public int Length { @@ -70458,8 +70458,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public uint Flags; public uint EstateID; public bool Godlike; @@ -70662,7 +70662,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public uint Flags; public int Length @@ -70764,7 +70764,7 @@ namespace OpenMetaverse.Packets { public uint X; public uint Y; - public LLUUID ID; + public UUID ID; public int Extra; public int Extra2; private byte[] _name; @@ -70958,10 +70958,10 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID AssetID; - public LLVector3d PosGlobal; + public UUID AgentID; + public UUID SessionID; + public UUID AssetID; + public Vector3d PosGlobal; private byte[] _to; public byte[] To { @@ -71344,7 +71344,7 @@ namespace OpenMetaverse.Packets else { _mediaurl = new byte[value.Length]; Buffer.BlockCopy(value, 0, _mediaurl, 0, value.Length); } } } - public LLUUID MediaID; + public UUID MediaID; public byte MediaAutoScale; public int Length @@ -71583,8 +71583,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -71857,7 +71857,7 @@ namespace OpenMetaverse.Packets public class ReportDataBlock { public uint TaskLocalID; - public LLUUID TaskID; + public UUID TaskID; public float LocationX; public float LocationY; public float LocationZ; @@ -72074,7 +72074,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -72131,7 +72131,7 @@ namespace OpenMetaverse.Packets else { _token = new byte[value.Length]; Buffer.BlockCopy(value, 0, _token, 0, value.Length); } } } - public LLUUID ID; + public UUID ID; private byte[] _system; public byte[] System { @@ -72332,8 +72332,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -72858,9 +72858,9 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLUUID GroupID; + public UUID AgentID; + public UUID SessionID; + public UUID GroupID; public int Length { @@ -72933,12 +72933,12 @@ namespace OpenMetaverse.Packets public ushort ProfileEnd; public ushort ProfileHollow; public byte BypassRaycast; - public LLVector3 RayStart; - public LLVector3 RayEnd; - public LLUUID RayTargetID; + public Vector3 RayStart; + public Vector3 RayEnd; + public UUID RayTargetID; public byte RayEndIsIntersection; - public LLVector3 Scale; - public LLQuaternion Rotation; + public Vector3 Scale; + public Quaternion Rotation; public byte State; public int Length @@ -73154,8 +73154,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -73372,8 +73372,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -73569,8 +73569,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -73619,7 +73619,7 @@ namespace OpenMetaverse.Packets public class ObjectDataBlock { public uint ObjectLocalID; - public LLVector3 Position; + public Vector3 Position; public int Length { @@ -73766,8 +73766,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -73816,7 +73816,7 @@ namespace OpenMetaverse.Packets public class ObjectDataBlock { public uint RequestFlags; - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -74049,7 +74049,7 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; + public UUID AgentID; public int Length { @@ -74214,8 +74214,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -74349,8 +74349,8 @@ namespace OpenMetaverse.Packets /// public class InfoBlock { - public LLVector3 Position; - public LLVector3 LookAt; + public Vector3 Position; + public Vector3 LookAt; public int Length { @@ -74482,8 +74482,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -74603,10 +74603,10 @@ namespace OpenMetaverse.Packets /// public class ObjectDataBlock { - public LLUUID ObjectID; - public LLUUID CreatorID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID ObjectID; + public UUID CreatorID; + public UUID OwnerID; + public UUID GroupID; public ulong CreationDate; public uint BaseMask; public uint OwnerMask; @@ -74621,10 +74621,10 @@ namespace OpenMetaverse.Packets public byte AggregatePermTexturesOwner; public uint Category; public short InventorySerial; - public LLUUID ItemID; - public LLUUID FolderID; - public LLUUID FromTaskID; - public LLUUID LastOwnerID; + public UUID ItemID; + public UUID FolderID; + public UUID FromTaskID; + public UUID LastOwnerID; private byte[] _name; public byte[] Name { @@ -74956,9 +74956,9 @@ namespace OpenMetaverse.Packets public class ObjectDataBlock { public uint RequestFlags; - public LLUUID ObjectID; - public LLUUID OwnerID; - public LLUUID GroupID; + public UUID ObjectID; + public UUID OwnerID; + public UUID GroupID; public uint BaseMask; public uint OwnerMask; public uint GroupMask; @@ -74968,7 +74968,7 @@ namespace OpenMetaverse.Packets public byte SaleType; public int SalePrice; public uint Category; - public LLUUID LastOwnerID; + public UUID LastOwnerID; private byte[] _name; public byte[] Name { @@ -75192,8 +75192,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -75400,9 +75400,9 @@ namespace OpenMetaverse.Packets /// public class DataBlockBlock { - public LLUUID SoundID; - public LLUUID ObjectID; - public LLUUID OwnerID; + public UUID SoundID; + public UUID ObjectID; + public UUID OwnerID; public float Gain; public byte Flags; @@ -75537,7 +75537,7 @@ namespace OpenMetaverse.Packets /// public class DataBlockBlock { - public LLUUID ObjectID; + public UUID ObjectID; public float Gain; public int Length @@ -75662,9 +75662,9 @@ namespace OpenMetaverse.Packets /// public class DataBlockBlock { - public LLUUID ObjectID; - public LLUUID OwnerID; - public LLUUID SoundID; + public UUID ObjectID; + public UUID OwnerID; + public UUID SoundID; public int Length { @@ -75805,8 +75805,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -75854,8 +75854,8 @@ namespace OpenMetaverse.Packets /// public class EffectBlock { - public LLUUID ID; - public LLUUID AgentID; + public UUID ID; + public UUID AgentID; public byte Type; public float Duration; public byte[] Color; @@ -76279,15 +76279,15 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; - public LLQuaternion BodyRotation; - public LLQuaternion HeadRotation; + public UUID AgentID; + public UUID SessionID; + public Quaternion BodyRotation; + public Quaternion HeadRotation; public byte State; - public LLVector3 CameraCenter; - public LLVector3 CameraAtAxis; - public LLVector3 CameraLeftAxis; - public LLVector3 CameraUpAxis; + public Vector3 CameraCenter; + public Vector3 CameraAtAxis; + public Vector3 CameraLeftAxis; + public Vector3 CameraUpAxis; public float Far; public uint ControlFlags; public byte Flags; @@ -76447,8 +76447,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -76496,7 +76496,7 @@ namespace OpenMetaverse.Packets /// public class AnimationListBlock { - public LLUUID AnimID; + public UUID AnimID; public bool StartAnim; public int Length @@ -76727,8 +76727,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -76776,8 +76776,8 @@ namespace OpenMetaverse.Packets /// public class TargetObjectBlock { - public LLUUID TargetID; - public LLVector3 Offset; + public UUID TargetID; + public Vector3 Offset; public int Length { @@ -76903,8 +76903,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -77024,8 +77024,8 @@ namespace OpenMetaverse.Packets /// public class AgentDataBlock { - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -77073,7 +77073,7 @@ namespace OpenMetaverse.Packets /// public class RequestImageBlock { - public LLUUID Image; + public UUID Image; public sbyte DiscardLevel; public float DownloadPriority; public uint Packet; @@ -77237,7 +77237,7 @@ namespace OpenMetaverse.Packets /// public class ImageIDBlock { - public LLUUID ID; + public UUID ID; public byte Codec; public uint Size; public ushort Packets; @@ -77439,7 +77439,7 @@ namespace OpenMetaverse.Packets /// public class ImageIDBlock { - public LLUUID ID; + public UUID ID; public ushort Packet; public int Length @@ -77875,12 +77875,12 @@ namespace OpenMetaverse.Packets { public uint ID; public byte State; - public LLUUID FullID; + public UUID FullID; public uint CRC; public byte PCode; public byte Material; public byte ClickAction; - public LLVector3 Scale; + public Vector3 Scale; private byte[] _objectdata; public byte[] ObjectData { @@ -78001,14 +78001,14 @@ namespace OpenMetaverse.Packets else { _extraparams = new byte[value.Length]; Buffer.BlockCopy(value, 0, _extraparams, 0, value.Length); } } } - public LLUUID Sound; - public LLUUID OwnerID; + public UUID Sound; + public UUID OwnerID; public float Gain; public byte Flags; public float Radius; public byte JointType; - public LLVector3 JointPivot; - public LLVector3 JointAxisOrAnchor; + public Vector3 JointPivot; + public Vector3 JointAxisOrAnchor; public int Length { @@ -79181,7 +79181,7 @@ namespace OpenMetaverse.Packets /// public class TransferDataBlock { - public LLUUID TransferID; + public UUID TransferID; public int ChannelType; public int Packet; public int Status; @@ -79672,7 +79672,7 @@ namespace OpenMetaverse.Packets /// public class SenderBlock { - public LLUUID ID; + public UUID ID; public int Length { @@ -79717,7 +79717,7 @@ namespace OpenMetaverse.Packets /// public class AnimationListBlock { - public LLUUID AnimID; + public UUID AnimID; public int AnimSequenceID; public int Length @@ -79769,7 +79769,7 @@ namespace OpenMetaverse.Packets /// public class AnimationSourceListBlock { - public LLUUID ObjectID; + public UUID ObjectID; public int Length { @@ -80020,7 +80020,7 @@ namespace OpenMetaverse.Packets /// public class SitObjectBlock { - public LLUUID ID; + public UUID ID; public int Length { @@ -80066,10 +80066,10 @@ namespace OpenMetaverse.Packets public class SitTransformBlock { public bool AutoPilot; - public LLVector3 SitPosition; - public LLQuaternion SitRotation; - public LLVector3 CameraEyeOffset; - public LLVector3 CameraAtOffset; + public Vector3 SitPosition; + public Quaternion SitRotation; + public Vector3 CameraEyeOffset; + public Vector3 CameraAtOffset; public bool ForceMouselook; public int Length @@ -80208,7 +80208,7 @@ namespace OpenMetaverse.Packets /// public class CameraCollidePlaneBlock { - public LLVector4 Plane; + public Vector4 Plane; public int Length { @@ -80332,14 +80332,14 @@ namespace OpenMetaverse.Packets public int OtherCount; public int PublicCount; public int LocalID; - public LLUUID OwnerID; + public UUID OwnerID; public bool IsGroupOwned; public uint AuctionID; public int ClaimDate; public int ClaimPrice; public int RentPrice; - public LLVector3 AABBMin; - public LLVector3 AABBMax; + public Vector3 AABBMin; + public Vector3 AABBMax; private byte[] _bitmap; public byte[] Bitmap { @@ -80409,16 +80409,16 @@ namespace OpenMetaverse.Packets else { _mediaurl = new byte[value.Length]; Buffer.BlockCopy(value, 0, _mediaurl, 0, value.Length); } } } - public LLUUID MediaID; + public UUID MediaID; public byte MediaAutoScale; - public LLUUID GroupID; + public UUID GroupID; public int PassPrice; public float PassHours; public byte Category; - public LLUUID AuthBuyerID; - public LLUUID SnapshotID; - public LLVector3 UserLocation; - public LLVector3 UserLookAt; + public UUID AuthBuyerID; + public UUID SnapshotID; + public Vector3 UserLocation; + public Vector3 UserLookAt; public byte LandingType; public bool RegionPushOverride; public bool RegionDenyAnonymous; @@ -80846,15 +80846,15 @@ namespace OpenMetaverse.Packets { public ulong RegionHandle; public uint ViewerCircuitCode; - public LLUUID AgentID; - public LLUUID SessionID; - public LLVector3 AgentPos; - public LLVector3 AgentVel; - public LLVector3 Center; - public LLVector3 Size; - public LLVector3 AtAxis; - public LLVector3 LeftAxis; - public LLVector3 UpAxis; + public UUID AgentID; + public UUID SessionID; + public Vector3 AgentPos; + public Vector3 AgentVel; + public Vector3 Center; + public Vector3 Size; + public Vector3 AtAxis; + public Vector3 LeftAxis; + public Vector3 UpAxis; public bool ChangedGrid; public float Far; public float Aspect; @@ -80870,13 +80870,13 @@ namespace OpenMetaverse.Packets } } public uint LocomotionState; - public LLQuaternion HeadRotation; - public LLQuaternion BodyRotation; + public Quaternion HeadRotation; + public Quaternion BodyRotation; public uint ControlFlags; public float EnergyLevel; public byte GodLevel; public bool AlwaysRun; - public LLUUID PreyAgent; + public UUID PreyAgent; public byte AgentAccess; private byte[] _agenttextures; public byte[] AgentTextures @@ -80889,7 +80889,7 @@ namespace OpenMetaverse.Packets else { _agenttextures = new byte[value.Length]; Buffer.BlockCopy(value, 0, _agenttextures, 0, value.Length); } } } - public LLUUID ActiveGroupID; + public UUID ActiveGroupID; public int Length { @@ -81050,7 +81050,7 @@ namespace OpenMetaverse.Packets /// public class GroupDataBlock { - public LLUUID GroupID; + public UUID GroupID; public ulong GroupPowers; public bool AcceptNotices; @@ -81110,8 +81110,8 @@ namespace OpenMetaverse.Packets /// public class AnimationDataBlock { - public LLUUID Animation; - public LLUUID ObjectID; + public UUID Animation; + public UUID ObjectID; public int Length { @@ -81159,7 +81159,7 @@ namespace OpenMetaverse.Packets /// public class GranterBlockBlock { - public LLUUID GranterID; + public UUID GranterID; public int Length { @@ -81506,8 +81506,8 @@ namespace OpenMetaverse.Packets { public ulong RegionHandle; public uint ViewerCircuitCode; - public LLUUID AgentID; - public LLUUID SessionID; + public UUID AgentID; + public UUID SessionID; public int Length { @@ -81645,15 +81645,15 @@ namespace OpenMetaverse.Packets { public ulong RegionHandle; public uint ViewerCircuitCode; - public LLUUID AgentID; - public LLUUID SessionID; - public LLVector3 AgentPos; - public LLVector3 AgentVel; - public LLVector3 Center; - public LLVector3 Size; - public LLVector3 AtAxis; - public LLVector3 LeftAxis; - public LLVector3 UpAxis; + public UUID AgentID; + public UUID SessionID; + public Vector3 AgentPos; + public Vector3 AgentVel; + public Vector3 Center; + public Vector3 Size; + public Vector3 AtAxis; + public Vector3 LeftAxis; + public Vector3 UpAxis; public bool ChangedGrid; public int Length @@ -81814,12 +81814,12 @@ namespace OpenMetaverse.Packets /// public class SoundDataBlock { - public LLUUID SoundID; - public LLUUID OwnerID; - public LLUUID ObjectID; - public LLUUID ParentID; + public UUID SoundID; + public UUID OwnerID; + public UUID ObjectID; + public UUID ParentID; public ulong Handle; - public LLVector3 Position; + public Vector3 Position; public float Gain; public int Length diff --git a/Programs/AvatarPreview/GLMesh.cs b/Programs/AvatarPreview/GLMesh.cs index 6d5c663a..9cb36677 100644 --- a/Programs/AvatarPreview/GLMesh.cs +++ b/Programs/AvatarPreview/GLMesh.cs @@ -43,7 +43,7 @@ namespace AvatarPreview public float[] Vertices; public ushort[] Indices; public float[] TexCoords; - public LLVector3 Center; + public Vector3 Center; } public GLData RenderData; @@ -88,7 +88,7 @@ namespace AvatarPreview } // Calculate the center-point from the bounding box edges - RenderData.Center = new LLVector3((minX + maxX) / 2, (minY + maxY) / 2, (minZ + maxZ) / 2); + RenderData.Center = new Vector3((minX + maxX) / 2, (minY + maxY) / 2, (minZ + maxZ) / 2); // Generate the index array RenderData.Indices = new ushort[_numFaces * 3]; diff --git a/Programs/AvatarPreview/frmAvatar.cs b/Programs/AvatarPreview/frmAvatar.cs index 964921c3..bc898a39 100644 --- a/Programs/AvatarPreview/frmAvatar.cs +++ b/Programs/AvatarPreview/frmAvatar.cs @@ -196,7 +196,7 @@ namespace AvatarPreview Glu.gluPerspective(50.0d, 1.0d, 0.001d, 50d); - LLVector3 center = LLVector3.Zero; + Vector3 center = Vector3.Zero; GLMesh head, lowerBody; if (_meshes.TryGetValue("headMesh", out head) && _meshes.TryGetValue("lowerBodyMesh", out lowerBody)) center = (head.RenderData.Center + lowerBody.RenderData.Center) / 2f; diff --git a/Programs/GridImageUpload/frmGridImageUpload.cs b/Programs/GridImageUpload/frmGridImageUpload.cs index e191f060..5914392d 100644 --- a/Programs/GridImageUpload/frmGridImageUpload.cs +++ b/Programs/GridImageUpload/frmGridImageUpload.cs @@ -18,8 +18,8 @@ namespace GridImageUpload private byte[] UploadData = null; private int Transferred = 0; private string FileName = String.Empty; - private LLUUID SendToID; - private LLUUID AssetID; + private UUID SendToID; + private UUID AssetID; public frmGridImageUpload() { @@ -237,17 +237,17 @@ namespace GridImageUpload private void cmdUpload_Click(object sender, EventArgs e) { - SendToID = LLUUID.Zero; + SendToID = UUID.Zero; string sendTo = txtSendtoName.Text.Trim(); if (sendTo.Length > 0) { AutoResetEvent lookupEvent = new AutoResetEvent(false); - LLUUID thisQueryID = LLUUID.Random(); + UUID thisQueryID = UUID.Random(); bool lookupSuccess = false; DirectoryManager.DirPeopleReplyCallback callback = - delegate(LLUUID queryID, List matchedPeople) + delegate(UUID queryID, List matchedPeople) { if (queryID == thisQueryID) { @@ -299,7 +299,7 @@ namespace GridImageUpload } }, - delegate(bool success, string status, LLUUID itemID, LLUUID assetID) + delegate(bool success, string status, UUID itemID, UUID assetID) { if (this.InvokeRequired) BeginInvoke(new MethodInvoker(EnableControls)); @@ -329,7 +329,7 @@ namespace GridImageUpload // FIXME: We should be watching the callback for RequestUpdateItem instead of a dumb sleep System.Threading.Thread.Sleep(2000); - if (SendToID != LLUUID.Zero) + if (SendToID != UUID.Zero) { Logger.Log("Sending item to " + SendToID.ToString(), Helpers.LogLevel.Info, Client); Client.Inventory.GiveItem(itemID, name, AssetType.Texture, SendToID, true); diff --git a/Programs/GridProxy/GridProxyLoader.cs b/Programs/GridProxy/GridProxyLoader.cs index 1cf87aed..f8d2de2b 100644 --- a/Programs/GridProxy/GridProxyLoader.cs +++ b/Programs/GridProxy/GridProxyLoader.cs @@ -18,9 +18,9 @@ namespace GridProxy { public Proxy proxy; private Dictionary commandDelegates = new Dictionary(); - private LLUUID agentID; - private LLUUID sessionID; - private LLUUID inventoryRoot; + private UUID agentID; + private UUID sessionID; + private UUID inventoryRoot; private bool logLogin = false; private string[] args; @@ -31,17 +31,17 @@ namespace GridProxy get { return args; } } - public LLUUID AgentID + public UUID AgentID { get { return agentID; } } - public LLUUID SessionID + public UUID SessionID { get { return sessionID; } } - public LLUUID InventoryRoot + public UUID InventoryRoot { get { return inventoryRoot; } } @@ -144,12 +144,12 @@ namespace GridProxy { System.Collections.Hashtable values = (System.Collections.Hashtable)response.Value; if (values.Contains("agent_id")) - agentID = new LLUUID((string)values["agent_id"]); + agentID = new UUID((string)values["agent_id"]); if (values.Contains("session_id")) - sessionID = new LLUUID((string)values["session_id"]); + sessionID = new UUID((string)values["session_id"]); if (values.Contains("inventory-root")) { - inventoryRoot = new LLUUID( + inventoryRoot = new UUID( (string)((System.Collections.Hashtable)(((System.Collections.ArrayList)values["inventory-root"])[0]))["folder_id"] ); Console.WriteLine("inventory root: " + inventoryRoot); @@ -188,12 +188,12 @@ namespace GridProxy { ChatFromSimulatorPacket packet = new ChatFromSimulatorPacket(); packet.ChatData.FromName = Helpers.StringToField("GridProxy"); - packet.ChatData.SourceID = LLUUID.Random(); + packet.ChatData.SourceID = UUID.Random(); packet.ChatData.OwnerID = agentID; packet.ChatData.SourceType = (byte)2; packet.ChatData.ChatType = (byte)1; packet.ChatData.Audible = (byte)1; - packet.ChatData.Position = new LLVector3(0, 0, 0); + packet.ChatData.Position = new Vector3(0, 0, 0); packet.ChatData.Message = Helpers.StringToField(message); proxy.InjectPacket(packet, Direction.Incoming); } diff --git a/Programs/GridProxy/Plugins/Analyst.cs b/Programs/GridProxy/Plugins/Analyst.cs index 1f2aa22b..6a7c3ca6 100644 --- a/Programs/GridProxy/Plugins/Analyst.cs +++ b/Programs/GridProxy/Plugins/Analyst.cs @@ -362,7 +362,7 @@ public class Analyst : ProxyPlugin if (lineValue == "$Value") fval = MagicCast(name, block, lineField, value); else if (lineValue == "$UUID") - fval = LLUUID.Random(); + fval = UUID.Random(); else if (lineValue == "$AgentID") fval = frame.AgentID; else if (lineValue == "$SessionID") @@ -412,12 +412,12 @@ public class Analyst : ProxyPlugin { ChatFromSimulatorPacket packet = new ChatFromSimulatorPacket(); packet.ChatData.FromName = Helpers.StringToField("Analyst"); - packet.ChatData.SourceID = LLUUID.Random(); + packet.ChatData.SourceID = UUID.Random(); packet.ChatData.OwnerID = frame.AgentID; packet.ChatData.SourceType = (byte)2; packet.ChatData.ChatType = (byte)1; packet.ChatData.Audible = (byte)1; - packet.ChatData.Position = new LLVector3(0, 0, 0); + packet.ChatData.Position = new Vector3(0, 0, 0); packet.ChatData.Message = Helpers.StringToField(message); proxy.InjectPacket(packet, Direction.Incoming); } @@ -521,9 +521,9 @@ public class Analyst : ProxyPlugin { return Convert.ToDouble(value); } - else if (fieldClass == typeof(LLUUID)) + else if (fieldClass == typeof(UUID)) { - return new LLUUID(value); + return new UUID(value); } else if (fieldClass == typeof(bool)) { @@ -538,34 +538,34 @@ public class Analyst : ProxyPlugin { return Helpers.StringToField(value); } - else if (fieldClass == typeof(LLVector3)) + else if (fieldClass == typeof(Vector3)) { - LLVector3 result; - if(LLVector3.TryParse(value, out result)) + Vector3 result; + if(Vector3.TryParse(value, out result)) return result; else throw new Exception(); } - else if (fieldClass == typeof(LLVector3d)) + else if (fieldClass == typeof(Vector3d)) { - LLVector3d result; - if (LLVector3d.TryParse(value, out result)) + Vector3d result; + if (Vector3d.TryParse(value, out result)) return result; else throw new Exception(); } - else if (fieldClass == typeof(LLVector4)) + else if (fieldClass == typeof(Vector4)) { - LLVector4 result; - if (LLVector4.TryParse(value, out result)) + Vector4 result; + if (Vector4.TryParse(value, out result)) return result; else throw new Exception(); } - else if (fieldClass == typeof(LLQuaternion)) + else if (fieldClass == typeof(Quaternion)) { - LLQuaternion result; - if (LLQuaternion.TryParse(value, out result)) + Quaternion result; + if (Quaternion.TryParse(value, out result)) return result; else throw new Exception(); diff --git a/Programs/GridProxy/Plugins/ClientAO.cs b/Programs/GridProxy/Plugins/ClientAO.cs index ff6d6442..e4c875bc 100644 --- a/Programs/GridProxy/Plugins/ClientAO.cs +++ b/Programs/GridProxy/Plugins/ClientAO.cs @@ -45,7 +45,7 @@ public class ClientAO : ProxyPlugin { private ProxyFrame frame; private Proxy proxy; - private LLUUID[] wetikonanims = { + private UUID[] wetikonanims = { Animations.WALK, Animations.RUN, Animations.CROUCHWALK, @@ -69,10 +69,10 @@ public class ClientAO : ProxyPlugin Animations.STANDUP, Animations.FLYSLOW, Animations.SIT_GROUND_staticRAINED, - LLUUID.Zero, //swimming doesnt exist - LLUUID.Zero, - LLUUID.Zero, - LLUUID.Zero + UUID.Zero, //swimming doesnt exist + UUID.Zero, + UUID.Zero, + UUID.Zero }; private string[] wetikonanimnames = { @@ -105,7 +105,7 @@ public class ClientAO : ProxyPlugin "swim (ignored)" }; - private Dictionary animuid2name; + private Dictionary animuid2name; //private Assembly libslAssembly; @@ -165,26 +165,26 @@ public class ClientAO : ProxyPlugin //map of built in SL animations and their overrides - private Dictionary overrides = new Dictionary(); + private Dictionary overrides = new Dictionary(); //list of animations currently running - private Dictionary SignaledAnimations = new Dictionary(); + private Dictionary SignaledAnimations = new Dictionary(); //playing status of animations'override animation - private Dictionary overrideanimationisplaying; + private Dictionary overrideanimationisplaying; //Current inventory path search string[] searchPath; //Search level int searchLevel; //Current folder - LLUUID currentFolder; + UUID currentFolder; // Number of directory descendents received int nbdescendantsreceived; //List of items in the current folder Dictionary currentFolderItems; //Asset download request ID - LLUUID assetdownloadID; + UUID assetdownloadID; //Downloaded bytes so far int downloadedbytes; //size of download @@ -264,7 +264,7 @@ public class ClientAO : ProxyPlugin // remove the delegate to track agent movements proxy.RemoveDelegate(PacketType.AvatarAnimation, Direction.Incoming, this.packetDelegate); //Stop all override animations - foreach (LLUUID tmp in overrides.Values) + foreach (UUID tmp in overrides.Values) { Animate(tmp, false); } @@ -273,7 +273,7 @@ public class ClientAO : ProxyPlugin // Inventory functions //start requesting an item by its path - public void RequestFindObjectByPath(LLUUID baseFolder, string path) + public void RequestFindObjectByPath(UUID baseFolder, string path) { if (path == null || path.Length == 0) throw new ArgumentException("Empty path is not supported"); @@ -291,7 +291,7 @@ public class ClientAO : ProxyPlugin } //request a folder content - public void RequestFolderContents(LLUUID folder, bool folders, bool items, + public void RequestFolderContents(UUID folder, bool folders, bool items, InventorySortOrder order) { //empty the dictionnary containing current folder items by name @@ -324,7 +324,7 @@ public class ClientAO : ProxyPlugin { //SayToUser("nb descendents: " + reply.AgentData.Descendents); //this packet concerns the folder we asked for - if (reply.FolderData[0].FolderID != LLUUID.Zero + if (reply.FolderData[0].FolderID != UUID.Zero && searchLevel < searchPath.Length - 1) { nbdescendantsreceived += reply.FolderData.Length; @@ -373,7 +373,7 @@ public class ClientAO : ProxyPlugin nbdescendantsreceived += reply.FolderData.Length; //SayToUser("nb received: " + nbdescendantsreceived); } - if (reply.ItemData[0].ItemID != LLUUID.Zero + if (reply.ItemData[0].ItemID != UUID.Zero && searchLevel == searchPath.Length - 1) { //there are items returned and we are looking for one @@ -386,7 +386,7 @@ public class ClientAO : ProxyPlugin //we are going to store info on all items. we'll need //it to get the asset ID of animations refered to by the //configuration notecard - if (reply.ItemData[i].ItemID != LLUUID.Zero) + if (reply.ItemData[i].ItemID != UUID.Zero) { InventoryItem item = CreateInventoryItem((InventoryType)reply.ItemData[i].InvType, reply.ItemData[i].ItemID); item.ParentUUID = reply.ItemData[i].FolderID; @@ -465,7 +465,7 @@ public class ClientAO : ProxyPlugin } } - public static InventoryItem CreateInventoryItem(InventoryType type, LLUUID id) + public static InventoryItem CreateInventoryItem(InventoryType type, UUID id) { switch (type) { @@ -487,21 +487,21 @@ public class ClientAO : ProxyPlugin } //Ask for download of an item - public LLUUID RequestInventoryAsset(InventoryItem item) + public UUID RequestInventoryAsset(InventoryItem item) { // Build the request packet and send it TransferRequestPacket request = new TransferRequestPacket(); request.TransferInfo.ChannelType = (int)ChannelType.Asset; request.TransferInfo.Priority = 101.0f; request.TransferInfo.SourceType = (int)SourceType.SimInventoryItem; - LLUUID transferID = LLUUID.Random(); + UUID transferID = UUID.Random(); request.TransferInfo.TransferID = transferID; byte[] paramField = new byte[100]; Buffer.BlockCopy(frame.AgentID.GetBytes(), 0, paramField, 0, 16); Buffer.BlockCopy(frame.SessionID.GetBytes(), 0, paramField, 16, 16); Buffer.BlockCopy(item.OwnerID.GetBytes(), 0, paramField, 32, 16); - Buffer.BlockCopy(LLUUID.Zero.GetBytes(), 0, paramField, 48, 16); + Buffer.BlockCopy(UUID.Zero.GetBytes(), 0, paramField, 48, 16); Buffer.BlockCopy(item.UUID.GetBytes(), 0, paramField, 64, 16); Buffer.BlockCopy(item.AssetUUID.GetBytes(), 0, paramField, 80, 16); Buffer.BlockCopy(Helpers.IntToBytes((int)item.AssetType), 0, paramField, 96, 4); @@ -528,18 +528,18 @@ public class ClientAO : ProxyPlugin { ChatFromSimulatorPacket packet = new ChatFromSimulatorPacket(); packet.ChatData.FromName = Helpers.StringToField("ClientAO"); - packet.ChatData.SourceID = LLUUID.Random(); + packet.ChatData.SourceID = UUID.Random(); packet.ChatData.OwnerID = frame.AgentID; packet.ChatData.SourceType = (byte)2; packet.ChatData.ChatType = (byte)1; packet.ChatData.Audible = (byte)1; - packet.ChatData.Position = new LLVector3(0, 0, 0); + packet.ChatData.Position = new Vector3(0, 0, 0); packet.ChatData.Message = Helpers.StringToField(message); proxy.InjectPacket(packet, Direction.Incoming); } //start or stop an animation - public void Animate(LLUUID animationuuid, bool run) + public void Animate(UUID animationuuid, bool run) { AgentAnimationPacket animate = new AgentAnimationPacket(); animate.Header.Reliable = true; @@ -556,7 +556,7 @@ public class ClientAO : ProxyPlugin } //return the name of an animation by its UUID - private string animname(LLUUID arg) + private string animname(UUID arg) { return animuid2name[arg]; } @@ -575,7 +575,7 @@ public class ClientAO : ProxyPlugin //fill it with the fresh list from simulator for (int i = 0; i < animation.AnimationList.Length; i++) { - LLUUID animID = animation.AnimationList[i].AnimID; + UUID animID = animation.AnimationList[i].AnimID; int sequenceID = animation.AnimationList[i].AnimSequenceID; // Add this animation to the list of currently signaled animations @@ -586,7 +586,7 @@ public class ClientAO : ProxyPlugin //we now have a list of currently running animations //Start override animations if necessary - foreach (LLUUID key in overrides.Keys) + foreach (UUID key in overrides.Keys) { //For each overriden animation key, test if its override is running if (SignaledAnimations.ContainsKey(key) && (!overrideanimationisplaying[key] )) @@ -677,11 +677,11 @@ public class ClientAO : ProxyPlugin private void loadWetIkon(string config) { //Reinitialise override table - overrides = new Dictionary(); - overrideanimationisplaying = new Dictionary(); + overrides = new Dictionary(); + overrideanimationisplaying = new Dictionary(); - animuid2name = new Dictionary(); - foreach (LLUUID key in wetikonanims ) + animuid2name = new Dictionary(); + foreach (UUID key in wetikonanims ) { animuid2name[key] = wetikonanimnames[Array.IndexOf(wetikonanims, key)]; } @@ -701,8 +701,8 @@ public class ClientAO : ProxyPlugin { if (currentFolderItems.ContainsKey(animname)) { - LLUUID over = currentFolderItems[animname].AssetUUID; - LLUUID orig = wetikonanims[((i + 1) / 2) - 1]; + UUID over = currentFolderItems[animname].AssetUUID; + UUID orig = wetikonanims[((i + 1) / 2) - 1]; //put it in overrides animuid2name[over] = animname; overrides[orig] = over; diff --git a/Programs/PrimWorkshop/TexturePipeline.cs b/Programs/PrimWorkshop/TexturePipeline.cs index 14dd9a80..d80c9cc8 100644 --- a/Programs/PrimWorkshop/TexturePipeline.cs +++ b/Programs/PrimWorkshop/TexturePipeline.cs @@ -25,11 +25,11 @@ namespace PrimWorkshop { class TaskInfo { - public LLUUID RequestID; + public UUID RequestID; public int RequestNbr; - public TaskInfo(LLUUID reqID, int reqNbr) + public TaskInfo(UUID reqID, int reqNbr) { RequestID = reqID; RequestNbr = reqNbr; @@ -44,10 +44,10 @@ namespace PrimWorkshop private static GridClient Client; // queue for requested images - private Queue RequestQueue; + private Queue RequestQueue; // list of current requests in process - private Dictionary CurrentRequests; + private Dictionary CurrentRequests; private static AutoResetEvent[] resetEvents; @@ -63,7 +63,7 @@ namespace PrimWorkshop } // storage for images ready to render - private Dictionary RenderReady; + private Dictionary RenderReady; // maximum allowed concurrent requests at once const int MAX_TEXTURE_REQUESTS = 3; @@ -73,14 +73,14 @@ namespace PrimWorkshop /// /// /// - public delegate void DownloadFinishedCallback(LLUUID id, bool success); + public delegate void DownloadFinishedCallback(UUID id, bool success); /// /// /// /// /// /// - public delegate void DownloadProgressCallback(LLUUID image, int recieved, int total); + public delegate void DownloadProgressCallback(UUID image, int recieved, int total); /// Fired when a texture download completes public event DownloadFinishedCallback OnDownloadFinished; @@ -101,10 +101,10 @@ namespace PrimWorkshop { Running = true; - RequestQueue = new Queue(); - CurrentRequests = new Dictionary(MAX_TEXTURE_REQUESTS); + RequestQueue = new Queue(); + CurrentRequests = new Dictionary(MAX_TEXTURE_REQUESTS); - RenderReady = new Dictionary(); + RenderReady = new Dictionary(); resetEvents = new AutoResetEvent[MAX_TEXTURE_REQUESTS]; threadpoolSlots = new int[MAX_TEXTURE_REQUESTS]; @@ -147,7 +147,7 @@ namespace PrimWorkshop /// containing texture key which can be used to retrieve texture with GetTextureToRender method /// /// id of Texture to request - public void RequestTexture(LLUUID textureID) + public void RequestTexture(UUID textureID) { if (Client.Assets.Cache.HasImage(textureID)) { @@ -188,7 +188,7 @@ namespace PrimWorkshop /// /// Texture ID /// ImageDownload object - public ImageDownload GetTextureToRender(LLUUID textureID) + public ImageDownload GetTextureToRender(UUID textureID) { ImageDownload renderable = new ImageDownload(); lock (RenderReady) @@ -209,7 +209,7 @@ namespace PrimWorkshop /// Remove no longer necessary texture from dictionary /// /// - public void RemoveFromPipeline(LLUUID textureID) + public void RemoveFromPipeline(UUID textureID) { lock (RenderReady) { @@ -243,7 +243,7 @@ namespace PrimWorkshop if (reqNbr != -1) { - LLUUID requestID; + UUID requestID; lock (RequestQueue) requestID = RequestQueue.Dequeue(); @@ -332,7 +332,7 @@ namespace PrimWorkshop } } - private void Assets_OnImageReceiveProgress(LLUUID image, int recieved, int total) + private void Assets_OnImageReceiveProgress(UUID image, int recieved, int total) { if (OnDownloadProgress != null) { diff --git a/Programs/PrimWorkshop/frmBrowser.cs b/Programs/PrimWorkshop/frmBrowser.cs index 2eee26de..fd98104c 100644 --- a/Programs/PrimWorkshop/frmBrowser.cs +++ b/Programs/PrimWorkshop/frmBrowser.cs @@ -28,7 +28,7 @@ namespace PrimWorkshop Camera Camera; Dictionary RenderFoliageList = new Dictionary(); Dictionary RenderPrimList = new Dictionary(); - Dictionary DownloadList = new Dictionary(); + Dictionary DownloadList = new Dictionary(); EventHandler IdleEvent; System.Timers.Timer ProgressTimer; @@ -36,7 +36,7 @@ namespace PrimWorkshop // Textures TexturePipeline TextureDownloader; - Dictionary Textures = new Dictionary(); + Dictionary Textures = new Dictionary(); // Terrain float MaxHeight = 0.1f; @@ -50,7 +50,7 @@ namespace PrimWorkshop uint LastHit = 0; // - LLVector3 PivotPosition = LLVector3.Zero; + Vector3 PivotPosition = Vector3.Zero; bool Pivoting = false; Point LastPivot; @@ -239,8 +239,8 @@ namespace PrimWorkshop private void InitCamera() { Camera = new Camera(); - Camera.Position = new LLVector3(128f, -192f, 90f); - Camera.FocalPoint = new LLVector3(128f, 128f, 0f); + Camera.Position = new Vector3(128f, -192f, 90f); + Camera.FocalPoint = new Vector3(128f, 128f, 0f); Camera.Zoom = 1.0d; Camera.Far = 512.0d; } @@ -331,7 +331,7 @@ namespace PrimWorkshop private bool ExportObjects(List primList, string fileName, out int prims, out int textures, out string error) { - List textureList = new List(); + List textureList = new List(); prims = 0; textures = 0; @@ -353,7 +353,7 @@ namespace PrimWorkshop for (int i = 0; i < prim.Textures.FaceTextures.Length; i++) { LLObject.TextureEntryFace face = prim.Textures.FaceTextures[i]; - if (face != null && face.TextureID != LLUUID.Zero && face.TextureID != LLObject.TextureEntry.WHITE_TEXTURE) + if (face != null && face.TextureID != UUID.Zero && face.TextureID != LLObject.TextureEntry.WHITE_TEXTURE) { if (!textureList.Contains(face.TextureID)) textureList.Add(face.TextureID); @@ -362,7 +362,7 @@ namespace PrimWorkshop } // Copy all of relevant textures from the cache to the temp directory - foreach (LLUUID texture in textureList) + foreach (UUID texture in textureList) { string tempFileName = Client.Assets.Cache.ImageFileName(texture); @@ -674,7 +674,7 @@ namespace PrimWorkshop int y = (int)(LastHit - TERRAIN_START) / 16; int x = (int)(LastHit - (TERRAIN_START + (y * 16))); - LLVector3 targetPos = new LLVector3(x * 16 + 8, y * 16 + 8, 0f); + Vector3 targetPos = new Vector3(x * 16 + 8, y * 16 + 8, 0f); Console.WriteLine("Starting local teleport to " + targetPos.ToString()); Client.Self.RequestTeleport(Client.Network.CurrentSim.Handle, targetPos); @@ -964,7 +964,7 @@ namespace PrimWorkshop } // Texture for this face - if (teFace.TextureID != LLUUID.Zero && + if (teFace.TextureID != UUID.Zero && teFace.TextureID != LLObject.TextureEntry.WHITE_TEXTURE) { lock (Textures) @@ -1124,38 +1124,38 @@ namespace PrimWorkshop } } - static readonly LLVector3[] SkyboxVerts = new LLVector3[] + static readonly Vector3[] SkyboxVerts = new Vector3[] { // Right side - new LLVector3( 10.0f, 10.0f, -10.0f ), //Top left - new LLVector3( 10.0f, 10.0f, 10.0f ), //Top right - new LLVector3( 10.0f, -10.0f, 10.0f ), //Bottom right - new LLVector3( 10.0f, -10.0f, -10.0f ), //Bottom left + new Vector3( 10.0f, 10.0f, -10.0f ), //Top left + new Vector3( 10.0f, 10.0f, 10.0f ), //Top right + new Vector3( 10.0f, -10.0f, 10.0f ), //Bottom right + new Vector3( 10.0f, -10.0f, -10.0f ), //Bottom left // Left side - new LLVector3( -10.0f, 10.0f, 10.0f ), //Top left - new LLVector3( -10.0f, 10.0f, -10.0f ), //Top right - new LLVector3( -10.0f, -10.0f, -10.0f ), //Bottom right - new LLVector3( -10.0f, -10.0f, 10.0f ), //Bottom left + new Vector3( -10.0f, 10.0f, 10.0f ), //Top left + new Vector3( -10.0f, 10.0f, -10.0f ), //Top right + new Vector3( -10.0f, -10.0f, -10.0f ), //Bottom right + new Vector3( -10.0f, -10.0f, 10.0f ), //Bottom left // Top side - new LLVector3( -10.0f, 10.0f, 10.0f ), //Top left - new LLVector3( 10.0f, 10.0f, 10.0f ), //Top right - new LLVector3( 10.0f, 10.0f, -10.0f ), //Bottom right - new LLVector3( -10.0f, 10.0f, -10.0f ), //Bottom left + new Vector3( -10.0f, 10.0f, 10.0f ), //Top left + new Vector3( 10.0f, 10.0f, 10.0f ), //Top right + new Vector3( 10.0f, 10.0f, -10.0f ), //Bottom right + new Vector3( -10.0f, 10.0f, -10.0f ), //Bottom left // Bottom side - new LLVector3( -10.0f, -10.0f, -10.0f ), //Top left - new LLVector3( 10.0f, -10.0f, -10.0f ), //Top right - new LLVector3( 10.0f, -10.0f, 10.0f ), //Bottom right - new LLVector3( -10.0f, -10.0f, 10.0f ), //Bottom left + new Vector3( -10.0f, -10.0f, -10.0f ), //Top left + new Vector3( 10.0f, -10.0f, -10.0f ), //Top right + new Vector3( 10.0f, -10.0f, 10.0f ), //Bottom right + new Vector3( -10.0f, -10.0f, 10.0f ), //Bottom left // Front side - new LLVector3( -10.0f, 10.0f, -10.0f ), //Top left - new LLVector3( 10.0f, 10.0f, -10.0f ), //Top right - new LLVector3( 10.0f, -10.0f, -10.0f ), //Bottom right - new LLVector3( -10.0f, -10.0f, -10.0f ), //Bottom left + new Vector3( -10.0f, 10.0f, -10.0f ), //Top left + new Vector3( 10.0f, 10.0f, -10.0f ), //Top right + new Vector3( 10.0f, -10.0f, -10.0f ), //Bottom right + new Vector3( -10.0f, -10.0f, -10.0f ), //Bottom left // Back side - new LLVector3( 10.0f, 10.0f, 10.0f ), //Top left - new LLVector3( -10.0f, 10.0f, 10.0f ), //Top right - new LLVector3( -10.0f, -10.0f, 10.0f ), //Bottom right - new LLVector3( 10.0f, -10.0f, 10.0f ), //Bottom left + new Vector3( 10.0f, 10.0f, 10.0f ), //Top left + new Vector3( -10.0f, 10.0f, 10.0f ), //Top right + new Vector3( -10.0f, -10.0f, 10.0f ), //Bottom right + new Vector3( 10.0f, -10.0f, 10.0f ), //Bottom left }; private void RenderSkybox() @@ -1299,7 +1299,7 @@ StartRender: { Face face = render.Mesh.Faces[j]; FaceData data = (FaceData)face.UserData; - LLColor color = face.TextureFace.RGBA; + Color4 color = face.TextureFace.RGBA; bool alpha = false; int textureID = 0; @@ -1322,7 +1322,7 @@ StartRender: else { if (face.TextureFace.TextureID == LLObject.TextureEntry.WHITE_TEXTURE || - face.TextureFace.TextureID == LLUUID.Zero) + face.TextureFace.TextureID == UUID.Zero) { Gl.glPolygonMode(Gl.GL_FRONT, Gl.GL_FILL); } @@ -1401,7 +1401,7 @@ StartRender: #region Texture Downloading - private void TextureDownloader_OnDownloadFinished(LLUUID id, bool success) + private void TextureDownloader_OnDownloadFinished(UUID id, bool success) { bool alpha = false; ManagedImage imgData = null; @@ -1490,7 +1490,7 @@ StartRender: } } - private void TextureDownloader_OnDownloadProgress(LLUUID image, int recieved, int total) + private void TextureDownloader_OnDownloadProgress(UUID image, int recieved, int total) { lock (DownloadList) { @@ -1677,7 +1677,7 @@ StartRender: int deltaY = (int)((mouse.Y - LastPivot.Y) * -0.5d); // Translate so the focal point is the origin - LLVector3 altered = Camera.Position - Camera.FocalPoint; + Vector3 altered = Camera.Position - Camera.FocalPoint; // Rotate the translated point by deltaX a = (float)deltaX * DEG_TO_RAD; @@ -1721,11 +1721,11 @@ StartRender: // Calculate the distance to move to/away float dist = (float)(e.Delta / 120) * 10.0f; - if (LLVector3.Dist(Camera.Position, Camera.FocalPoint) > dist) + if (Vector3.Dist(Camera.Position, Camera.FocalPoint) > dist) { // Move closer or further away from the focal point - LLVector3 toFocal = Camera.FocalPoint - Camera.Position; - toFocal = LLVector3.Norm(toFocal); + Vector3 toFocal = Camera.FocalPoint - Camera.Position; + toFocal = Vector3.Norm(toFocal); toFocal = toFocal * dist; @@ -1770,7 +1770,7 @@ StartRender: } string simName = txtSim.Text.Trim().ToLower(); - LLVector3 position = new LLVector3(x, y, z); + Vector3 position = new Vector3(x, y, z); if (Client != null && Client.Network.CurrentSim != null) { @@ -1850,8 +1850,8 @@ StartRender: public struct Camera { - public LLVector3 Position; - public LLVector3 FocalPoint; + public Vector3 Position; + public Vector3 FocalPoint; public double Zoom; public double Far; } @@ -1882,7 +1882,7 @@ StartRender: // | 2 6 10 14 | // | 3 7 11 15 | - public static float[] CreateTranslationMatrix(LLVector3 v) + public static float[] CreateTranslationMatrix(Vector3 v) { float[] mat = new float[16]; @@ -1894,7 +1894,7 @@ StartRender: return mat; } - public static float[] CreateRotationMatrix(LLQuaternion q) + public static float[] CreateRotationMatrix(Quaternion q) { float[] mat = new float[16]; @@ -1939,7 +1939,7 @@ StartRender: return mat; } - public static float[] CreateScaleMatrix(LLVector3 v) + public static float[] CreateScaleMatrix(Vector3 v) { float[] mat = new float[16]; diff --git a/Programs/PrimWorkshop/frmPrimWorkshop.cs b/Programs/PrimWorkshop/frmPrimWorkshop.cs index 7c3c4386..6a1183e9 100644 --- a/Programs/PrimWorkshop/frmPrimWorkshop.cs +++ b/Programs/PrimWorkshop/frmPrimWorkshop.cs @@ -103,7 +103,7 @@ namespace PrimWorkshop else Gl.glPolygonMode(Gl.GL_FRONT, Gl.GL_FILL); - LLVector3 center = LLVector3.Zero; + Vector3 center = Vector3.Zero; Glu.gluLookAt( center.X, (double)scrollZoom.Value * 0.1d + center.Y, center.Z, @@ -146,7 +146,7 @@ namespace PrimWorkshop // Using euler angles because I have no clue what I'm doing float roll, pitch, yaw; - LLMatrix3 rotation = prim.Rotation.ToMatrix(); + Matrix3 rotation = prim.Rotation.ToMatrix(); rotation.GetEulerAngles(out roll, out pitch, out yaw); Gl.glRotatef(roll * 57.2957795f, 1f, 0f, 0f); @@ -280,7 +280,7 @@ namespace PrimWorkshop for (int i = 0; i < primList.Count; i++) { // TODO: Can't render sculpted prims without the textures - if (primList[i].Sculpt.SculptTexture != LLUUID.Zero) + if (primList[i].Sculpt.SculptTexture != UUID.Zero) continue; Primitive prim = primList[i]; @@ -360,7 +360,7 @@ namespace PrimWorkshop } } - private bool LoadTexture(string basePath, LLUUID textureID, ref System.Drawing.Image texture) + private bool LoadTexture(string basePath, UUID textureID, ref System.Drawing.Image texture) { if (File.Exists(textureID.ToString() + ".tga")) { diff --git a/Programs/PrimWorkshop/meshtoobj.cs b/Programs/PrimWorkshop/meshtoobj.cs index 01617eb9..70bef77c 100644 --- a/Programs/PrimWorkshop/meshtoobj.cs +++ b/Programs/PrimWorkshop/meshtoobj.cs @@ -65,7 +65,7 @@ namespace PrimWorkshop mtl.AppendLine("Tr " + tex.RGBA.A); mtl.AppendLine("Ns " + shiny); mtl.AppendLine("illum 1"); - if (tex.TextureID != LLUUID.Zero && tex.TextureID != LLObject.TextureEntry.WHITE_TEXTURE) + if (tex.TextureID != UUID.Zero && tex.TextureID != LLObject.TextureEntry.WHITE_TEXTURE) mtl.AppendLine("map_Kd ./" + texName); mtl.AppendLine(); @@ -76,7 +76,7 @@ namespace PrimWorkshop #region Vertex - LLVector3 pos = vertex.Position; + Vector3 pos = vertex.Position; // Apply scaling pos *= mesh.Prim.Scale; diff --git a/Programs/examples/GUITestClient/Interfaces/MinimapInterface.cs b/Programs/examples/GUITestClient/Interfaces/MinimapInterface.cs index 2cb98e94..022b0f5c 100644 --- a/Programs/examples/GUITestClient/Interfaces/MinimapInterface.cs +++ b/Programs/examples/GUITestClient/Interfaces/MinimapInterface.cs @@ -61,7 +61,7 @@ namespace OpenMetaverse.GUITestClient // Draw all avatars Client.Network.CurrentSim.AvatarPositions.ForEach( - delegate(LLVector3 pos) + delegate(Vector3 pos) { Rectangle rect = new Rectangle((int)Math.Round(pos.X, 0) - 2, 255 - ((int)Math.Round(pos.Y, 0) - 2), 4, 4); g.FillEllipse(mAvBrush, rect); diff --git a/Programs/examples/GUITestClient/Interfaces/TeleportInterface.cs b/Programs/examples/GUITestClient/Interfaces/TeleportInterface.cs index 68ca6919..ef4cf5aa 100644 --- a/Programs/examples/GUITestClient/Interfaces/TeleportInterface.cs +++ b/Programs/examples/GUITestClient/Interfaces/TeleportInterface.cs @@ -61,7 +61,7 @@ namespace OpenMetaverse.GUITestClient goto error_handler; } - if (Client.Self.Teleport(sim, new LLVector3(x, y, z))) + if (Client.Self.Teleport(sim, new Vector3(x, y, z))) MessageBox.Show("Teleported to " + Client.Network.CurrentSim, "Teleport"); else MessageBox.Show("Teleport failed: " + Client.Self.TeleportMessage, "Teleport"); diff --git a/Programs/examples/GridAccountant/frmGridAccountant.cs b/Programs/examples/GridAccountant/frmGridAccountant.cs index 7cb7bbc2..88bb3656 100644 --- a/Programs/examples/GridAccountant/frmGridAccountant.cs +++ b/Programs/examples/GridAccountant/frmGridAccountant.cs @@ -422,7 +422,7 @@ namespace GridAccountant appearance.AgentData.AgentID = Client.Self.AgentID; appearance.AgentData.SessionID = Client.Self.SessionID; appearance.AgentData.SerialNum = 1; - appearance.AgentData.Size = new LLVector3(0.45F, 0.6F, 1.831094F); + appearance.AgentData.Size = new Vector3(0.45F, 0.6F, 1.831094F); appearance.ObjectData.TextureEntry = new byte[0]; Client.Network.SendPacket(appearance); @@ -483,7 +483,7 @@ namespace GridAccountant query.AgentData.AgentID = Client.Self.AgentID; query.AgentData.SessionID = Client.Self.SessionID; query.QueryData.QueryFlags = 1; - query.QueryData.QueryID = LLUUID.Random(); + query.QueryData.QueryID = UUID.Random(); query.QueryData.QueryStart = 0; query.QueryData.QueryText = Helpers.StringToField(txtFind.Text); query.Header.Reliable = true; @@ -512,7 +512,7 @@ namespace GridAccountant return; } - Client.Self.GiveAvatarMoney(new LLUUID(lstFind.SelectedItems[0].SubItems[2].Text), + Client.Self.GiveAvatarMoney(new UUID(lstFind.SelectedItems[0].SubItems[2].Text), amount, "GridAccountant payment"); } } diff --git a/Programs/examples/TestClient/ClientManager.cs b/Programs/examples/TestClient/ClientManager.cs index 8c34446d..a3ec9f98 100644 --- a/Programs/examples/TestClient/ClientManager.cs +++ b/Programs/examples/TestClient/ClientManager.cs @@ -16,7 +16,7 @@ namespace OpenMetaverse.TestClient public string StartLocation; public bool GroupCommands; public string MasterName; - public LLUUID MasterKey; + public UUID MasterKey; public string URI; } @@ -38,7 +38,7 @@ namespace OpenMetaverse.TestClient public class ClientManager { - public Dictionary Clients = new Dictionary(); + public Dictionary Clients = new Dictionary(); public Dictionary> SimPrims = new Dictionary>(); public bool Running = true; @@ -106,7 +106,7 @@ namespace OpenMetaverse.TestClient if (client.Network.Login(loginParams)) { - if (account.MasterKey == LLUUID.Zero && !String.IsNullOrEmpty(account.MasterName)) + if (account.MasterKey == UUID.Zero && !String.IsNullOrEmpty(account.MasterName)) { // To prevent security issues, we must resolve the specified master name to a key. ManualResetEvent keyResolution = new ManualResetEvent(false); @@ -114,7 +114,7 @@ namespace OpenMetaverse.TestClient // Set up the callback that handles the search results: DirectoryManager.DirPeopleReplyCallback callback = - delegate (LLUUID queryID, List matches) { + delegate (UUID queryID, List matches) { // This may be called several times with additional search results. if (matches.Count > 0) { @@ -136,7 +136,7 @@ namespace OpenMetaverse.TestClient keyResolution.WaitOne(TimeSpan.FromSeconds(30), false); client.Directory.OnDirPeopleReply -= callback; - LLUUID masterKey = LLUUID.Zero; + UUID masterKey = UUID.Zero; string masterName = account.MasterName; lock (masterMatches) { if (masterMatches.Count == 1) { @@ -181,7 +181,7 @@ namespace OpenMetaverse.TestClient } while (read != null); // Do it until the user selects a master. } } - if (masterKey != LLUUID.Zero) + if (masterKey != UUID.Zero) { Console.WriteLine("\"{0}\" resolved to {1} ({2})", account.MasterName, masterName, masterKey); account.MasterName = masterName; @@ -238,7 +238,7 @@ namespace OpenMetaverse.TestClient { PrintPrompt(); string input = Console.ReadLine(); - DoCommandAll(input, LLUUID.Zero); + DoCommandAll(input, UUID.Zero); } foreach (GridClient client in Clients.Values) @@ -266,7 +266,7 @@ namespace OpenMetaverse.TestClient /// /// /// - public void DoCommandAll(string cmd, LLUUID fromAgentID) + public void DoCommandAll(string cmd, UUID fromAgentID) { string[] tokens = cmd.Trim().Split(new char[] { ' ', '\t' }); string firstToken = tokens[0].ToLower(); @@ -290,7 +290,7 @@ namespace OpenMetaverse.TestClient else { // make a copy of the clients list so that it can be iterated without fear of being changed during iteration - Dictionary clientsCopy = new Dictionary(Clients); + Dictionary clientsCopy = new Dictionary(Clients); foreach (TestClient client in clientsCopy.Values) client.DoCommand(cmd, fromAgentID); @@ -313,7 +313,7 @@ namespace OpenMetaverse.TestClient public void LogoutAll() { // make a copy of the clients list so that it can be iterated without fear of being changed during iteration - Dictionary clientsCopy = new Dictionary(Clients); + Dictionary clientsCopy = new Dictionary(Clients); foreach (TestClient client in clientsCopy.Values) Logout(client); diff --git a/Programs/examples/TestClient/Command.cs b/Programs/examples/TestClient/Command.cs index 3d10c175..18c5a140 100644 --- a/Programs/examples/TestClient/Command.cs +++ b/Programs/examples/TestClient/Command.cs @@ -12,7 +12,7 @@ namespace OpenMetaverse.TestClient public string Description; public TestClient Client; - public abstract string Execute(string[] args, LLUUID fromAgentID); + public abstract string Execute(string[] args, UUID fromAgentID); /// /// When set to true, think will be called. diff --git a/Programs/examples/TestClient/Commands/Appearance/AppearanceCommand.cs b/Programs/examples/TestClient/Commands/Appearance/AppearanceCommand.cs index e45cd178..b8f4d040 100644 --- a/Programs/examples/TestClient/Commands/Appearance/AppearanceCommand.cs +++ b/Programs/examples/TestClient/Commands/Appearance/AppearanceCommand.cs @@ -15,7 +15,7 @@ namespace OpenMetaverse.TestClient Description = "Set your current appearance to your last saved appearance"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { bool success = false; diff --git a/Programs/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs b/Programs/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs index 8e3d1b02..9be2e4ac 100644 --- a/Programs/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs +++ b/Programs/examples/TestClient/Commands/Appearance/AttachmentsCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient Description = "Prints a list of the currently known agent attachments"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { List attachments = Client.Network.CurrentSim.ObjectsPrimitives.FindAll( delegate(Primitive prim) { return prim.ParentID == Client.Self.LocalID; } diff --git a/Programs/examples/TestClient/Commands/Appearance/AvatarInfoCommand.cs b/Programs/examples/TestClient/Commands/Appearance/AvatarInfoCommand.cs index 6ba3f6f1..883d832a 100644 --- a/Programs/examples/TestClient/Commands/Appearance/AvatarInfoCommand.cs +++ b/Programs/examples/TestClient/Commands/Appearance/AvatarInfoCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient.Commands.Appearance Description = "Print out information on a nearby avatar. Usage: avatarinfo [firstname] [lastname]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 2) return "Usage: avatarinfo [firstname] [lastname]"; diff --git a/Programs/examples/TestClient/Commands/Appearance/CloneCommand.cs b/Programs/examples/TestClient/Commands/Appearance/CloneCommand.cs index bf304350..4fba64af 100644 --- a/Programs/examples/TestClient/Commands/Appearance/CloneCommand.cs +++ b/Programs/examples/TestClient/Commands/Appearance/CloneCommand.cs @@ -16,7 +16,7 @@ namespace OpenMetaverse.TestClient Description = "Clone the appearance of a nearby avatar. Usage: clone [name]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { string targetName = String.Empty; List matches; @@ -31,7 +31,7 @@ namespace OpenMetaverse.TestClient if (Client.Directory.PeopleSearch(DirectoryManager.DirFindFlags.People, targetName, 0, 1000 * 10, out matches) && matches.Count > 0) { - LLUUID target = matches[0].AgentID; + UUID target = matches[0].AgentID; targetName += String.Format(" ({0})", target); if (Client.Appearances.ContainsKey(target)) @@ -44,7 +44,7 @@ namespace OpenMetaverse.TestClient set.AgentData.AgentID = Client.Self.AgentID; set.AgentData.SessionID = Client.Self.SessionID; set.AgentData.SerialNum = SerialNum++; - set.AgentData.Size = new LLVector3(2f, 2f, 2f); // HACK + set.AgentData.Size = new Vector3(2f, 2f, 2f); // HACK set.WearableData = new AgentSetAppearancePacket.WearableDataBlock[0]; set.VisualParam = new AgentSetAppearancePacket.VisualParamBlock[appearance.VisualParam.Length]; diff --git a/Programs/examples/TestClient/Commands/Appearance/WearCommand.cs b/Programs/examples/TestClient/Commands/Appearance/WearCommand.cs index bf799f7f..300474ce 100644 --- a/Programs/examples/TestClient/Commands/Appearance/WearCommand.cs +++ b/Programs/examples/TestClient/Commands/Appearance/WearCommand.cs @@ -12,7 +12,7 @@ namespace OpenMetaverse.TestClient Description = "Wear an outfit folder from inventory. Usage: wear [outfit name] [nobake]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: wear [outfit name] eg: 'wear /My Outfit/Dance Party"; diff --git a/Programs/examples/TestClient/Commands/CloneProfileCommand.cs b/Programs/examples/TestClient/Commands/CloneProfileCommand.cs index 534f6957..9374ef0b 100644 --- a/Programs/examples/TestClient/Commands/CloneProfileCommand.cs +++ b/Programs/examples/TestClient/Commands/CloneProfileCommand.cs @@ -10,7 +10,7 @@ namespace OpenMetaverse.TestClient { Avatar.AvatarProperties Properties; Avatar.Interests Interests; - List Groups = new List(); + List Groups = new List(); bool ReceivedProperties = false; bool ReceivedInterests = false; bool ReceivedGroups = false; @@ -28,19 +28,19 @@ namespace OpenMetaverse.TestClient "destroy your existing profile! Usage: cloneprofile [targetuuid]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return Description; - LLUUID targetID; + UUID targetID; ReceivedProperties = false; ReceivedInterests = false; ReceivedGroups = false; try { - targetID = new LLUUID(args[0]); + targetID = new UUID(args[0]); } catch (Exception) { @@ -66,7 +66,7 @@ namespace OpenMetaverse.TestClient // break TestClient connectivity that might be relying on group authentication // Attempt to join all the groups - foreach (LLUUID groupID in Groups) + foreach (UUID groupID in Groups) { Client.Groups.RequestJoinGroup(groupID); } @@ -74,7 +74,7 @@ namespace OpenMetaverse.TestClient return "Synchronized our profile to the profile of " + targetID.ToString(); } - void Avatars_OnAvatarProperties(LLUUID avatarID, Avatar.AvatarProperties properties) + void Avatars_OnAvatarProperties(UUID avatarID, Avatar.AvatarProperties properties) { lock (ReceivedProfileEvent) { @@ -86,7 +86,7 @@ namespace OpenMetaverse.TestClient } } - void Avatars_OnAvatarInterests(LLUUID avatarID, Avatar.Interests interests) + void Avatars_OnAvatarInterests(UUID avatarID, Avatar.Interests interests) { lock (ReceivedProfileEvent) { @@ -98,7 +98,7 @@ namespace OpenMetaverse.TestClient } } - void Avatars_OnAvatarGroups(LLUUID avatarID, List groups) + void Avatars_OnAvatarGroups(UUID avatarID, List groups) { lock (ReceivedProfileEvent) { @@ -114,7 +114,7 @@ namespace OpenMetaverse.TestClient } } - void Groups_OnGroupJoined(LLUUID groupID, bool success) + void Groups_OnGroupJoined(UUID groupID, bool success) { Console.WriteLine(Client.ToString() + (success ? " joined " : " failed to join ") + groupID.ToString()); diff --git a/Programs/examples/TestClient/Commands/Communication/EchoMasterCommand.cs b/Programs/examples/TestClient/Commands/Communication/EchoMasterCommand.cs index ca4d4c83..5be11faa 100644 --- a/Programs/examples/TestClient/Commands/Communication/EchoMasterCommand.cs +++ b/Programs/examples/TestClient/Commands/Communication/EchoMasterCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Repeat everything that master says."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (!Active) { @@ -31,7 +31,7 @@ namespace OpenMetaverse.TestClient } void Self_OnChat(string message, ChatAudibleLevel audible, ChatType type, - ChatSourceType sourcetype, string fromName, LLUUID id, LLUUID ownerid, LLVector3 position) + ChatSourceType sourcetype, string fromName, UUID id, UUID ownerid, Vector3 position) { if (message.Length > 0 && Client.MasterKey == id) Client.Self.Chat(message, 0, ChatType.Normal); diff --git a/Programs/examples/TestClient/Commands/Communication/IMCommand.cs b/Programs/examples/TestClient/Commands/Communication/IMCommand.cs index 19e1aedf..911f00cf 100644 --- a/Programs/examples/TestClient/Commands/Communication/IMCommand.cs +++ b/Programs/examples/TestClient/Commands/Communication/IMCommand.cs @@ -10,7 +10,7 @@ namespace OpenMetaverse.TestClient { string ToAvatarName = String.Empty; ManualResetEvent NameSearchEvent = new ManualResetEvent(false); - Dictionary Name2Key = new Dictionary(); + Dictionary Name2Key = new Dictionary(); public ImCommand(TestClient testClient) { @@ -20,7 +20,7 @@ namespace OpenMetaverse.TestClient Description = "Instant message someone. Usage: im [firstname] [lastname] [message]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 3) return "Usage: im [firstname] [lastname] [message]"; @@ -37,14 +37,14 @@ namespace OpenMetaverse.TestClient if (!Name2Key.ContainsKey(ToAvatarName.ToLower())) { // Send the Query - Client.Avatars.RequestAvatarNameSearch(ToAvatarName, LLUUID.Random()); + Client.Avatars.RequestAvatarNameSearch(ToAvatarName, UUID.Random()); NameSearchEvent.WaitOne(6000, false); } if (Name2Key.ContainsKey(ToAvatarName.ToLower())) { - LLUUID id = Name2Key[ToAvatarName.ToLower()]; + UUID id = Name2Key[ToAvatarName.ToLower()]; Client.Self.InstantMessage(id, message); return "Instant Messaged " + id.ToString() + " with message: " + message; @@ -55,9 +55,9 @@ namespace OpenMetaverse.TestClient } } - void Avatars_OnAvatarNameSearch(LLUUID queryID, Dictionary avatars) + void Avatars_OnAvatarNameSearch(UUID queryID, Dictionary avatars) { - foreach (KeyValuePair kvp in avatars) + foreach (KeyValuePair kvp in avatars) { if (kvp.Value.ToLower() == ToAvatarName.ToLower()) { diff --git a/Programs/examples/TestClient/Commands/Communication/IMGroupCommand.cs b/Programs/examples/TestClient/Commands/Communication/IMGroupCommand.cs index 724dac0d..981716cf 100644 --- a/Programs/examples/TestClient/Commands/Communication/IMGroupCommand.cs +++ b/Programs/examples/TestClient/Commands/Communication/IMGroupCommand.cs @@ -8,7 +8,7 @@ namespace OpenMetaverse.TestClient { public class ImGroupCommand : Command { - LLUUID ToGroupID = LLUUID.Zero; + UUID ToGroupID = UUID.Zero; ManualResetEvent WaitForSessionStart = new ManualResetEvent(false); public ImGroupCommand(TestClient testClient) { @@ -17,14 +17,14 @@ namespace OpenMetaverse.TestClient Description = "Send an instant message to a group. Usage: imgroup [group_uuid] [message]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 2) return "Usage: imgroup [group_uuid] [message]"; - if (LLUUID.TryParse(args[0], out ToGroupID)) + if (UUID.TryParse(args[0], out ToGroupID)) { string message = String.Empty; for (int ct = 1; ct < args.Length; ct++) @@ -61,7 +61,7 @@ namespace OpenMetaverse.TestClient } } - void Self_OnGroupChatJoin(LLUUID groupChatSessionID, LLUUID tmpSessionID, bool success) + void Self_OnGroupChatJoin(UUID groupChatSessionID, UUID tmpSessionID, bool success) { if (success) { diff --git a/Programs/examples/TestClient/Commands/Communication/SayCommand.cs b/Programs/examples/TestClient/Commands/Communication/SayCommand.cs index 037f877c..3d7e99bb 100644 --- a/Programs/examples/TestClient/Commands/Communication/SayCommand.cs +++ b/Programs/examples/TestClient/Commands/Communication/SayCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient Description = "Say something. (usage: say (optional channel) whatever)"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { int channel = 0; int startIndex = 0; diff --git a/Programs/examples/TestClient/Commands/Communication/ShoutCommand.cs b/Programs/examples/TestClient/Commands/Communication/ShoutCommand.cs index 5b2d97e7..7e76ab8b 100644 --- a/Programs/examples/TestClient/Commands/Communication/ShoutCommand.cs +++ b/Programs/examples/TestClient/Commands/Communication/ShoutCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Shout something."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { int channel = 0; int startIndex = 0; diff --git a/Programs/examples/TestClient/Commands/Communication/WhisperCommand.cs b/Programs/examples/TestClient/Commands/Communication/WhisperCommand.cs index f043c056..8ffd07e4 100644 --- a/Programs/examples/TestClient/Commands/Communication/WhisperCommand.cs +++ b/Programs/examples/TestClient/Commands/Communication/WhisperCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Whisper something."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { int channel = 0; int startIndex = 0; diff --git a/Programs/examples/TestClient/Commands/DetectBotCommand.cs b/Programs/examples/TestClient/Commands/DetectBotCommand.cs index 427b9100..a14b6d03 100644 --- a/Programs/examples/TestClient/Commands/DetectBotCommand.cs +++ b/Programs/examples/TestClient/Commands/DetectBotCommand.cs @@ -14,12 +14,12 @@ namespace OpenMetaverse.TestClient testClient.Avatars.OnAvatarAppearance += new AvatarManager.AvatarAppearanceCallback(Avatars_OnAvatarAppearance); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { return "This command is always running"; } - void Avatars_OnAvatarAppearance(LLUUID avatarID, bool isTrial, LLObject.TextureEntryFace defaultTexture, LLObject.TextureEntryFace[] faceTextures, System.Collections.Generic.List visualParams) + void Avatars_OnAvatarAppearance(UUID avatarID, bool isTrial, LLObject.TextureEntryFace defaultTexture, LLObject.TextureEntryFace[] faceTextures, System.Collections.Generic.List visualParams) { if (IsNullOrZero(faceTextures[(int)AppearanceManager.TextureIndex.EyesBaked]) && IsNullOrZero(faceTextures[(int)AppearanceManager.TextureIndex.HeadBaked]) && @@ -33,7 +33,7 @@ namespace OpenMetaverse.TestClient private bool IsNullOrZero(LLObject.TextureEntryFace face) { - return (face == null || face.TextureID == LLUUID.Zero); + return (face == null || face.TextureID == UUID.Zero); } } } diff --git a/Programs/examples/TestClient/Commands/Friends/FriendsCommand.cs b/Programs/examples/TestClient/Commands/Friends/FriendsCommand.cs index b66a0dfb..8796a62f 100644 --- a/Programs/examples/TestClient/Commands/Friends/FriendsCommand.cs +++ b/Programs/examples/TestClient/Commands/Friends/FriendsCommand.cs @@ -32,7 +32,7 @@ namespace OpenMetaverse.TestClient /// The /// of the agent making the request /// - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { // initialize a StringBuilder object used to return the results StringBuilder sb = new StringBuilder(); diff --git a/Programs/examples/TestClient/Commands/Friends/MapFriendCommand.cs b/Programs/examples/TestClient/Commands/Friends/MapFriendCommand.cs index dff8f554..293409ca 100644 --- a/Programs/examples/TestClient/Commands/Friends/MapFriendCommand.cs +++ b/Programs/examples/TestClient/Commands/Friends/MapFriendCommand.cs @@ -16,20 +16,20 @@ namespace OpenMetaverse.TestClient Name = "mapfriend"; Description = "Show a friends location. Usage: mapfriend UUID"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return Description; - LLUUID targetID; + UUID targetID; - if (!LLUUID.TryParse(args[0], out targetID)) + if (!UUID.TryParse(args[0], out targetID)) return Description; StringBuilder sb = new StringBuilder(); FriendsManager.FriendFoundEvent del = - delegate(LLUUID agentID, ulong regionHandle, LLVector3 location) + delegate(UUID agentID, ulong regionHandle, Vector3 location) { if (!regionHandle.Equals(0)) sb.AppendFormat("Found Friend {0} in {1} at {2}/{3}", agentID, regionHandle, location.X, location.Y); diff --git a/Programs/examples/TestClient/Commands/GoHome.cs b/Programs/examples/TestClient/Commands/GoHome.cs index 8ee8dba0..d7437299 100644 --- a/Programs/examples/TestClient/Commands/GoHome.cs +++ b/Programs/examples/TestClient/Commands/GoHome.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Teleports home"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if ( Client.Self.GoHome() ) { return "Teleport Home Succesful"; diff --git a/Programs/examples/TestClient/Commands/GotoLandmark.cs b/Programs/examples/TestClient/Commands/GotoLandmark.cs index e9c95bd3..b67a0513 100644 --- a/Programs/examples/TestClient/Commands/GotoLandmark.cs +++ b/Programs/examples/TestClient/Commands/GotoLandmark.cs @@ -14,15 +14,15 @@ namespace OpenMetaverse.TestClient Description = "Teleports to a Landmark. Usage: goto_landmark [UUID]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) { return "Usage: goto_landmark [UUID]"; } - LLUUID landmark = new LLUUID(); - if ( ! LLUUID.TryParse(args[0], out landmark) ) { + UUID landmark = new UUID(); + if ( ! UUID.TryParse(args[0], out landmark) ) { return "Invalid LLUID"; } else { Console.WriteLine("Teleporting to " + landmark.ToString()); diff --git a/Programs/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs b/Programs/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs index 1cf8a2ec..14ae2d00 100644 --- a/Programs/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs +++ b/Programs/examples/TestClient/Commands/Groups/ActivateGroupCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient public class ActivateGroupCommand : Command { ManualResetEvent GroupsEvent = new ManualResetEvent(false); - Dictionary groups = new Dictionary(); + Dictionary groups = new Dictionary(); string activeGroup; public ActivateGroupCommand(TestClient testClient) @@ -21,7 +21,7 @@ namespace OpenMetaverse.TestClient Name = "activategroup"; Description = "Set a group as active. Usage: activategroup GroupName"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return Description; @@ -73,7 +73,7 @@ namespace OpenMetaverse.TestClient return Client.ToString() + " doesn't seem member of any group"; } - void Groups_OnCurrentGroups(Dictionary cGroups) + void Groups_OnCurrentGroups(Dictionary cGroups) { groups = cGroups; GroupsEvent.Set(); diff --git a/Programs/examples/TestClient/Commands/Groups/GroupsCommand.cs b/Programs/examples/TestClient/Commands/Groups/GroupsCommand.cs index 17ae3315..2918fa29 100644 --- a/Programs/examples/TestClient/Commands/Groups/GroupsCommand.cs +++ b/Programs/examples/TestClient/Commands/Groups/GroupsCommand.cs @@ -10,7 +10,7 @@ namespace OpenMetaverse.TestClient public class GroupsCommand : Command { ManualResetEvent GetCurrentGroupsEvent = new ManualResetEvent(false); - Dictionary groups = new Dictionary(); + Dictionary groups = new Dictionary(); public GroupsCommand(TestClient testClient) { @@ -19,7 +19,7 @@ namespace OpenMetaverse.TestClient Name = "groups"; Description = "List avatar groups. Usage: groups"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (groups.Count == 0) { @@ -36,7 +36,7 @@ namespace OpenMetaverse.TestClient } } - void Groups_OnCurrentGroups(Dictionary pGroups) + void Groups_OnCurrentGroups(Dictionary pGroups) { groups = pGroups; GetCurrentGroupsEvent.Set(); diff --git a/Programs/examples/TestClient/Commands/Groups/JoinGroupCommand.cs b/Programs/examples/TestClient/Commands/Groups/JoinGroupCommand.cs index 04cab746..8800fb02 100644 --- a/Programs/examples/TestClient/Commands/Groups/JoinGroupCommand.cs +++ b/Programs/examples/TestClient/Commands/Groups/JoinGroupCommand.cs @@ -10,8 +10,8 @@ namespace OpenMetaverse.TestClient public class JoinGroupCommand : Command { ManualResetEvent GetGroupsSearchEvent = new ManualResetEvent(false); - private LLUUID queryID = LLUUID.Zero; - private LLUUID resolvedGroupID; + private UUID queryID = UUID.Zero; + private UUID resolvedGroupID; private string groupName; private string resolvedGroupName; private bool joinedGroup; @@ -22,13 +22,13 @@ namespace OpenMetaverse.TestClient Description = "join a group. Usage: joingroup GroupName | joingroup UUID GroupId"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return Description; groupName = String.Empty; - resolvedGroupID = LLUUID.Zero; + resolvedGroupID = UUID.Zero; resolvedGroupName = String.Empty; if (args[0].ToLower() == "uuid") @@ -36,7 +36,7 @@ namespace OpenMetaverse.TestClient if (args.Length < 2) return Description; - if (!LLUUID.TryParse((resolvedGroupName = groupName = args[1]), out resolvedGroupID)) + if (!UUID.TryParse((resolvedGroupName = groupName = args[1]), out resolvedGroupID)) return resolvedGroupName + " doesn't seem a valid UUID"; } else @@ -54,7 +54,7 @@ namespace OpenMetaverse.TestClient GetGroupsSearchEvent.Reset(); } - if (resolvedGroupID == LLUUID.Zero) + if (resolvedGroupID == UUID.Zero) { if (string.IsNullOrEmpty(resolvedGroupName)) return "Unable to obtain UUID for group " + groupName; @@ -80,7 +80,7 @@ namespace OpenMetaverse.TestClient return "Unable to join the group " + resolvedGroupName; } - void Groups_OnGroupJoined(LLUUID groupID, bool success) + void Groups_OnGroupJoined(UUID groupID, bool success) { Console.WriteLine(Client.ToString() + (success ? " joined " : " failed to join ") + groupID.ToString()); @@ -102,11 +102,11 @@ namespace OpenMetaverse.TestClient GetGroupsSearchEvent.Set(); } - void Directory_OnDirGroupsReply(LLUUID queryid, List matchedGroups) + void Directory_OnDirGroupsReply(UUID queryid, List matchedGroups) { if (queryID == queryid) { - queryID = LLUUID.Zero; + queryID = UUID.Zero; if (matchedGroups.Count < 1) { Console.WriteLine("ERROR: Got an empty reply"); diff --git a/Programs/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs b/Programs/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs index 68d7da5e..d19049ba 100644 --- a/Programs/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs +++ b/Programs/examples/TestClient/Commands/Groups/LeaveGroupCommand.cs @@ -10,7 +10,7 @@ namespace OpenMetaverse.TestClient public class LeaveGroupCommand : Command { ManualResetEvent GroupsEvent = new ManualResetEvent(false); - Dictionary groups = new Dictionary(); + Dictionary groups = new Dictionary(); private bool leftGroup; public LeaveGroupCommand(TestClient testClient) @@ -18,7 +18,7 @@ namespace OpenMetaverse.TestClient Name = "leavegroup"; Description = "Leave a group. Usage: leavegroup GroupName"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return Description; @@ -72,13 +72,13 @@ namespace OpenMetaverse.TestClient return Client.ToString() + " doesn't seem member of any group"; } - void Groups_OnCurrentGroups(Dictionary cGroups) + void Groups_OnCurrentGroups(Dictionary cGroups) { groups = cGroups; GroupsEvent.Set(); } - void Groups_OnGroupLeft(LLUUID groupID, bool success) + void Groups_OnGroupLeft(UUID groupID, bool success) { Console.WriteLine(Client.ToString() + (success ? " has left group " : " failed to left group ") + groupID.ToString()); diff --git a/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs b/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs index ceb478d8..f5745d93 100644 --- a/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs @@ -14,17 +14,17 @@ namespace OpenMetaverse.TestClient { public class QueuedDownloadInfo { - public LLUUID TransferID; - public LLUUID AssetID; - public LLUUID ItemID; - public LLUUID TaskID; - public LLUUID OwnerID; + public UUID TransferID; + public UUID AssetID; + public UUID ItemID; + public UUID TaskID; + public UUID OwnerID; public AssetType Type; public string FileName; public DateTime WhenRequested; public bool IsRequested; - public QueuedDownloadInfo(string file, LLUUID asset, LLUUID item, LLUUID task, LLUUID owner, AssetType type) + public QueuedDownloadInfo(string file, UUID asset, UUID item, UUID task, UUID owner, AssetType type) { FileName = file; AssetID = asset; @@ -32,7 +32,7 @@ namespace OpenMetaverse.TestClient TaskID = task; OwnerID = owner; Type = type; - TransferID = LLUUID.Zero; + TransferID = UUID.Zero; WhenRequested = DateTime.Now; IsRequested = false; } @@ -116,7 +116,7 @@ namespace OpenMetaverse.TestClient testClient.Assets.OnAssetReceived += new AssetManager.AssetReceivedCallback(Assets_OnAssetReceived); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { StringBuilder sbResult = new StringBuilder(); @@ -281,7 +281,7 @@ namespace OpenMetaverse.TestClient string sPath = sPathSoFar + @"\" + MakeValid(ii.Name.Trim()) + sExtension; // create the new qdi - QueuedDownloadInfo qdi = new QueuedDownloadInfo(sPath, ii.AssetUUID, iNode.Data.UUID, LLUUID.Zero, + QueuedDownloadInfo qdi = new QueuedDownloadInfo(sPath, ii.AssetUUID, iNode.Data.UUID, UUID.Zero, Client.Self.AgentID, ii.AssetType); // add it to the queue diff --git a/Programs/examples/TestClient/Commands/Inventory/BalanceCommand.cs b/Programs/examples/TestClient/Commands/Inventory/BalanceCommand.cs index ce47701e..0bb7a35a 100644 --- a/Programs/examples/TestClient/Commands/Inventory/BalanceCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/BalanceCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient Description = "Shows the amount of L$."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { System.Threading.AutoResetEvent waitBalance = new System.Threading.AutoResetEvent(false); AgentManager.BalanceCallback del = delegate(int balance) { waitBalance.Set(); }; diff --git a/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs b/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs index a15c078a..4b34809d 100644 --- a/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs @@ -15,7 +15,7 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell Name = "cd"; Description = "Changes the current working inventory folder."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Manager = Client.Inventory; Inventory = Client.Inventory.Store; diff --git a/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs b/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs index c4e8a629..8d79e73c 100644 --- a/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/CreateNotecardCommand.cs @@ -13,13 +13,13 @@ namespace OpenMetaverse.TestClient Description = "Creates a notecard from a local text file."; } - void OnNoteUpdate(bool success, string status, LLUUID itemID, LLUUID assetID) + void OnNoteUpdate(bool success, string status, UUID itemID, UUID assetID) { if (success) Console.WriteLine("Notecard successfully uploaded, ItemID {0} AssetID {1}", itemID, assetID); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if(args.Length < 1) return "Usage: createnotecard filename.txt"; @@ -43,7 +43,7 @@ namespace OpenMetaverse.TestClient // create the asset Client.Inventory.RequestCreateItem(Client.Inventory.FindFolderForType(AssetType.Notecard), - file, desc, AssetType.Notecard, LLUUID.Random(), InventoryType.Notecard, PermissionMask.All, + file, desc, AssetType.Notecard, UUID.Random(), InventoryType.Notecard, PermissionMask.All, delegate(bool success, InventoryItem item) { if(success) // upload the asset Client.Inventory.RequestUploadNotecardAsset(CreateNotecardAsset(body), item.UUID, new InventoryManager.NotecardUploadedAssetCallback(OnNoteUpdate)); diff --git a/Programs/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs b/Programs/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs index aa50557b..101eb057 100644 --- a/Programs/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/DeleteFolderCommand.cs @@ -20,7 +20,7 @@ namespace OpenMetaverse.TestClient Description = "Moves a folder to the Trash Folder"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { // parse the command line string target = String.Empty; diff --git a/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs b/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs index e4cc38f8..03dff055 100644 --- a/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs @@ -9,7 +9,7 @@ namespace OpenMetaverse.TestClient { public class DumpOutfitCommand : Command { - List OutfitAssets = new List(); + List OutfitAssets = new List(); AssetManager.ImageReceivedCallback ImageReceivedHandler; public DumpOutfitCommand(TestClient testClient) @@ -19,14 +19,14 @@ namespace OpenMetaverse.TestClient ImageReceivedHandler = new AssetManager.ImageReceivedCallback(Assets_OnImageReceived); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return "Usage: dumpoutfit [avatar-uuid]"; - LLUUID target; + UUID target; - if (!LLUUID.TryParse(args[0], out target)) + if (!UUID.TryParse(args[0], out target)) return "Usage: dumpoutfit [avatar-uuid]"; lock (Client.Network.Simulators) diff --git a/Programs/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs b/Programs/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs index 174fdde3..cb4afeab 100644 --- a/Programs/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/ExportOutfitCommand.cs @@ -14,9 +14,9 @@ namespace OpenMetaverse.TestClient Description = "Exports an avatars outfit to an xml file. Usage: exportoutfit [avataruuid] outputfile.xml"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { - LLUUID id; + UUID id; string path; if (args.Length == 1) @@ -26,7 +26,7 @@ namespace OpenMetaverse.TestClient } else if (args.Length == 2) { - if (!LLUUID.TryParse(args[0], out id)) + if (!UUID.TryParse(args[0], out id)) return "Usage: exportoutfit [avataruuid] outputfile.xml"; path = args[1]; } diff --git a/Programs/examples/TestClient/Commands/Inventory/GiveAllCommand.cs b/Programs/examples/TestClient/Commands/Inventory/GiveAllCommand.cs index 4aca90f9..d460a479 100644 --- a/Programs/examples/TestClient/Commands/Inventory/GiveAllCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/GiveAllCommand.cs @@ -14,9 +14,9 @@ namespace OpenMetaverse.TestClient Description = "Gives you all it's money."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { - if (fromAgentID == LLUUID.Zero) + if (fromAgentID == UUID.Zero) return "Unable to send money to console. This command only works when IMed."; int amount = Client.Self.Balance; diff --git a/Programs/examples/TestClient/Commands/Inventory/GiveItemCommand.cs b/Programs/examples/TestClient/Commands/Inventory/GiveItemCommand.cs index 7abe466b..b289b3b3 100644 --- a/Programs/examples/TestClient/Commands/Inventory/GiveItemCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/GiveItemCommand.cs @@ -13,14 +13,14 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell Name = "give"; Description = "Gives items from the current working directory to an avatar."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 2) { return "Usage: give [item2] [item3] [...]"; } - LLUUID dest; - if (!LLUUID.TryParse(args[0], out dest)) + UUID dest; + if (!UUID.TryParse(args[0], out dest)) { return "First argument expected agent UUID."; } diff --git a/Programs/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs b/Programs/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs index 57bf923d..90c7e21d 100644 --- a/Programs/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/ImportOutfitCommand.cs @@ -16,7 +16,7 @@ namespace OpenMetaverse.TestClient Description = "Imports an appearance from an xml file. Usage: importoutfit inputfile.xml"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return "Usage: importoutfit inputfile.xml"; diff --git a/Programs/examples/TestClient/Commands/Inventory/InventoryCommand.cs b/Programs/examples/TestClient/Commands/Inventory/InventoryCommand.cs index e4d92f61..42bebdce 100644 --- a/Programs/examples/TestClient/Commands/Inventory/InventoryCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/InventoryCommand.cs @@ -21,7 +21,7 @@ namespace OpenMetaverse.TestClient Description = "Prints out inventory."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Manager = Client.Inventory; Inventory = Manager.Store; diff --git a/Programs/examples/TestClient/Commands/Inventory/ListContentsCommand.cs b/Programs/examples/TestClient/Commands/Inventory/ListContentsCommand.cs index 130f9f9e..9c779850 100644 --- a/Programs/examples/TestClient/Commands/Inventory/ListContentsCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/ListContentsCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell Name = "ls"; Description = "Lists the contents of the current working inventory folder."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length > 1) return "Usage: ls [-l]"; diff --git a/Programs/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs b/Programs/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs index bae4c681..4a55328c 100644 --- a/Programs/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs @@ -12,14 +12,14 @@ namespace OpenMetaverse.TestClient Description = "Retrieves a listing of items inside an object (task inventory). Usage: objectinventory [objectID]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return "Usage: objectinventory [objectID]"; uint objectLocalID; - LLUUID objectID; - if (!LLUUID.TryParse(args[0], out objectID)) + UUID objectID; + if (!UUID.TryParse(args[0], out objectID)) return "Usage: objectinventory [objectID]"; Primitive found = Client.Network.CurrentSim.ObjectsPrimitives.Find(delegate(Primitive prim) { return prim.ID == objectID; }); diff --git a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs index d8e9d9fa..b6342b8c 100644 --- a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs @@ -12,7 +12,7 @@ namespace OpenMetaverse.TestClient public class UploadImageCommand : Command { AutoResetEvent UploadCompleteEvent = new AutoResetEvent(false); - LLUUID TextureID = LLUUID.Zero; + UUID TextureID = UUID.Zero; DateTime start; public UploadImageCommand(TestClient testClient) @@ -21,7 +21,7 @@ namespace OpenMetaverse.TestClient Description = "Upload an image to your inventory. Usage: uploadimage [inventoryname] [timeout] [filename]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { string inventoryName; uint timeout; @@ -30,7 +30,7 @@ namespace OpenMetaverse.TestClient if (args.Length != 3) return "Usage: uploadimage [inventoryname] [timeout] [filename]"; - TextureID = LLUUID.Zero; + TextureID = UUID.Zero; inventoryName = args[0]; fileName = args[2]; if (!UInt32.TryParse(args[1], out timeout)) @@ -46,7 +46,7 @@ namespace OpenMetaverse.TestClient if (UploadCompleteEvent.WaitOne((int)timeout, false)) { - return String.Format("Texture upload {0}: {1}", (TextureID != LLUUID.Zero) ? "succeeded" : "failed", + return String.Format("Texture upload {0}: {1}", (TextureID != UUID.Zero) ? "succeeded" : "failed", TextureID); } else @@ -70,7 +70,7 @@ namespace OpenMetaverse.TestClient Console.WriteLine(String.Format("Texture upload: {0} / {1}", bytesSent, totalBytesToSend)); }, - delegate(bool success, string status, LLUUID itemID, LLUUID assetID) + delegate(bool success, string status, UUID itemID, UUID assetID) { Console.WriteLine(String.Format( "RequestCreateItemFromAsset() returned: Success={0}, Status={1}, ItemID={2}, AssetID={3}", diff --git a/Programs/examples/TestClient/Commands/Land/AgentLocationsCommand.cs b/Programs/examples/TestClient/Commands/Land/AgentLocationsCommand.cs index ec30c566..6011cb8d 100644 --- a/Programs/examples/TestClient/Commands/Land/AgentLocationsCommand.cs +++ b/Programs/examples/TestClient/Commands/Land/AgentLocationsCommand.cs @@ -16,7 +16,7 @@ namespace OpenMetaverse.TestClient Description = "Downloads all of the agent locations in a specified region. Usage: agentlocations [regionhandle]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { ulong regionHandle; diff --git a/Programs/examples/TestClient/Commands/Land/FindSimCommand.cs b/Programs/examples/TestClient/Commands/Land/FindSimCommand.cs index a7833e3b..f69d52cc 100644 --- a/Programs/examples/TestClient/Commands/Land/FindSimCommand.cs +++ b/Programs/examples/TestClient/Commands/Land/FindSimCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Searches for a simulator and returns information about it. Usage: findsim [Simulator Name]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: findsim [Simulator Name]"; diff --git a/Programs/examples/TestClient/Commands/Land/GridLayerCommand.cs b/Programs/examples/TestClient/Commands/Land/GridLayerCommand.cs index 11c48d8f..3e5b5919 100644 --- a/Programs/examples/TestClient/Commands/Land/GridLayerCommand.cs +++ b/Programs/examples/TestClient/Commands/Land/GridLayerCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient testClient.Grid.OnGridLayer += new GridManager.GridLayerCallback(Grid_OnGridLayer); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Client.Grid.RequestMapLayer(GridLayerType.Objects); diff --git a/Programs/examples/TestClient/Commands/Land/GridMapCommand.cs b/Programs/examples/TestClient/Commands/Land/GridMapCommand.cs index b9d5aa71..b2ceb2a3 100644 --- a/Programs/examples/TestClient/Commands/Land/GridMapCommand.cs +++ b/Programs/examples/TestClient/Commands/Land/GridMapCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Downloads all visible information about the grid map"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { //if (args.Length < 1) // return ""; diff --git a/Programs/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs b/Programs/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs index fd8ab154..a24e928a 100644 --- a/Programs/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs +++ b/Programs/examples/TestClient/Commands/Land/ParcelDetailsCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Displays parcel details from the ParcelTracker dictionary. Usage: parceldetails parcelID"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: parceldetails parcelID (use parcelinfo to get ID)"; diff --git a/Programs/examples/TestClient/Commands/Land/ParcelInfoCommand.cs b/Programs/examples/TestClient/Commands/Land/ParcelInfoCommand.cs index 9a9e8f2e..4d42e554 100644 --- a/Programs/examples/TestClient/Commands/Land/ParcelInfoCommand.cs +++ b/Programs/examples/TestClient/Commands/Land/ParcelInfoCommand.cs @@ -18,7 +18,7 @@ namespace OpenMetaverse.TestClient testClient.Network.OnDisconnected += new NetworkManager.DisconnectedCallback(Network_OnDisconnected); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { StringBuilder sb = new StringBuilder(); string result; diff --git a/Programs/examples/TestClient/Commands/Movement/CrouchCommand.cs b/Programs/examples/TestClient/Commands/Movement/CrouchCommand.cs index 2e85c0e3..a7abedcf 100644 --- a/Programs/examples/TestClient/Commands/Movement/CrouchCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/CrouchCommand.cs @@ -11,7 +11,7 @@ namespace OpenMetaverse.TestClient Description = "Starts or stops crouching. Usage: crouch [start/stop]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { bool start = true; diff --git a/Programs/examples/TestClient/Commands/Movement/FlyCommand.cs b/Programs/examples/TestClient/Commands/Movement/FlyCommand.cs index 5823748c..3772e73a 100644 --- a/Programs/examples/TestClient/Commands/Movement/FlyCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/FlyCommand.cs @@ -11,7 +11,7 @@ namespace OpenMetaverse.TestClient Description = "Starts or stops flying. Usage: fly [start/stop]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { bool start = true; diff --git a/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs b/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs index cd4f997b..53260de8 100644 --- a/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs @@ -16,7 +16,7 @@ namespace OpenMetaverse.TestClient testClient.Network.RegisterCallback(PacketType.AlertMessage, new NetworkManager.PacketCallback(AlertMessageHandler)); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { string target = String.Empty; for (int ct = 0; ct < args.Length; ct++) @@ -68,7 +68,7 @@ namespace OpenMetaverse.TestClient return false; } - bool Follow(LLUUID id) + bool Follow(UUID id) { lock (Client.Network.Simulators) { @@ -109,7 +109,7 @@ namespace OpenMetaverse.TestClient if (Client.Network.Simulators[i] == Client.Network.CurrentSim) { - distance = LLVector3.Dist(targetAv.Position, Client.Self.SimPosition); + distance = Vector3.Dist(targetAv.Position, Client.Self.SimPosition); } else { diff --git a/Programs/examples/TestClient/Commands/Movement/GotoCommand.cs b/Programs/examples/TestClient/Commands/Movement/GotoCommand.cs index 5e425b1d..3654666c 100644 --- a/Programs/examples/TestClient/Commands/Movement/GotoCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/GotoCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Teleport to a location (e.g. \"goto Hooper/100/100/30\")"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: goto sim/x/y/z"; @@ -41,7 +41,7 @@ namespace OpenMetaverse.TestClient return "Usage: goto sim/x/y/z"; } - if (Client.Self.Teleport(sim, new LLVector3(x, y, z))) + if (Client.Self.Teleport(sim, new Vector3(x, y, z))) return "Teleported to " + Client.Network.CurrentSim; else return "Teleport failed: " + Client.Self.TeleportMessage; diff --git a/Programs/examples/TestClient/Commands/Movement/JumpCommand.cs b/Programs/examples/TestClient/Commands/Movement/JumpCommand.cs index 52c85e01..0fec2675 100644 --- a/Programs/examples/TestClient/Commands/Movement/JumpCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/JumpCommand.cs @@ -11,7 +11,7 @@ namespace OpenMetaverse.TestClient Description = "Jumps or flies up"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Client.Self.Jump(); return "Jumped"; diff --git a/Programs/examples/TestClient/Commands/Movement/LocationCommand.cs b/Programs/examples/TestClient/Commands/Movement/LocationCommand.cs index 35eead83..a9e48fe7 100644 --- a/Programs/examples/TestClient/Commands/Movement/LocationCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/LocationCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Show the location."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { return "CurrentSim: '" + Client.Network.CurrentSim.ToString() + "' Position: " + Client.Self.SimPosition.ToString(); diff --git a/Programs/examples/TestClient/Commands/Movement/MoveToCommand.cs b/Programs/examples/TestClient/Commands/Movement/MoveToCommand.cs index 160fab95..ff2a65b0 100644 --- a/Programs/examples/TestClient/Commands/Movement/MoveToCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/MoveToCommand.cs @@ -12,7 +12,7 @@ namespace OpenMetaverse.TestClient.Commands.Movement Description = "Moves the avatar to the specified global position using simulator autopilot. Usage: moveto x y z"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 3) return "Usage: moveto x y z"; diff --git a/Programs/examples/TestClient/Commands/Movement/SetHome.cs b/Programs/examples/TestClient/Commands/Movement/SetHome.cs index 1449b3ee..6d8cffde 100644 --- a/Programs/examples/TestClient/Commands/Movement/SetHome.cs +++ b/Programs/examples/TestClient/Commands/Movement/SetHome.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Sets home to the current location."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Client.Self.SetHome(); return "Home Set"; diff --git a/Programs/examples/TestClient/Commands/Movement/SitCommand.cs b/Programs/examples/TestClient/Commands/Movement/SitCommand.cs index f47a58bb..5482d5fb 100644 --- a/Programs/examples/TestClient/Commands/Movement/SitCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/SitCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Attempt to sit on the closest prim"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Primitive closest = null; double closestDistance = Double.MaxValue; @@ -22,7 +22,7 @@ namespace OpenMetaverse.TestClient Client.Network.CurrentSim.ObjectsPrimitives.ForEach( delegate(Primitive prim) { - float distance = LLVector3.Dist(Client.Self.SimPosition, prim.Position); + float distance = Vector3.Dist(Client.Self.SimPosition, prim.Position); if (closest == null || distance < closestDistance) { @@ -34,7 +34,7 @@ namespace OpenMetaverse.TestClient if (closest != null) { - Client.Self.RequestSit(closest.ID, LLVector3.Zero); + Client.Self.RequestSit(closest.ID, Vector3.Zero); Client.Self.Sit(); return "Sat on " + closest.ID + " (" + closest.LocalID + "). Distance: " + closestDistance; diff --git a/Programs/examples/TestClient/Commands/Movement/SitOnCommand.cs b/Programs/examples/TestClient/Commands/Movement/SitOnCommand.cs index 68afe2de..03df09c9 100644 --- a/Programs/examples/TestClient/Commands/Movement/SitOnCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/SitOnCommand.cs @@ -14,14 +14,14 @@ namespace OpenMetaverse.TestClient Description = "Attempt to sit on a particular prim, with specified UUID"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return "Usage: siton UUID"; - LLUUID target; + UUID target; - if (LLUUID.TryParse(args[0], out target)) + if (UUID.TryParse(args[0], out target)) { Primitive targetPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find( delegate(Primitive prim) @@ -32,7 +32,7 @@ namespace OpenMetaverse.TestClient if (targetPrim != null) { - Client.Self.RequestSit(targetPrim.ID, LLVector3.Zero); + Client.Self.RequestSit(targetPrim.ID, Vector3.Zero); Client.Self.Sit(); return "Requested to sit on prim " + targetPrim.ID.ToString() + " (" + targetPrim.LocalID + ")"; diff --git a/Programs/examples/TestClient/Commands/Movement/StandCommand.cs b/Programs/examples/TestClient/Commands/Movement/StandCommand.cs index bfee3667..5aa9eaf7 100644 --- a/Programs/examples/TestClient/Commands/Movement/StandCommand.cs +++ b/Programs/examples/TestClient/Commands/Movement/StandCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Stand"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Client.Self.Stand(); return "Standing up."; diff --git a/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs b/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs index 232d6b1e..846a8dc2 100644 --- a/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs @@ -7,8 +7,8 @@ namespace OpenMetaverse.TestClient public class ChangePermsCommand : Command { AutoResetEvent GotPermissionsEvent = new AutoResetEvent(false); - LLUUID SelectedObject = LLUUID.Zero; - Dictionary Objects = new Dictionary(); + UUID SelectedObject = UUID.Zero; + Dictionary Objects = new Dictionary(); PermissionMask Perms = PermissionMask.None; bool PermsSent = false; int PermCount = 0; @@ -21,9 +21,9 @@ namespace OpenMetaverse.TestClient Description = "Recursively changes all of the permissions for child and task inventory objects. Usage prim-uuid [copy] [mod] [xfer]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { - LLUUID rootID; + UUID rootID; Primitive rootPrim; List childPrims; List localIDs = new List(); @@ -37,7 +37,7 @@ namespace OpenMetaverse.TestClient if (args.Length < 1 || args.Length > 4) return "Usage prim-uuid [copy] [mod] [xfer]"; - if (!LLUUID.TryParse(args[0], out rootID)) + if (!UUID.TryParse(args[0], out rootID)) return "Usage prim-uuid [copy] [mod] [xfer]"; for (int i = 1; i < args.Length; i++) diff --git a/Programs/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs b/Programs/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs index 68e00924..ea1f28cb 100644 --- a/Programs/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/DownloadTextureCommand.cs @@ -7,7 +7,7 @@ namespace OpenMetaverse.TestClient { public class DownloadTextureCommand : Command { - LLUUID TextureID; + UUID TextureID; AutoResetEvent DownloadHandle = new AutoResetEvent(false); ImageDownload Image; AssetTexture Asset; @@ -22,17 +22,17 @@ namespace OpenMetaverse.TestClient testClient.Assets.OnImageReceived += new AssetManager.ImageReceivedCallback(Assets_OnImageReceived); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return "Usage: downloadtexture [texture-uuid]"; - TextureID = LLUUID.Zero; + TextureID = UUID.Zero; DownloadHandle.Reset(); Image = null; Asset = null; - if (LLUUID.TryParse(args[0], out TextureID)) + if (UUID.TryParse(args[0], out TextureID)) { Client.Assets.RequestImage(TextureID, ImageType.Normal); if (DownloadHandle.WaitOne(120 * 1000, false)) @@ -79,7 +79,7 @@ namespace OpenMetaverse.TestClient DownloadHandle.Set(); } - private void Assets_OnImageReceiveProgress(LLUUID image, int recieved, int total) + private void Assets_OnImageReceiveProgress(UUID image, int recieved, int total) { Console.WriteLine(String.Format("Texture {0}: Received {1} / {2}", image, recieved, total)); } diff --git a/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs b/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs index f2c132a3..57fd7e02 100644 --- a/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/ExportCommand.cs @@ -9,13 +9,13 @@ namespace OpenMetaverse.TestClient { public class ExportCommand : Command { - List Textures = new List(); + List Textures = new List(); AutoResetEvent GotPermissionsEvent = new AutoResetEvent(false); LLObject.ObjectPropertiesFamily Properties; bool GotPermissions = false; - LLUUID SelectedObject = LLUUID.Zero; + UUID SelectedObject = UUID.Zero; - Dictionary PrimsWaiting = new Dictionary(); + Dictionary PrimsWaiting = new Dictionary(); AutoResetEvent AllPropertiesReceived = new AutoResetEvent(false); public ExportCommand(TestClient testClient) @@ -29,19 +29,19 @@ namespace OpenMetaverse.TestClient Description = "Exports an object to an xml file. Usage: export uuid outputfile.xml"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { - if (args.Length != 2 && !(args.Length == 1 && SelectedObject != LLUUID.Zero)) + if (args.Length != 2 && !(args.Length == 1 && SelectedObject != UUID.Zero)) return "Usage: export uuid outputfile.xml"; - LLUUID id; + UUID id; uint localid; string file; if (args.Length == 2) { file = args[1]; - if (!LLUUID.TryParse(args[0], out id)) + if (!UUID.TryParse(args[0], out id)) return "Usage: export uuid outputfile.xml"; } else @@ -95,7 +95,7 @@ namespace OpenMetaverse.TestClient if (!complete) { Logger.Log("Warning: Unable to retrieve full properties for:", Helpers.LogLevel.Warning, Client); - foreach (LLUUID uuid in PrimsWaiting.Keys) + foreach (UUID uuid in PrimsWaiting.Keys) Logger.Log(uuid.ToString(), Helpers.LogLevel.Warning, Client); } @@ -130,7 +130,7 @@ namespace OpenMetaverse.TestClient } } - if (prim.Sculpt.SculptTexture != LLUUID.Zero && !Textures.Contains(prim.Sculpt.SculptTexture)) { + if (prim.Sculpt.SculptTexture != UUID.Zero && !Textures.Contains(prim.Sculpt.SculptTexture)) { Textures.Add(prim.Sculpt.SculptTexture); } } @@ -205,8 +205,8 @@ namespace OpenMetaverse.TestClient } } - void Avatars_OnPointAt(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos, - PointAtType pointType, float duration, LLUUID id) + void Avatars_OnPointAt(UUID sourceID, UUID targetID, Vector3d targetPos, + PointAtType pointType, float duration, UUID id) { if (sourceID == Client.MasterKey) { diff --git a/Programs/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs b/Programs/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs index acf5f002..84f0699c 100644 --- a/Programs/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs @@ -14,13 +14,13 @@ namespace OpenMetaverse.TestClient Description = "Reverse engineers a prim with a particle system to an LSL script. Usage: exportscript [prim-uuid]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return "Usage: exportparticles [prim-uuid]"; - LLUUID id; - if (!LLUUID.TryParse(args[0], out id)) + UUID id; + if (!UUID.TryParse(args[0], out id)) return "Usage: exportparticles [prim-uuid]"; lock (Client.Network.Simulators) diff --git a/Programs/examples/TestClient/Commands/Prims/FindObjectsCommand.cs b/Programs/examples/TestClient/Commands/Prims/FindObjectsCommand.cs index 83eac3f8..cc554202 100644 --- a/Programs/examples/TestClient/Commands/Prims/FindObjectsCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/FindObjectsCommand.cs @@ -9,7 +9,7 @@ namespace OpenMetaverse.TestClient { public class FindObjectsCommand : Command { - Dictionary PrimsWaiting = new Dictionary(); + Dictionary PrimsWaiting = new Dictionary(); AutoResetEvent AllPropertiesReceived = new AutoResetEvent(false); public FindObjectsCommand(TestClient testClient) @@ -21,7 +21,7 @@ namespace OpenMetaverse.TestClient "Usage: findobjects [radius] "; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { // *** parse arguments *** if ((args.Length < 1) || (args.Length > 2)) @@ -30,13 +30,13 @@ namespace OpenMetaverse.TestClient string searchString = (args.Length > 1)? args[1] : ""; // *** get current location *** - LLVector3 location = Client.Self.SimPosition; + Vector3 location = Client.Self.SimPosition; // *** find all objects in radius *** List prims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll( delegate(Primitive prim) { - LLVector3 pos = prim.Position; - return ((prim.ParentID == 0) && (pos != LLVector3.Zero) && (LLVector3.Dist(pos, location) < radius)); + Vector3 pos = prim.Position; + return ((prim.ParentID == 0) && (pos != Vector3.Zero) && (Vector3.Dist(pos, location) < radius)); } ); @@ -51,7 +51,7 @@ namespace OpenMetaverse.TestClient if (!complete) { Console.WriteLine("Warning: Unable to retrieve full properties for:"); - foreach (LLUUID uuid in PrimsWaiting.Keys) + foreach (UUID uuid in PrimsWaiting.Keys) Console.WriteLine(uuid); } diff --git a/Programs/examples/TestClient/Commands/Prims/FindTextureCommand.cs b/Programs/examples/TestClient/Commands/Prims/FindTextureCommand.cs index eb8f3234..2ff6c242 100644 --- a/Programs/examples/TestClient/Commands/Prims/FindTextureCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/FindTextureCommand.cs @@ -12,16 +12,16 @@ namespace OpenMetaverse.TestClient "Usage: findtexture [face-index] [texture-uuid]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { int faceIndex; - LLUUID textureID; + UUID textureID; if (args.Length != 2) return "Usage: findtexture [face-index] [texture-uuid]"; if (Int32.TryParse(args[0], out faceIndex) && - LLUUID.TryParse(args[1], out textureID)) + UUID.TryParse(args[1], out textureID)) { Client.Network.CurrentSim.ObjectsPrimitives.ForEach( delegate(Primitive prim) diff --git a/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs b/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs index 84e9dbef..4bd0857b 100644 --- a/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/ImportCommand.cs @@ -34,7 +34,7 @@ namespace OpenMetaverse.TestClient } Primitive currentPrim; - LLVector3 currentPosition; + Vector3 currentPosition; AutoResetEvent primDone = new AutoResetEvent(false); List primsCreated; List linkQueue; @@ -49,13 +49,13 @@ namespace OpenMetaverse.TestClient testClient.Objects.OnNewPrim += new ObjectManager.NewPrimCallback(Objects_OnNewPrim); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: import inputfile.xml [usegroup]"; string filename = args[0]; - LLUUID GroupID = (args.Length > 1) ? Client.GroupID : LLUUID.Zero; + UUID GroupID = (args.Length > 1) ? Client.GroupID : UUID.Zero; string xml; List prims; @@ -103,8 +103,8 @@ namespace OpenMetaverse.TestClient currentPosition = linkset.RootPrim.Position; // Rez the root prim with no rotation - LLQuaternion rootRotation = linkset.RootPrim.Rotation; - linkset.RootPrim.Rotation = LLQuaternion.Identity; + Quaternion rootRotation = linkset.RootPrim.Rotation; + linkset.RootPrim.Rotation = Quaternion.Identity; Client.Objects.AddPrim(Client.Network.CurrentSim, linkset.RootPrim.Data, GroupID, linkset.RootPrim.Position, linkset.RootPrim.Scale, linkset.RootPrim.Rotation); @@ -205,7 +205,7 @@ namespace OpenMetaverse.TestClient Client.Objects.SetFlexible(simulator, prim.LocalID, currentPrim.Flexible); - if (currentPrim.Sculpt.SculptTexture != LLUUID.Zero) { + if (currentPrim.Sculpt.SculptTexture != UUID.Zero) { Client.Objects.SetSculpt(simulator, prim.LocalID, currentPrim.Sculpt); } diff --git a/Programs/examples/TestClient/Commands/Prims/PrimCountCommand.cs b/Programs/examples/TestClient/Commands/Prims/PrimCountCommand.cs index 3895d7b9..0233e6c1 100644 --- a/Programs/examples/TestClient/Commands/Prims/PrimCountCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/PrimCountCommand.cs @@ -11,7 +11,7 @@ namespace OpenMetaverse.TestClient Description = "Shows the number of objects currently being tracked."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { int count = 0; diff --git a/Programs/examples/TestClient/Commands/Prims/PrimInfoCommand.cs b/Programs/examples/TestClient/Commands/Prims/PrimInfoCommand.cs index b0b6356a..53dbf6dd 100644 --- a/Programs/examples/TestClient/Commands/Prims/PrimInfoCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/PrimInfoCommand.cs @@ -11,14 +11,14 @@ namespace OpenMetaverse.TestClient Description = "Dumps information about a specified prim. " + "Usage: priminfo [prim-uuid]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { - LLUUID primID; + UUID primID; if (args.Length != 1) return "Usage: priminfo [prim-uuid]"; - if (LLUUID.TryParse(args[0], out primID)) + if (UUID.TryParse(args[0], out primID)) { Primitive target = Client.Network.CurrentSim.ObjectsPrimitives.Find( delegate(Primitive prim) { return prim.ID == primID; } diff --git a/Programs/examples/TestClient/Commands/Prims/PrimRegexCommand.cs b/Programs/examples/TestClient/Commands/Prims/PrimRegexCommand.cs index 9da04277..ce9b0c85 100644 --- a/Programs/examples/TestClient/Commands/Prims/PrimRegexCommand.cs +++ b/Programs/examples/TestClient/Commands/Prims/PrimRegexCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient "Usage: primregex [text predicat] (eg findprim .away.)"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: primregex [text predicat]"; diff --git a/Programs/examples/TestClient/Commands/SearchEventsCommand.cs b/Programs/examples/TestClient/Commands/SearchEventsCommand.cs index 2aa59aea..6adec76c 100644 --- a/Programs/examples/TestClient/Commands/SearchEventsCommand.cs +++ b/Programs/examples/TestClient/Commands/SearchEventsCommand.cs @@ -15,7 +15,7 @@ namespace OpenMetaverse.TestClient.Commands Description = "Searches Events list. Usage: searchevents [search text]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: searchevents [search text]"; @@ -27,7 +27,7 @@ namespace OpenMetaverse.TestClient.Commands waitQuery.Reset(); Client.Directory.OnEventsReply += new DirectoryManager.EventReplyCallback(Directory_OnEventsReply); - Client.Directory.StartEventsSearch(searchText, true, "u", 0, DirectoryManager.EventCategories.All, LLUUID.Random()); + Client.Directory.StartEventsSearch(searchText, true, "u", 0, DirectoryManager.EventCategories.All, UUID.Random()); string result; if (waitQuery.WaitOne(20000, false) && Client.Network.Connected) { @@ -41,7 +41,7 @@ namespace OpenMetaverse.TestClient.Commands return result; } - void Directory_OnEventsReply(LLUUID queryID, List matchedEvents) + void Directory_OnEventsReply(UUID queryID, List matchedEvents) { if (matchedEvents[0].ID == 0 && matchedEvents.Count == 1) { diff --git a/Programs/examples/TestClient/Commands/ShowEventDetailsCommand.cs b/Programs/examples/TestClient/Commands/ShowEventDetailsCommand.cs index 255fcfd9..77e83dde 100644 --- a/Programs/examples/TestClient/Commands/ShowEventDetailsCommand.cs +++ b/Programs/examples/TestClient/Commands/ShowEventDetailsCommand.cs @@ -12,7 +12,7 @@ namespace OpenMetaverse.TestClient.Commands Description = "Shows an Events details. Usage: showevent [eventID]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: showevent [eventID] (use searchevents to get ID)"; diff --git a/Programs/examples/TestClient/Commands/Stats/DilationCommand.cs b/Programs/examples/TestClient/Commands/Stats/DilationCommand.cs index 5dfcb3ba..4c236c0b 100644 --- a/Programs/examples/TestClient/Commands/Stats/DilationCommand.cs +++ b/Programs/examples/TestClient/Commands/Stats/DilationCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Shows time dilation for current sim."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { return "Dilation is " + Client.Network.CurrentSim.Stats.Dilation.ToString(); } diff --git a/Programs/examples/TestClient/Commands/Stats/RegionInfoCommand.cs b/Programs/examples/TestClient/Commands/Stats/RegionInfoCommand.cs index 9b2871d0..f129274a 100644 --- a/Programs/examples/TestClient/Commands/Stats/RegionInfoCommand.cs +++ b/Programs/examples/TestClient/Commands/Stats/RegionInfoCommand.cs @@ -12,7 +12,7 @@ namespace OpenMetaverse.TestClient Description = "Prints out info about all the current region"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { StringBuilder output = new StringBuilder(); output.AppendLine(Client.Network.CurrentSim.ToString()); diff --git a/Programs/examples/TestClient/Commands/Stats/StatsCommand.cs b/Programs/examples/TestClient/Commands/Stats/StatsCommand.cs index b974fc54..698be24f 100644 --- a/Programs/examples/TestClient/Commands/Stats/StatsCommand.cs +++ b/Programs/examples/TestClient/Commands/Stats/StatsCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Provide connection figures and statistics"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { StringBuilder output = new StringBuilder(); diff --git a/Programs/examples/TestClient/Commands/Stats/UptimeCommand.cs b/Programs/examples/TestClient/Commands/Stats/UptimeCommand.cs index 9345d95b..6f054d82 100644 --- a/Programs/examples/TestClient/Commands/Stats/UptimeCommand.cs +++ b/Programs/examples/TestClient/Commands/Stats/UptimeCommand.cs @@ -16,7 +16,7 @@ namespace OpenMetaverse.TestClient Description = "Shows the login name, login time and length of time logged on."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { string name = Client.ToString(); return "I am " + name + ", Up Since: " + Created + " (" + (DateTime.Now - Created) + ")"; diff --git a/Programs/examples/TestClient/Commands/System/DebugCommand.cs b/Programs/examples/TestClient/Commands/System/DebugCommand.cs index db0ffe31..fdef749c 100644 --- a/Programs/examples/TestClient/Commands/System/DebugCommand.cs +++ b/Programs/examples/TestClient/Commands/System/DebugCommand.cs @@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient Description = "Turn debug messages on or off. Usage: debug [level] where level is one of None, Debug, Error, Info, Warn"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 1) return "Usage: debug [level] where level is one of None, Debug, Error, Info, Warn"; diff --git a/Programs/examples/TestClient/Commands/System/HelpCommand.cs b/Programs/examples/TestClient/Commands/System/HelpCommand.cs index 2fb4cec4..9481edb8 100644 --- a/Programs/examples/TestClient/Commands/System/HelpCommand.cs +++ b/Programs/examples/TestClient/Commands/System/HelpCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Lists available commands."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { StringBuilder result = new StringBuilder(); result.AppendFormat("\n\nHELP\nClient accept teleport lures from master and group members.\n"); diff --git a/Programs/examples/TestClient/Commands/System/LoadCommand.cs b/Programs/examples/TestClient/Commands/System/LoadCommand.cs index c043a5fc..da5e3cbc 100644 --- a/Programs/examples/TestClient/Commands/System/LoadCommand.cs +++ b/Programs/examples/TestClient/Commands/System/LoadCommand.cs @@ -15,7 +15,7 @@ namespace OpenMetaverse.TestClient Description = "Loads commands from a dll. (Usage: load AssemblyNameWithoutExtension)"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length < 1) return "Usage: load AssemblyNameWithoutExtension"; diff --git a/Programs/examples/TestClient/Commands/System/LoginCommand.cs b/Programs/examples/TestClient/Commands/System/LoginCommand.cs index dd969e5b..ac9b1803 100644 --- a/Programs/examples/TestClient/Commands/System/LoginCommand.cs +++ b/Programs/examples/TestClient/Commands/System/LoginCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Logs in another avatar"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 3 && args.Length != 4) return "usage: login firstname lastname password [simname]"; diff --git a/Programs/examples/TestClient/Commands/System/LogoutCommand.cs b/Programs/examples/TestClient/Commands/System/LogoutCommand.cs index 05ef530e..2488f7ba 100644 --- a/Programs/examples/TestClient/Commands/System/LogoutCommand.cs +++ b/Programs/examples/TestClient/Commands/System/LogoutCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Log this avatar out"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { string name = Client.ToString(); Client.ClientManager.Logout(Client); diff --git a/Programs/examples/TestClient/Commands/System/MD5Command.cs b/Programs/examples/TestClient/Commands/System/MD5Command.cs index 880cc14c..e63a2a11 100644 --- a/Programs/examples/TestClient/Commands/System/MD5Command.cs +++ b/Programs/examples/TestClient/Commands/System/MD5Command.cs @@ -11,7 +11,7 @@ namespace OpenMetaverse.TestClient Description = "Creates an MD5 hash from a given password. Usage: md5 [password]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length == 1) return Helpers.MD5(args[0]); diff --git a/Programs/examples/TestClient/Commands/System/PacketLogCommand.cs b/Programs/examples/TestClient/Commands/System/PacketLogCommand.cs index 47d84f0e..bd11ed97 100644 --- a/Programs/examples/TestClient/Commands/System/PacketLogCommand.cs +++ b/Programs/examples/TestClient/Commands/System/PacketLogCommand.cs @@ -11,7 +11,7 @@ namespace OpenMetaverse.TestClient Description = "Logs a given number of packets to an xml file. Usage: packetlog 10 tenpackets.xml"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length != 2) return "Usage: packetlog 10 tenpackets.xml"; diff --git a/Programs/examples/TestClient/Commands/System/QuitCommand.cs b/Programs/examples/TestClient/Commands/System/QuitCommand.cs index e8381ce0..2d09c0ac 100644 --- a/Programs/examples/TestClient/Commands/System/QuitCommand.cs +++ b/Programs/examples/TestClient/Commands/System/QuitCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Log all avatars out and shut down"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { Client.ClientManager.LogoutAll(); Client.ClientManager.Running = false; diff --git a/Programs/examples/TestClient/Commands/System/SetMasterCommand.cs b/Programs/examples/TestClient/Commands/System/SetMasterCommand.cs index 0415ba2b..d23ae50b 100644 --- a/Programs/examples/TestClient/Commands/System/SetMasterCommand.cs +++ b/Programs/examples/TestClient/Commands/System/SetMasterCommand.cs @@ -10,9 +10,9 @@ namespace OpenMetaverse.TestClient public class SetMasterCommand: Command { public DateTime Created = DateTime.Now; - private LLUUID resolvedMasterKey = LLUUID.Zero; + private UUID resolvedMasterKey = UUID.Zero; private ManualResetEvent keyResolution = new ManualResetEvent(false); - private LLUUID query = LLUUID.Zero; + private UUID query = UUID.Zero; public SetMasterCommand(TestClient testClient) { @@ -20,7 +20,7 @@ namespace OpenMetaverse.TestClient Description = "Sets the user name of the master user. The master user can IM to run commands. Usage: setmaster [name]"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { string masterName = String.Empty; for (int ct = 0; ct < args.Length;ct++) @@ -55,14 +55,14 @@ namespace OpenMetaverse.TestClient return String.Format("Master set to {0} ({1})", masterName, Client.MasterKey.ToString()); } - private void KeyResolvHandler(LLUUID queryid, List matches) + private void KeyResolvHandler(UUID queryid, List matches) { if (query != queryid) return; resolvedMasterKey = matches[0].AgentID; keyResolution.Set(); - query = LLUUID.Zero; + query = UUID.Zero; } } } diff --git a/Programs/examples/TestClient/Commands/System/SetMasterKeyCommand.cs b/Programs/examples/TestClient/Commands/System/SetMasterKeyCommand.cs index 639b2534..cd202034 100644 --- a/Programs/examples/TestClient/Commands/System/SetMasterKeyCommand.cs +++ b/Programs/examples/TestClient/Commands/System/SetMasterKeyCommand.cs @@ -16,9 +16,9 @@ namespace OpenMetaverse.TestClient Description = "Sets the key of the master user. The master user can IM to run commands."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { - Client.MasterKey = LLUUID.Parse(args[0]); + Client.MasterKey = UUID.Parse(args[0]); lock (Client.Network.Simulators) { diff --git a/Programs/examples/TestClient/Commands/System/ShowEffectsCommand.cs b/Programs/examples/TestClient/Commands/System/ShowEffectsCommand.cs index 2cceef9c..c10e90d3 100644 --- a/Programs/examples/TestClient/Commands/System/ShowEffectsCommand.cs +++ b/Programs/examples/TestClient/Commands/System/ShowEffectsCommand.cs @@ -17,7 +17,7 @@ namespace OpenMetaverse.TestClient testClient.Avatars.OnPointAt += new AvatarManager.PointAtCallback(Avatars_OnPointAt); } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length == 0) { @@ -43,8 +43,8 @@ namespace OpenMetaverse.TestClient } } - private void Avatars_OnPointAt(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos, - PointAtType pointType, float duration, LLUUID id) + private void Avatars_OnPointAt(UUID sourceID, UUID targetID, Vector3d targetPos, + PointAtType pointType, float duration, UUID id) { if (ShowEffects) Console.WriteLine( @@ -53,8 +53,8 @@ namespace OpenMetaverse.TestClient id.ToString()); } - private void Avatars_OnLookAt(LLUUID sourceID, LLUUID targetID, LLVector3d targetPos, - LookAtType lookType, float duration, LLUUID id) + private void Avatars_OnLookAt(UUID sourceID, UUID targetID, Vector3d targetPos, + LookAtType lookType, float duration, UUID id) { if (ShowEffects) Console.WriteLine( @@ -63,8 +63,8 @@ namespace OpenMetaverse.TestClient id.ToString()); } - private void Avatars_OnEffect(EffectType type, LLUUID sourceID, LLUUID targetID, - LLVector3d targetPos, float duration, LLUUID id) + private void Avatars_OnEffect(EffectType type, UUID sourceID, UUID targetID, + Vector3d targetPos, float duration, UUID id) { if (ShowEffects) Console.WriteLine( diff --git a/Programs/examples/TestClient/Commands/TouchCommand.cs b/Programs/examples/TestClient/Commands/TouchCommand.cs index e617a834..6dd04ac3 100644 --- a/Programs/examples/TestClient/Commands/TouchCommand.cs +++ b/Programs/examples/TestClient/Commands/TouchCommand.cs @@ -14,14 +14,14 @@ namespace OpenMetaverse.TestClient Description = "Attempt to touch a prim with specified UUID"; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { - LLUUID target; + UUID target; if (args.Length != 1) return "Usage: touch UUID"; - if (LLUUID.TryParse(args[0], out target)) + if (UUID.TryParse(args[0], out target)) { Primitive targetPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find( delegate(Primitive prim) diff --git a/Programs/examples/TestClient/Commands/TreeCommand.cs b/Programs/examples/TestClient/Commands/TreeCommand.cs index 10ce27c8..b369b89d 100644 --- a/Programs/examples/TestClient/Commands/TreeCommand.cs +++ b/Programs/examples/TestClient/Commands/TreeCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Rez a tree."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (args.Length == 1) { @@ -23,11 +23,11 @@ namespace OpenMetaverse.TestClient string treeName = args[0].Trim(new char[] { ' ' }); Tree tree = (Tree)Enum.Parse(typeof(Tree), treeName); - LLVector3 treePosition = Client.Self.SimPosition; + Vector3 treePosition = Client.Self.SimPosition; treePosition.Z += 3.0f; - Client.Objects.AddTree(Client.Network.CurrentSim, new LLVector3(0.5f, 0.5f, 0.5f), - LLQuaternion.Identity, treePosition, tree, Client.GroupID, false); + Client.Objects.AddTree(Client.Network.CurrentSim, new Vector3(0.5f, 0.5f, 0.5f), + Quaternion.Identity, treePosition, tree, Client.GroupID, false); return "Attempted to rez a " + treeName + " tree"; } diff --git a/Programs/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs b/Programs/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs index 901aacd4..de72cc85 100644 --- a/Programs/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs +++ b/Programs/examples/TestClient/Commands/Voice/ParcelVoiceInfo.cs @@ -36,7 +36,7 @@ namespace OpenMetaverse.TestClient } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (!IsVoiceManagerRunning()) return String.Format("VoiceManager not running for {0}", fromAgentID); diff --git a/Programs/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs b/Programs/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs index e78a8bf9..5a013cd5 100644 --- a/Programs/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs +++ b/Programs/examples/TestClient/Commands/Voice/VoiceAcountCommand.cs @@ -35,7 +35,7 @@ namespace OpenMetaverse.TestClient return true; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { if (!IsVoiceManagerRunning()) return String.Format("VoiceManager not running for {0}", Client.Self.Name); diff --git a/Programs/examples/TestClient/Commands/WhoCommand.cs b/Programs/examples/TestClient/Commands/WhoCommand.cs index 0e3f6122..d782a084 100644 --- a/Programs/examples/TestClient/Commands/WhoCommand.cs +++ b/Programs/examples/TestClient/Commands/WhoCommand.cs @@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient Description = "Lists seen avatars."; } - public override string Execute(string[] args, LLUUID fromAgentID) + public override string Execute(string[] args, UUID fromAgentID) { StringBuilder result = new StringBuilder(); diff --git a/Programs/examples/TestClient/Program.cs b/Programs/examples/TestClient/Program.cs index 69c31db5..f7b85c01 100644 --- a/Programs/examples/TestClient/Program.cs +++ b/Programs/examples/TestClient/Program.cs @@ -26,7 +26,7 @@ namespace OpenMetaverse.TestClient LoginDetails account; bool groupCommands = false; string masterName = String.Empty; - LLUUID masterKey = LLUUID.Zero; + UUID masterKey = UUID.Zero; string file = String.Empty; string loginuri = String.Empty; @@ -39,7 +39,7 @@ namespace OpenMetaverse.TestClient if (arguments["masterkey"] != null) { - masterKey = LLUUID.Parse(arguments["masterkey"]); + masterKey = UUID.Parse(arguments["masterkey"]); } if (arguments["master"] != null) diff --git a/Programs/examples/TestClient/TestClient.cs b/Programs/examples/TestClient/TestClient.cs index 7bd75072..88de0be4 100644 --- a/Programs/examples/TestClient/TestClient.cs +++ b/Programs/examples/TestClient/TestClient.cs @@ -10,23 +10,23 @@ namespace OpenMetaverse.TestClient { public class TestClient : GridClient { - public LLUUID GroupID = LLUUID.Zero; - public Dictionary GroupMembers; - public Dictionary Appearances = new Dictionary(); + public UUID GroupID = UUID.Zero; + public Dictionary GroupMembers; + public Dictionary Appearances = new Dictionary(); public Dictionary Commands = new Dictionary(); public bool Running = true; public bool GroupCommands = false; public string MasterName = String.Empty; - public LLUUID MasterKey = LLUUID.Zero; + public UUID MasterKey = UUID.Zero; public ClientManager ClientManager; public VoiceManager VoiceManager; // Shell-like inventory commands need to be aware of the 'current' inventory folder. public InventoryFolder CurrentDirectory = null; - private LLQuaternion bodyRotation = LLQuaternion.Identity; - private LLVector3 forward = new LLVector3(0, 0.9999f, 0); - private LLVector3 left = new LLVector3(0.9999f, 0, 0); - private LLVector3 up = new LLVector3(0, 0, 0.9999f); + private Quaternion bodyRotation = Quaternion.Identity; + private Vector3 forward = new Vector3(0, 0.9999f, 0); + private Vector3 left = new Vector3(0.9999f, 0, 0); + private Vector3 up = new Vector3(0, 0, 0.9999f); private System.Timers.Timer updateTimer; /// @@ -107,7 +107,7 @@ namespace OpenMetaverse.TestClient } //breaks up large responses to deal with the max IM size - private void SendResponseIM(GridClient client, LLUUID fromAgentID, string data) + private void SendResponseIM(GridClient client, UUID fromAgentID, string data) { for ( int i = 0 ; i < data.Length ; i += 1024 ) { int y; @@ -124,7 +124,7 @@ namespace OpenMetaverse.TestClient } } - public void DoCommand(string cmd, LLUUID fromAgentID) + public void DoCommand(string cmd, UUID fromAgentID) { string[] tokens; @@ -162,7 +162,7 @@ namespace OpenMetaverse.TestClient { Console.WriteLine(response); - if (fromAgentID != LLUUID.Zero && Network.Connected) + if (fromAgentID != UUID.Zero && Network.Connected) { // IMs don't like \r\n line endings, clean them up first response = response.Replace("\r", String.Empty); @@ -191,7 +191,7 @@ namespace OpenMetaverse.TestClient } } - private void GroupMembersHandler(Dictionary members) + private void GroupMembersHandler(Dictionary members) { Console.WriteLine("Got " + members.Count + " group members."); GroupMembers = members; @@ -245,9 +245,9 @@ namespace OpenMetaverse.TestClient } private bool Inventory_OnInventoryObjectReceived(InstantMessage offer, AssetType type, - LLUUID objectID, bool fromTask) + UUID objectID, bool fromTask) { - if (MasterKey != LLUUID.Zero) + if (MasterKey != UUID.Zero) { if (offer.FromAgentID != MasterKey) return false; diff --git a/Programs/examples/groupmanager/frmGroupInfo.cs b/Programs/examples/groupmanager/frmGroupInfo.cs index ca3dbf17..36f487e5 100644 --- a/Programs/examples/groupmanager/frmGroupInfo.cs +++ b/Programs/examples/groupmanager/frmGroupInfo.cs @@ -16,10 +16,10 @@ namespace groupmanager Group Group; GridClient Client; GroupProfile Profile = new GroupProfile(); - Dictionary Members = new Dictionary(); - Dictionary Titles = new Dictionary(); - Dictionary MemberData = new Dictionary(); - Dictionary Names = new Dictionary(); + Dictionary Members = new Dictionary(); + Dictionary Titles = new Dictionary(); + Dictionary MemberData = new Dictionary(); + Dictionary Names = new Dictionary(); GroupManager.GroupProfileCallback GroupProfileCallback; GroupManager.GroupMembersCallback GroupMembersCallback; GroupManager.GroupTitlesCallback GroupTitlesCallback; @@ -72,7 +72,7 @@ namespace groupmanager { Profile = profile; - if (Group.InsigniaID != LLUUID.Zero) + if (Group.InsigniaID != UUID.Zero) Client.Assets.RequestImage(Group.InsigniaID, ImageType.Normal, 113000.0f, 0); if (this.InvokeRequired) @@ -105,11 +105,11 @@ namespace groupmanager Client.Avatars.RequestAvatarName(Profile.FounderID); } - private void AvatarNamesHandler(Dictionary names) + private void AvatarNamesHandler(Dictionary names) { lock (Names) { - foreach (KeyValuePair agent in names) + foreach (KeyValuePair agent in names) { Names[agent.Key] = agent.Value; } @@ -128,14 +128,14 @@ namespace groupmanager { lock (Names) { - if (Profile.FounderID != LLUUID.Zero && Names.ContainsKey(Profile.FounderID)) + if (Profile.FounderID != UUID.Zero && Names.ContainsKey(Profile.FounderID)) { lblFoundedBy.Text = "Founded by " + Names[Profile.FounderID]; } lock (MemberData) { - foreach (KeyValuePair name in Names) + foreach (KeyValuePair name in Names) { if (!MemberData.ContainsKey(name.Key)) { @@ -198,7 +198,7 @@ namespace groupmanager } } - private void GroupMembersHandler(Dictionary members) + private void GroupMembersHandler(Dictionary members) { Members = members; @@ -213,7 +213,7 @@ namespace groupmanager } else { - List requestids = new List(); + List requestids = new List(); lock (Members) { @@ -241,7 +241,7 @@ namespace groupmanager } } - private void GroupTitlesHandler(Dictionary titles) + private void GroupTitlesHandler(Dictionary titles) { Titles = titles; @@ -258,7 +258,7 @@ namespace groupmanager { lock (Titles) { - foreach (KeyValuePair kvp in Titles) + foreach (KeyValuePair kvp in Titles) { Console.Write("Title: " + kvp.Value.Title + " = " + kvp.Key.ToString()); if (kvp.Value.Selected) @@ -273,7 +273,7 @@ namespace groupmanager public class GroupMemberData { - public LLUUID ID; + public UUID ID; public string Name; public string Title; public string LastOnline; diff --git a/Programs/examples/groupmanager/frmGroupManager.cs b/Programs/examples/groupmanager/frmGroupManager.cs index 428aa7d6..a8d8bb00 100644 --- a/Programs/examples/groupmanager/frmGroupManager.cs +++ b/Programs/examples/groupmanager/frmGroupManager.cs @@ -13,7 +13,7 @@ namespace groupmanager public partial class frmGroupManager : Form { GridClient Client; - Dictionary Groups; + Dictionary Groups; public frmGroupManager() { @@ -128,7 +128,7 @@ namespace groupmanager } } - private void Groups_OnCurrentGroups(Dictionary groups) + private void Groups_OnCurrentGroups(Dictionary groups) { Groups = groups; diff --git a/Programs/importprimscript/importprimscript.cs b/Programs/importprimscript/importprimscript.cs index a1ab50f5..94840d60 100644 --- a/Programs/importprimscript/importprimscript.cs +++ b/Programs/importprimscript/importprimscript.cs @@ -13,11 +13,11 @@ namespace importprimscript { public string Name; public string TextureFile; - public LLUUID TextureID; + public UUID TextureID; public string SculptFile; - public LLUUID SculptID; - public LLVector3 Scale; - public LLVector3 Offset; + public UUID SculptID; + public Vector3 Scale; + public Vector3 Offset; } class importprimscript @@ -25,9 +25,9 @@ namespace importprimscript static GridClient Client = new GridClient(); static Sculpt CurrentSculpt = null; static AutoResetEvent RezzedEvent = new AutoResetEvent(false); - static LLVector3 RootPosition = LLVector3.Zero; + static Vector3 RootPosition = Vector3.Zero; static List RezzedPrims = new List(); - static LLUUID UploadFolderID = LLUUID.Zero; + static UUID UploadFolderID = UUID.Zero; static void Main(string[] args) { @@ -141,12 +141,12 @@ namespace importprimscript sculpties[i].TextureID = UploadImage(sculpties[i].TextureFile, false); // Check for failed uploads - if (sculpties[i].SculptID == LLUUID.Zero) + if (sculpties[i].SculptID == UUID.Zero) { Console.WriteLine("Sculpt map " + sculpties[i].SculptFile + " failed to upload, skipping " + sculpties[i].Name); continue; } - else if (sculpties[i].TextureID == LLUUID.Zero) + else if (sculpties[i].TextureID == UUID.Zero) { Console.WriteLine("Texture " + sculpties[i].TextureFile + " failed to upload, skipping " + sculpties[i].Name); continue; @@ -163,8 +163,8 @@ namespace importprimscript // Rez this prim CurrentSculpt = sculpties[i]; - Client.Objects.AddPrim(Client.Network.CurrentSim, volume, LLUUID.Zero, - RootPosition + CurrentSculpt.Offset, CurrentSculpt.Scale, LLQuaternion.Identity); + Client.Objects.AddPrim(Client.Network.CurrentSim, volume, UUID.Zero, + RootPosition + CurrentSculpt.Offset, CurrentSculpt.Scale, Quaternion.Identity); // Wait for the prim to rez and the properties be set for it if (!RezzedEvent.WaitOne(1000 * 10, false)) @@ -197,9 +197,9 @@ namespace importprimscript Console.WriteLine(level + ": " + message); } - static LLUUID UploadImage(string filename, bool lossless) + static UUID UploadImage(string filename, bool lossless) { - LLUUID newAssetID = LLUUID.Zero; + UUID newAssetID = UUID.Zero; byte[] jp2data = null; try @@ -210,7 +210,7 @@ namespace importprimscript catch (Exception ex) { Console.WriteLine("Failed to encode image file " + filename + ": " + ex.ToString()); - return LLUUID.Zero; + return UUID.Zero; } AutoResetEvent uploadEvent = new AutoResetEvent(false); @@ -222,7 +222,7 @@ namespace importprimscript // FIXME: Do something with progress? }, - delegate(bool success, string status, LLUUID itemID, LLUUID assetID) + delegate(bool success, string status, UUID itemID, UUID assetID) { if (success) { @@ -308,7 +308,7 @@ namespace importprimscript switch (words[0]) { case "newPrim": - if (current.Scale != LLVector3.Zero && + if (current.Scale != Vector3.Zero && !String.IsNullOrEmpty(current.SculptFile) && !String.IsNullOrEmpty(current.TextureFile)) { @@ -343,12 +343,12 @@ namespace importprimscript x = Single.Parse(words[2]); y = Single.Parse(words[3]); z = Single.Parse(words[4]); - current.Scale = new LLVector3(x, y, z); + current.Scale = new Vector3(x, y, z); x = Single.Parse(words[6]); y = Single.Parse(words[7]); z = Single.Parse(words[8]); - current.Offset = new LLVector3(x, y, z); + current.Offset = new Vector3(x, y, z); } break; } @@ -362,7 +362,7 @@ namespace importprimscript } // Add the final prim - if (current != null && current.Scale != LLVector3.Zero && + if (current != null && current.Scale != Vector3.Zero && !String.IsNullOrEmpty(current.SculptFile) && !String.IsNullOrEmpty(current.TextureFile)) { diff --git a/Programs/mapgenerator/ProtocolManager.cs b/Programs/mapgenerator/ProtocolManager.cs index dc6befd3..0559f6f5 100644 --- a/Programs/mapgenerator/ProtocolManager.cs +++ b/Programs/mapgenerator/ProtocolManager.cs @@ -41,17 +41,17 @@ namespace mapgenerator /// F64, /// - LLUUID, + UUID, /// BOOL, /// - LLVector3, + Vector3, /// - LLVector3d, + Vector3d, /// - LLVector4, + Vector4, /// - LLQuaternion, + Quaternion, /// IPADDR, /// @@ -207,12 +207,12 @@ namespace mapgenerator TypeSizes.Add(FieldType.S32, 4); TypeSizes.Add(FieldType.F32, 4); TypeSizes.Add(FieldType.F64, 8); - TypeSizes.Add(FieldType.LLUUID, 16); + TypeSizes.Add(FieldType.UUID, 16); TypeSizes.Add(FieldType.BOOL, 1); - TypeSizes.Add(FieldType.LLVector3, 12); - TypeSizes.Add(FieldType.LLVector3d, 24); - TypeSizes.Add(FieldType.LLVector4, 16); - TypeSizes.Add(FieldType.LLQuaternion, 16); + TypeSizes.Add(FieldType.Vector3, 12); + TypeSizes.Add(FieldType.Vector3d, 24); + TypeSizes.Add(FieldType.Vector4, 16); + TypeSizes.Add(FieldType.Quaternion, 16); TypeSizes.Add(FieldType.IPADDR, 4); TypeSizes.Add(FieldType.IPPORT, 2); TypeSizes.Add(FieldType.Variable, -1); diff --git a/Programs/mapgenerator/mapgenerator.cs b/Programs/mapgenerator/mapgenerator.cs index 9b6f3076..8fb424e4 100644 --- a/Programs/mapgenerator/mapgenerator.cs +++ b/Programs/mapgenerator/mapgenerator.cs @@ -29,20 +29,20 @@ namespace mapgenerator case FieldType.U32: type = "uint"; break; - case FieldType.LLQuaternion: - type = "LLQuaternion"; + case FieldType.Quaternion: + type = "Quaternion"; break; - case FieldType.LLUUID: - type = "LLUUID"; + case FieldType.UUID: + type = "UUID"; break; - case FieldType.LLVector3: - type = "LLVector3"; + case FieldType.Vector3: + type = "Vector3"; break; - case FieldType.LLVector3d: - type = "LLVector3d"; + case FieldType.Vector3d: + type = "Vector3d"; break; - case FieldType.LLVector4: - type = "LLVector4"; + case FieldType.Vector4: + type = "Vector4"; break; case FieldType.S16: type = "short"; @@ -126,19 +126,19 @@ namespace mapgenerator writer.WriteLine(" " + field.Name + " = (ushort)(bytes[i++] + (bytes[i++] << 8));"); break; - case FieldType.LLQuaternion: + case FieldType.Quaternion: writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i, true); i += 12;"); break; - case FieldType.LLUUID: + case FieldType.UUID: writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 16;"); break; - case FieldType.LLVector3: + case FieldType.Vector3: writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 12;"); break; - case FieldType.LLVector3d: + case FieldType.Vector3d: writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 24;"); break; - case FieldType.LLVector4: + case FieldType.Vector4: writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 16;"); break; case FieldType.S16: @@ -216,17 +216,17 @@ namespace mapgenerator writer.WriteLine("bytes[i++] = (byte)(" + field.Name + " % 256);"); writer.WriteLine(" bytes[i++] = (byte)((" + field.Name + " >> 8) % 256);"); break; - case FieldType.LLUUID: + case FieldType.UUID: writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 16); i += 16;"); break; - case FieldType.LLVector4: + case FieldType.Vector4: writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 16); i += 16;"); break; - case FieldType.LLQuaternion: - case FieldType.LLVector3: + case FieldType.Quaternion: + case FieldType.Vector3: writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 12); i += 12;"); break; - case FieldType.LLVector3d: + case FieldType.Vector3d: writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 24); i += 24;"); break; case FieldType.U8: @@ -295,14 +295,13 @@ namespace mapgenerator case FieldType.U64: case FieldType.F64: return 8; - case FieldType.LLVector3: - case FieldType.LLQuaternion: + case FieldType.Vector3: + case FieldType.Quaternion: return 12; - case FieldType.LLUUID: - case FieldType.LLVector4: - //case FieldType.LLQuaternion: + case FieldType.UUID: + case FieldType.Vector4: return 16; - case FieldType.LLVector3d: + case FieldType.Vector3d: return 24; case FieldType.Fixed: return field.Count;