diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 30 |
1 files changed, 15 insertions, 15 deletions
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); |