aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 575840e..b7b4f70 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -152,8 +152,8 @@ namespace OpenSim.Region.Environment.Scenes
152 152
153 public override uint LocalId 153 public override uint LocalId
154 { 154 {
155 get { return m_rootPart.LocalID; } 155 get { return m_rootPart.LocalId; }
156 set { m_rootPart.LocalID = value; } 156 set { m_rootPart.LocalId = value; }
157 } 157 }
158 158
159 public override LLUUID UUID 159 public override LLUUID UUID
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Environment.Scenes
289 { 289 {
290 reader.Read(); 290 reader.Read();
291 SceneObjectPart part = SceneObjectPart.FromXml(reader); 291 SceneObjectPart part = SceneObjectPart.FromXml(reader);
292 part.LocalID = m_scene.PrimIDAllocate(); 292 part.LocalId = m_scene.PrimIDAllocate();
293 AddPart(part); 293 AddPart(part);
294 part.RegionHandle = m_regionHandle; 294 part.RegionHandle = m_regionHandle;
295 295
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Environment.Scenes
304 sr.Close(); 304 sr.Close();
305 305
306 306
307 m_rootPart.LocalID = m_scene.PrimIDAllocate(); 307 m_rootPart.LocalId = m_scene.PrimIDAllocate();
308 m_rootPart.ParentID = 0; 308 m_rootPart.ParentID = 0;
309 m_rootPart.RegionHandle = m_regionHandle; 309 m_rootPart.RegionHandle = m_regionHandle;
310 UpdateParentIDs(); 310 UpdateParentIDs();
@@ -834,7 +834,7 @@ namespace OpenSim.Region.Environment.Scenes
834 { 834 {
835 foreach (SceneObjectPart part in m_parts.Values) 835 foreach (SceneObjectPart part in m_parts.Values)
836 { 836 {
837 if (part.LocalID == localID) 837 if (part.LocalId == localID)
838 { 838 {
839 return part; 839 return part;
840 } 840 }
@@ -867,7 +867,7 @@ namespace OpenSim.Region.Environment.Scenes
867 { 867 {
868 foreach (SceneObjectPart part in m_parts.Values) 868 foreach (SceneObjectPart part in m_parts.Values)
869 { 869 {
870 if (part.LocalID == localID) 870 if (part.LocalId == localID)
871 { 871 {
872 return true; 872 return true;
873 } 873 }
@@ -909,7 +909,7 @@ namespace OpenSim.Region.Environment.Scenes
909 Quaternion newRot = parentRot.Inverse()*oldRot; 909 Quaternion newRot = parentRot.Inverse()*oldRot;
910 linkPart.RotationOffset = new LLQuaternion(newRot.x, newRot.y, newRot.z, newRot.w); 910 linkPart.RotationOffset = new LLQuaternion(newRot.x, newRot.y, newRot.z, newRot.w);
911 911
912 linkPart.ParentID = m_rootPart.LocalID; 912 linkPart.ParentID = m_rootPart.LocalId;
913 linkPart.LinkNum = m_parts.Count; 913 linkPart.LinkNum = m_parts.Count;
914 914
915 m_parts.Add(linkPart.UUID, linkPart); 915 m_parts.Add(linkPart.UUID, linkPart);
@@ -1035,7 +1035,7 @@ namespace OpenSim.Region.Environment.Scenes
1035 private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation) 1035 private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation)
1036 { 1036 {
1037 part.SetParent(this); 1037 part.SetParent(this);
1038 part.ParentID = m_rootPart.LocalID; 1038 part.ParentID = m_rootPart.LocalId;
1039 part.LinkNum = m_parts.Count; 1039 part.LinkNum = m_parts.Count;
1040 m_parts.Add(part.UUID, part); 1040 m_parts.Add(part.UUID, part);
1041 1041
@@ -1515,7 +1515,7 @@ namespace OpenSim.Region.Environment.Scenes
1515 /// <param name="part"></param> 1515 /// <param name="part"></param>
1516 private void SetPartAsNonRoot(SceneObjectPart part) 1516 private void SetPartAsNonRoot(SceneObjectPart part)
1517 { 1517 {
1518 part.ParentID = m_rootPart.LocalID; 1518 part.ParentID = m_rootPart.LocalId;
1519 } 1519 }
1520 1520
1521 /// <summary> 1521 /// <summary>
@@ -1655,7 +1655,7 @@ namespace OpenSim.Region.Environment.Scenes
1655 { 1655 {
1656 if (part.UUID != m_rootPart.UUID) 1656 if (part.UUID != m_rootPart.UUID)
1657 { 1657 {
1658 part.ParentID = m_rootPart.LocalID; 1658 part.ParentID = m_rootPart.LocalId;
1659 } 1659 }
1660 } 1660 }
1661 } 1661 }
@@ -1692,7 +1692,7 @@ namespace OpenSim.Region.Environment.Scenes
1692 1692
1693 public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient) 1693 public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient)
1694 { 1694 {
1695 if (m_rootPart.LocalID == localId) 1695 if (m_rootPart.LocalId == localId)
1696 { 1696 {
1697 OnGrabGroup(offsetPos, remoteClient); 1697 OnGrabGroup(offsetPos, remoteClient);
1698 } 1698 }
@@ -1726,7 +1726,7 @@ namespace OpenSim.Region.Environment.Scenes
1726 avatars[i].StandUp(); 1726 avatars[i].StandUp();
1727 } 1727 }
1728 1728
1729 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalID); 1729 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
1730 } 1730 }
1731 } 1731 }
1732 } 1732 }
@@ -1767,7 +1767,7 @@ namespace OpenSim.Region.Environment.Scenes
1767 m_rootPart.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim); 1767 m_rootPart.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
1768 foreach (SceneObjectPart part in m_parts.Values) 1768 foreach (SceneObjectPart part in m_parts.Values)
1769 { 1769 {
1770 if (part.LocalID != m_rootPart.LocalID) 1770 if (part.LocalId != m_rootPart.LocalId)
1771 { 1771 {
1772 part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim); 1772 part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
1773 } 1773 }