aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/TreePopulatorModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs26
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs30
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/ComplexObject.cs4
9 files changed, 40 insertions, 40 deletions
diff --git a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
index c97d1d5..edd4286 100644
--- a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules
162 m_scene.ForEachClient(delegate(IClientAPI controller) 162 m_scene.ForEachClient(delegate(IClientAPI controller)
163 { 163 {
164 controller.SendKillObject(m_scene.RegionInfo.RegionHandle, 164 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
165 selectedTree.LocalID); 165 selectedTree.LocalId);
166 }); 166 });
167 167
168 break; 168 break;
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 882e589..02d0e20 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
186 sceneObject.SetScene(m_parentScene); 186 sceneObject.SetScene(m_parentScene);
187 foreach (SceneObjectPart part in sceneObject.Children.Values) 187 foreach (SceneObjectPart part in sceneObject.Children.Values)
188 { 188 {
189 part.LocalID = m_parentScene.PrimIDAllocate(); 189 part.LocalId = m_parentScene.PrimIDAllocate();
190 190
191 } 191 }
192 sceneObject.UpdateParentIDs(); 192 sceneObject.UpdateParentIDs();
@@ -378,7 +378,7 @@ namespace OpenSim.Region.Environment.Scenes
378 378
379 379
380 objupdate.ObjectData[1].UpdateFlags = 276957500; // flags; // ?? 380 objupdate.ObjectData[1].UpdateFlags = 276957500; // flags; // ??
381 objupdate.ObjectData[1].ID = p.LocalID; 381 objupdate.ObjectData[1].ID = p.LocalId;
382 objupdate.ObjectData[1].FullID = p.UUID; 382 objupdate.ObjectData[1].FullID = p.UUID;
383 objupdate.ObjectData[1].OwnerID = p.OwnerID; 383 objupdate.ObjectData[1].OwnerID = p.OwnerID;
384 objupdate.ObjectData[1].Text = Helpers.StringToField(p.Text); 384 objupdate.ObjectData[1].Text = Helpers.StringToField(p.Text);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 8481737..14a6f7b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
186 } 186 }
187 187
188 // Retrieve item 188 // Retrieve item
189 TaskInventoryItem item = group.GetInventoryItem(part.LocalID, itemId); 189 TaskInventoryItem item = group.GetInventoryItem(part.LocalId, itemId);
190 if (null == item) 190 if (null == item)
191 { 191 {
192 return; 192 return;
@@ -206,8 +206,8 @@ namespace OpenSim.Region.Environment.Scenes
206 // Trigger rerunning of script (use TriggerRezScript event, see RezScript) 206 // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
207 if (isScriptRunning) 207 if (isScriptRunning)
208 { 208 {
209 group.StopScript(part.LocalID, item.ItemID); 209 group.StopScript(part.LocalId, item.ItemID);
210 group.StartScript(part.LocalID, item.ItemID); 210 group.StartScript(part.LocalId, item.ItemID);
211 } 211 }
212 } 212 }
213 213
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index c393479..20154ea 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -177,7 +177,7 @@ namespace OpenSim.Region.Environment.Scenes
177 // trigger a touch_start for a script in the root prim 177 // trigger a touch_start for a script in the root prim
178 foreach (SceneObjectPart part in obj.Children.Values) 178 foreach (SceneObjectPart part in obj.Children.Values)
179 { 179 {
180 EventManager.TriggerObjectGrab(part.LocalID, part.OffsetPosition, remoteClient); 180 EventManager.TriggerObjectGrab(part.LocalId, part.OffsetPosition, remoteClient);
181 } 181 }
182 182
183 return; 183 return;
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 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 641516e..2b13751 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -170,7 +170,7 @@ namespace OpenSim.Region.Environment.Scenes
170 else 170 else
171 { 171 {
172 string script = Helpers.FieldToUTF8String(asset.Data); 172 string script = Helpers.FieldToUTF8String(asset.Data);
173 m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID,item.ItemID,script); 173 m_parentGroup.Scene.EventManager.TriggerRezScript(LocalId,item.ItemID,script);
174 m_parentGroup.AddActiveScriptCount(1); 174 m_parentGroup.AddActiveScriptCount(1);
175 ScheduleFullUpdate(); 175 ScheduleFullUpdate();
176 } 176 }
@@ -211,7 +211,7 @@ namespace OpenSim.Region.Environment.Scenes
211 { 211 {
212 if (m_taskInventory.ContainsKey(itemId)) 212 if (m_taskInventory.ContainsKey(itemId))
213 { 213 {
214 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId); 214 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalId, itemId);
215 m_parentGroup.AddActiveScriptCount(-1); 215 m_parentGroup.AddActiveScriptCount(-1);
216 } 216 }
217 else 217 else
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 46bb89c..b7b7883 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -153,12 +153,12 @@ namespace OpenSim.Region.Environment.Scenes
153 set { m_uuid = value; } 153 set { m_uuid = value; }
154 } 154 }
155 155
156 protected uint m_localID; 156 protected uint m_localId;
157 157
158 public uint LocalID 158 public uint LocalId
159 { 159 {
160 get { return m_localID; } 160 get { return m_localId; }
161 set { m_localID = value; } 161 set { m_localId = value; }
162 } 162 }
163 163
164 protected string m_name; 164 protected string m_name;
@@ -571,7 +571,7 @@ namespace OpenSim.Region.Environment.Scenes
571 if (m_parentGroup != null) 571 if (m_parentGroup != null)
572 { 572 {
573 if (m_parentGroup.Scene != null) 573 if (m_parentGroup.Scene != null)
574 m_parentGroup.Scene.TriggerObjectChanged(LocalID, (uint)val); 574 m_parentGroup.Scene.TriggerObjectChanged(LocalId, (uint)val);
575 } 575 }
576 576
577 } 577 }
@@ -671,7 +671,7 @@ namespace OpenSim.Region.Environment.Scenes
671 CreatorID = OwnerID; 671 CreatorID = OwnerID;
672 LastOwnerID = LLUUID.Zero; 672 LastOwnerID = LLUUID.Zero;
673 UUID = LLUUID.Random(); 673 UUID = LLUUID.Random();
674 LocalID = (uint) (localID); 674 LocalId = (uint) (localID);
675 Shape = shape; 675 Shape = shape;
676 // Todo: Add More Object Parameter from above! 676 // Todo: Add More Object Parameter from above!
677 OwnershipCost = 0; 677 OwnershipCost = 0;
@@ -724,7 +724,7 @@ namespace OpenSim.Region.Environment.Scenes
724 CreatorID = creatorID; 724 CreatorID = creatorID;
725 LastOwnerID = lastOwnerID; 725 LastOwnerID = lastOwnerID;
726 UUID = LLUUID.Random(); 726 UUID = LLUUID.Random();
727 LocalID = (uint) (localID); 727 LocalId = (uint) (localID);
728 Shape = shape; 728 Shape = shape;
729 OwnershipCost = 0; 729 OwnershipCost = 0;
730 ObjectSaleType = (byte) 0; 730 ObjectSaleType = (byte) 0;
@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Environment.Scenes
1015 dupe.m_shape = m_shape.Copy(); 1015 dupe.m_shape = m_shape.Copy();
1016 dupe.m_regionHandle = m_regionHandle; 1016 dupe.m_regionHandle = m_regionHandle;
1017 dupe.UUID = LLUUID.Random(); 1017 dupe.UUID = LLUUID.Random();
1018 dupe.LocalID = localID; 1018 dupe.LocalId = localID;
1019 dupe.OwnerID = AgentID; 1019 dupe.OwnerID = AgentID;
1020 dupe.GroupID = GroupID; 1020 dupe.GroupID = GroupID;
1021 dupe.GroupPosition = new LLVector3(GroupPosition.X, GroupPosition.Y, GroupPosition.Z); 1021 dupe.GroupPosition = new LLVector3(GroupPosition.X, GroupPosition.Y, GroupPosition.Z);
@@ -1337,7 +1337,7 @@ namespace OpenSim.Region.Environment.Scenes
1337 1337
1338 PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; 1338 PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
1339 PhysActor.OnOutOfBounds += PhysicsOutOfBounds; 1339 PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
1340 if (ParentID != 0 && ParentID != LocalID) 1340 if (ParentID != 0 && ParentID != LocalId)
1341 { 1341 {
1342 if (ParentGroup.RootPart.PhysActor != null) 1342 if (ParentGroup.RootPart.PhysActor != null)
1343 { 1343 {
@@ -1742,7 +1742,7 @@ namespace OpenSim.Region.Environment.Scenes
1742 1742
1743 1743
1744 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; 1744 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
1745 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, m_shape, lPos, clientFlags, m_uuid, 1745 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, clientFlags, m_uuid,
1746 OwnerID, 1746 OwnerID,
1747 m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation); 1747 m_text, color, ParentID, m_particleSystem, lRot, m_clickAction, m_TextureAnimation);
1748 } 1748 }
@@ -1790,11 +1790,11 @@ namespace OpenSim.Region.Environment.Scenes
1790 LLQuaternion mRot = RotationOffset; 1790 LLQuaternion mRot = RotationOffset;
1791 if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) 1791 if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
1792 { 1792 {
1793 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot); 1793 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot);
1794 } 1794 }
1795 else 1795 else
1796 { 1796 {
1797 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot, Velocity, 1797 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity,
1798 RotationalVelocity); 1798 RotationalVelocity);
1799 //System.Console.WriteLine("LID: " + LocalID + " RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString()); 1799 //System.Console.WriteLine("LID: " + LocalID + " RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString());
1800 } 1800 }
@@ -1805,11 +1805,11 @@ namespace OpenSim.Region.Environment.Scenes
1805 LLQuaternion mRot = RotationOffset; 1805 LLQuaternion mRot = RotationOffset;
1806 if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) 1806 if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
1807 { 1807 {
1808 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot); 1808 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot);
1809 } 1809 }
1810 else 1810 else
1811 { 1811 {
1812 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalID, lPos, mRot, Velocity, 1812 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity,
1813 RotationalVelocity); 1813 RotationalVelocity);
1814 //System.Console.WriteLine("LID: " + LocalID + "RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString()); 1814 //System.Console.WriteLine("LID: " + LocalID + "RVel:" + RotationalVelocity.ToString() + " TD: " + ((ushort)(m_parentGroup.Scene.TimeDilation * 500000f)).ToString() + ":" + m_parentGroup.Scene.TimeDilation.ToString());
1815 } 1815 }
@@ -1932,7 +1932,7 @@ namespace OpenSim.Region.Environment.Scenes
1932 1932
1933 info.AddValue("m_inventorySerial", m_inventorySerial); 1933 info.AddValue("m_inventorySerial", m_inventorySerial);
1934 info.AddValue("m_uuid", m_uuid.UUID); 1934 info.AddValue("m_uuid", m_uuid.UUID);
1935 info.AddValue("m_localID", m_localID); 1935 info.AddValue("m_localID", m_localId);
1936 info.AddValue("m_name", m_name); 1936 info.AddValue("m_name", m_name);
1937 info.AddValue("m_flags", Flags); 1937 info.AddValue("m_flags", Flags);
1938 info.AddValue("m_material", m_material); 1938 info.AddValue("m_material", m_material);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index fabc3ed..f4acce5 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -956,7 +956,7 @@ namespace OpenSim.Region.Environment.Scenes
956 956
957 if (part != null) 957 if (part != null)
958 { 958 {
959 m_requestedSitTargetID = part.LocalID; 959 m_requestedSitTargetID = part.LocalId;
960 m_requestedSitOffset = offset; 960 m_requestedSitOffset = offset;
961 } 961 }
962 else 962 else
diff --git a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
index aa3f939..c09ed89 100644
--- a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
@@ -95,7 +95,7 @@ namespace SimpleApp
95 public override void OnGrabPart(SceneObjectPart part, LLVector3 offsetPos, IClientAPI remoteClient) 95 public override void OnGrabPart(SceneObjectPart part, LLVector3 offsetPos, IClientAPI remoteClient)
96 { 96 {
97 m_parts.Remove(part.UUID); 97 m_parts.Remove(part.UUID);
98 remoteClient.SendKillObject(m_regionHandle, part.LocalID); 98 remoteClient.SendKillObject(m_regionHandle, part.LocalId);
99 remoteClient.AddMoney(1); 99 remoteClient.AddMoney(1);
100 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", LLUUID.Zero); 100 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", LLUUID.Zero);
101 } 101 }
@@ -106,7 +106,7 @@ namespace SimpleApp
106 { 106 {
107 m_parts.Remove(m_rootPart.UUID); 107 m_parts.Remove(m_rootPart.UUID);
108 m_scene.RemoveEntity(this); 108 m_scene.RemoveEntity(this);
109 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalID); 109 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId);
110 remoteClient.AddMoney(50); 110 remoteClient.AddMoney(50);
111 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero); 111 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero);
112 } 112 }