From edc572dacf3ff65c5584f8c02bb291abce0c7122 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 1 Aug 2007 16:50:20 +0000
Subject: Some more work on SceneObject/primitive rewrites
 (AllNewSceneObjectGroup2 /Part2). Updated the JavaVM to a later version I did
 (basically some clean up and a little bit more functional). Added SendLoadURL
 method to IClientAPI.

---
 .../Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs')

diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index a4b3852..f932b70 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -23,7 +23,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// 
         /// </summary>
-        public int primCount
+        public int PrimCount
         {
             get
             {
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             foreach (AllNewSceneObjectPart2 part in this.m_parts.Values)
             {
-                if (part.m_localID == localID)
+                if (part.LocalID == localID)
                 {
                     return part;
                 }
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Environment.Scenes
             AllNewSceneObjectPart2 part = this.GetChildPrim(localID);
             if (part != null)
             {
-                if (part.uuid == this.m_rootPart.uuid)
+                if (part.UUID == this.m_rootPart.UUID)
                 {
                     this.UpdateRootPosition(pos);
                 }
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             foreach (AllNewSceneObjectPart2 obPart in this.m_parts.Values)
             {
-                if (obPart.uuid != this.m_rootPart.uuid)
+                if (obPart.UUID != this.m_rootPart.UUID)
                 {
                     obPart.OffsetPosition = obPart.OffsetPosition + diff;
                 }
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes
             AllNewSceneObjectPart2 part = this.GetChildPrim(localID);
             if (part != null)
             {
-                if (part.uuid == this.m_rootPart.uuid)
+                if (part.UUID == this.m_rootPart.UUID)
                 {
                     this.UpdateRootRotation(rot);
                 }
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             foreach (AllNewSceneObjectPart2 prim in this.m_parts.Values)
             {
-                if (prim.uuid != this.m_rootPart.uuid)
+                if (prim.UUID != this.m_rootPart.UUID)
                 {
                     Vector3 axPos = new Vector3(prim.OffsetPosition.X, prim.OffsetPosition.Y, prim.OffsetPosition.Z);
                     axPos = oldParentRot * axPos;
@@ -283,8 +283,8 @@ namespace OpenSim.Region.Environment.Scenes
         private void SetPartAsRoot(AllNewSceneObjectPart2 part)
         {
             this.m_rootPart = part;
-            this.m_uuid = part.uuid;
-            this.m_localId = part.m_localID;
+            this.m_uuid = part.UUID;
+            this.m_localId = part.LocalID;
         }
 
         /// <summary>
-- 
cgit v1.1