aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs50
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs66
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/UndoState.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
8 files changed, 70 insertions, 70 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index e4b109c..55b3ca7 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1125,13 +1125,13 @@ namespace OpenSim.Region.Environment.Scenes
1125 if (group != null) 1125 if (group != null)
1126 { 1126 {
1127 // LLVector3 oldPos = group.AbsolutePosition; 1127 // LLVector3 oldPos = group.AbsolutePosition;
1128 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment) 1128 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment)
1129 { 1129 {
1130 group.SendGroupTerseUpdate(); 1130 group.SendGroupTerseUpdate();
1131 return; 1131 return;
1132 } 1132 }
1133 1133
1134 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment) 1134 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment)
1135 { 1135 {
1136 group.UpdateSinglePosition(pos, localID); 1136 group.UpdateSinglePosition(pos, localID);
1137 } 1137 }
@@ -1151,19 +1151,19 @@ namespace OpenSim.Region.Environment.Scenes
1151 { 1151 {
1152 1152
1153 // LLVector3 oldPos = group.AbsolutePosition; 1153 // LLVector3 oldPos = group.AbsolutePosition;
1154 if (group.RootPart.m_IsAttachment) 1154 if (group.RootPart.IsAttachment)
1155 { 1155 {
1156 group.UpdateGroupPosition(pos); 1156 group.UpdateGroupPosition(pos);
1157 } 1157 }
1158 else 1158 else
1159 { 1159 {
1160 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment) 1160 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment)
1161 { 1161 {
1162 group.SendGroupTerseUpdate(); 1162 group.SendGroupTerseUpdate();
1163 1163
1164 return; 1164 return;
1165 } 1165 }
1166 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment) 1166 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment)
1167 { 1167 {
1168 group.UpdateGroupPosition(pos); 1168 group.UpdateGroupPosition(pos);
1169 } 1169 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2ee1302..39314eb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Environment.Scenes
196 set 196 set
197 { 197 {
198 LLVector3 val = value; 198 LLVector3 val = value;
199 if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !m_rootPart.m_IsAttachment) 199 if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !m_rootPart.IsAttachment)
200 { 200 {
201 m_scene.CrossPrimGroupIntoNewRegion(val, this); 201 m_scene.CrossPrimGroupIntoNewRegion(val, this);
202 } 202 }
@@ -491,7 +491,7 @@ namespace OpenSim.Region.Environment.Scenes
491 { 491 {
492 foreach (SceneObjectPart part in m_parts.Values) 492 foreach (SceneObjectPart part in m_parts.Values)
493 { 493 {
494 part.fromAssetID = AssetId; 494 part.FromAssetID = AssetId;
495 } 495 }
496 } 496 }
497 } 497 }
@@ -500,7 +500,7 @@ namespace OpenSim.Region.Environment.Scenes
500 { 500 {
501 if (m_rootPart != null) 501 if (m_rootPart != null)
502 { 502 {
503 return m_rootPart.fromAssetID; 503 return m_rootPart.FromAssetID;
504 } 504 }
505 return LLUUID.Zero; 505 return LLUUID.Zero;
506 } 506 }
@@ -690,7 +690,7 @@ namespace OpenSim.Region.Environment.Scenes
690 if (avatar != null) 690 if (avatar != null)
691 { 691 {
692 DetachFromBackup(this); 692 DetachFromBackup(this);
693 m_rootPart.m_attachedAvatar = agentID; 693 m_rootPart.AttachedAvatar = agentID;
694 694
695 695
696 if (m_rootPart.PhysActor != null) 696 if (m_rootPart.PhysActor != null)
@@ -701,8 +701,8 @@ namespace OpenSim.Region.Environment.Scenes
701 } 701 }
702 702
703 AbsolutePosition = AttachOffset; 703 AbsolutePosition = AttachOffset;
704 m_rootPart.m_attachedPos = AttachOffset; 704 m_rootPart.AttachedPos = AttachOffset;
705 m_rootPart.m_IsAttachment = true; 705 m_rootPart.IsAttachment = true;
706 706
707 m_rootPart.SetParentLocalId(avatar.LocalId); 707 m_rootPart.SetParentLocalId(avatar.LocalId);
708 lock (m_parts) 708 lock (m_parts)
@@ -736,7 +736,7 @@ namespace OpenSim.Region.Environment.Scenes
736 736
737 public void DetachToGround() 737 public void DetachToGround()
738 { 738 {
739 ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar); 739 ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.AttachedAvatar);
740 LLVector3 detachedpos = new LLVector3(127f,127f,127f); 740 LLVector3 detachedpos = new LLVector3(127f,127f,127f);
741 if (avatar != null) 741 if (avatar != null)
742 { 742 {
@@ -744,10 +744,10 @@ namespace OpenSim.Region.Environment.Scenes
744 avatar.RemoveAttachment(this); 744 avatar.RemoveAttachment(this);
745 } 745 }
746 AbsolutePosition = detachedpos; 746 AbsolutePosition = detachedpos;
747 m_rootPart.m_attachedAvatar = LLUUID.Zero; 747 m_rootPart.AttachedAvatar = LLUUID.Zero;
748 m_rootPart.SetParentLocalId(0); 748 m_rootPart.SetParentLocalId(0);
749 m_rootPart.SetAttachmentPoint((byte)0); 749 m_rootPart.SetAttachmentPoint((byte)0);
750 m_rootPart.m_IsAttachment = false; 750 m_rootPart.IsAttachment = false;
751 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim); 751 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
752 HasGroupChanged = true; 752 HasGroupChanged = true;
753 AttachToBackup(); 753 AttachToBackup();
@@ -757,7 +757,7 @@ namespace OpenSim.Region.Environment.Scenes
757 757
758 public void DetachToInventoryPrep() 758 public void DetachToInventoryPrep()
759 { 759 {
760 ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar); 760 ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.AttachedAvatar);
761 //LLVector3 detachedpos = new LLVector3(127f, 127f, 127f); 761 //LLVector3 detachedpos = new LLVector3(127f, 127f, 127f);
762 if (avatar != null) 762 if (avatar != null)
763 { 763 {
@@ -765,11 +765,11 @@ namespace OpenSim.Region.Environment.Scenes
765 avatar.RemoveAttachment(this); 765 avatar.RemoveAttachment(this);
766 } 766 }
767 767
768 m_rootPart.m_attachedAvatar = LLUUID.Zero; 768 m_rootPart.AttachedAvatar = LLUUID.Zero;
769 m_rootPart.SetParentLocalId(0); 769 m_rootPart.SetParentLocalId(0);
770 //m_rootPart.SetAttachmentPoint((byte)0); 770 //m_rootPart.SetAttachmentPoint((byte)0);
771 m_rootPart.m_IsAttachment = false; 771 m_rootPart.IsAttachment = false;
772 AbsolutePosition = m_rootPart.m_attachedPos; 772 AbsolutePosition = m_rootPart.AttachedPos;
773 //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim); 773 //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
774 //AttachToBackup(); 774 //AttachToBackup();
775 //m_rootPart.ScheduleFullUpdate(); 775 //m_rootPart.ScheduleFullUpdate();
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Environment.Scenes
1004 continue; 1004 continue;
1005 if (part != RootPart) 1005 if (part != RootPart)
1006 part.ObjectFlags = objectflagupdate; 1006 part.ObjectFlags = objectflagupdate;
1007 aggregateScriptEvents |= part.m_aggregateScriptEvents; 1007 aggregateScriptEvents |= part.AggregateScriptEvents;
1008 } 1008 }
1009 } 1009 }
1010 1010
@@ -1154,9 +1154,9 @@ namespace OpenSim.Region.Environment.Scenes
1154 { 1154 {
1155 if (m_rootPart.UUID == part.UUID) 1155 if (m_rootPart.UUID == part.UUID)
1156 { 1156 {
1157 if (m_rootPart.m_IsAttachment) 1157 if (m_rootPart.IsAttachment)
1158 { 1158 {
1159 part.SendFullUpdateToClient(remoteClient, m_rootPart.m_attachedPos, clientFlags); 1159 part.SendFullUpdateToClient(remoteClient, m_rootPart.AttachedPos, clientFlags);
1160 } 1160 }
1161 else 1161 else
1162 { 1162 {
@@ -1178,9 +1178,9 @@ namespace OpenSim.Region.Environment.Scenes
1178 { 1178 {
1179 if (m_rootPart.UUID == part.UUID) 1179 if (m_rootPart.UUID == part.UUID)
1180 { 1180 {
1181 if (m_rootPart.m_IsAttachment) 1181 if (m_rootPart.IsAttachment)
1182 { 1182 {
1183 part.SendTerseUpdateToClient(remoteClient, m_rootPart.m_attachedPos); 1183 part.SendTerseUpdateToClient(remoteClient, m_rootPart.AttachedPos);
1184 } 1184 }
1185 else 1185 else
1186 { 1186 {
@@ -1349,9 +1349,9 @@ namespace OpenSim.Region.Environment.Scenes
1349 { 1349 {
1350 if (rootpart.PhysActor != null) 1350 if (rootpart.PhysActor != null)
1351 { 1351 {
1352 if (rootpart.m_IsAttachment) 1352 if (rootpart.IsAttachment)
1353 { 1353 {
1354 ScenePresence avatar = m_scene.GetScenePresence(rootpart.m_attachedAvatar); 1354 ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
1355 if (avatar != null) 1355 if (avatar != null)
1356 { 1356 {
1357 avatar.PushForce(impulse); 1357 avatar.PushForce(impulse);
@@ -2326,9 +2326,9 @@ namespace OpenSim.Region.Environment.Scenes
2326 { 2326 {
2327 if (m_scene.EventManager.TriggerGroupMove(UUID, pos)) 2327 if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
2328 { 2328 {
2329 if (m_rootPart.m_IsAttachment) 2329 if (m_rootPart.IsAttachment)
2330 { 2330 {
2331 m_rootPart.m_attachedPos = pos; 2331 m_rootPart.AttachedPos = pos;
2332 } 2332 }
2333 2333
2334 AbsolutePosition = pos; 2334 AbsolutePosition = pos;
@@ -2538,11 +2538,11 @@ namespace OpenSim.Region.Environment.Scenes
2538 float setval = (rotate10 > 0) ? 1f : 0f; 2538 float setval = (rotate10 > 0) ? 1f : 0f;
2539 2539
2540 if (setX) 2540 if (setX)
2541 m_rootPart.m_rotationAxis.X = setval; 2541 m_rootPart.RotationAxis.X = setval;
2542 if (setY) 2542 if (setY)
2543 m_rootPart.m_rotationAxis.Y = setval; 2543 m_rootPart.RotationAxis.Y = setval;
2544 if (setZ) 2544 if (setZ)
2545 m_rootPart.m_rotationAxis.Z = setval; 2545 m_rootPart.RotationAxis.Z = setval;
2546 2546
2547 if (setX || setY || setZ) 2547 if (setX || setY || setZ)
2548 { 2548 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 993e8c7..1d719b2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -128,22 +128,22 @@ namespace OpenSim.Region.Environment.Scenes
128 [XmlIgnore] 128 [XmlIgnore]
129 public uint TimeStampTerse = 0; 129 public uint TimeStampTerse = 0;
130 [XmlIgnore] 130 [XmlIgnore]
131 public LLUUID fromAssetID = LLUUID.Zero; 131 public LLUUID FromAssetID = LLUUID.Zero;
132 [XmlIgnore] 132 [XmlIgnore]
133 public bool m_IsAttachment = false; 133 public bool IsAttachment = false;
134 [XmlIgnore] 134 [XmlIgnore]
135 public scriptEvents m_aggregateScriptEvents = 0; 135 public scriptEvents AggregateScriptEvents = 0;
136 [XmlIgnore] 136 [XmlIgnore]
137 public LLUUID m_attachedAvatar = LLUUID.Zero; 137 public LLUUID AttachedAvatar = LLUUID.Zero;
138 [XmlIgnore] 138 [XmlIgnore]
139 public LLVector3 m_attachedPos = LLVector3.Zero; 139 public LLVector3 AttachedPos = LLVector3.Zero;
140 [XmlIgnore] 140 [XmlIgnore]
141 public uint m_attachmentPoint = (byte)0; 141 public uint AttachmentPoint = (byte)0;
142 [XmlIgnore] 142 [XmlIgnore]
143 public PhysicsVector m_rotationAxis = new PhysicsVector(1f,1f,1f); 143 public PhysicsVector RotationAxis = new PhysicsVector(1f,1f,1f);
144 144
145 [XmlIgnore] 145 [XmlIgnore]
146 public bool m_undoing = false; 146 public bool Undoing = false;
147 147
148 [XmlIgnore] 148 [XmlIgnore]
149 private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None; 149 private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None;
@@ -151,19 +151,19 @@ namespace OpenSim.Region.Environment.Scenes
151 private byte m_clickAction = 0; 151 private byte m_clickAction = 0;
152 private Color m_color = Color.Black; 152 private Color m_color = Color.Black;
153 private string m_description = String.Empty; 153 private string m_description = String.Empty;
154 private List<uint> m_lastColliders = new List<uint>(); 154 private readonly List<uint> m_lastColliders = new List<uint>();
155 // private PhysicsVector m_lastRotationalVelocity = PhysicsVector.Zero; 155 // private PhysicsVector m_lastRotationalVelocity = PhysicsVector.Zero;
156 private int m_linkNum = 0; 156 private int m_linkNum = 0;
157 [XmlIgnore] 157 [XmlIgnore]
158 private int m_scriptAccessPin = 0; 158 private int m_scriptAccessPin = 0;
159 [XmlIgnore] 159 [XmlIgnore]
160 private Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>(); 160 private readonly Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
161 private string m_sitName = String.Empty; 161 private string m_sitName = String.Empty;
162 private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1); 162 private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1);
163 private Vector3 m_sitTargetPosition = new Vector3(0, 0, 0); 163 private Vector3 m_sitTargetPosition = new Vector3(0, 0, 0);
164 private string m_text = String.Empty; 164 private string m_text = String.Empty;
165 private string m_touchName = String.Empty; 165 private string m_touchName = String.Empty;
166 private UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5); 166 private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
167 private LLUUID _creatorID; 167 private LLUUID _creatorID;
168 168
169 /// <summary> 169 /// <summary>
@@ -433,9 +433,9 @@ namespace OpenSim.Region.Environment.Scenes
433 m_groupPosition.Y = PhysActor.Position.Y; 433 m_groupPosition.Y = PhysActor.Position.Y;
434 m_groupPosition.Z = PhysActor.Position.Z; 434 m_groupPosition.Z = PhysActor.Position.Z;
435 } 435 }
436 if (m_IsAttachment) 436 if (IsAttachment)
437 { 437 {
438 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(m_attachedAvatar); 438 ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar);
439 if (sp != null) 439 if (sp != null)
440 { 440 {
441 return sp.AbsolutePosition; 441 return sp.AbsolutePosition;
@@ -744,7 +744,7 @@ namespace OpenSim.Region.Environment.Scenes
744 public LLVector3 AbsolutePosition 744 public LLVector3 AbsolutePosition
745 { 745 {
746 get { 746 get {
747 if (m_IsAttachment) 747 if (IsAttachment)
748 return GroupPosition; 748 return GroupPosition;
749 749
750 return m_offsetPosition + m_groupPosition; } 750 return m_offsetPosition + m_groupPosition; }
@@ -769,7 +769,7 @@ namespace OpenSim.Region.Environment.Scenes
769 769
770 public scriptEvents ScriptEvents 770 public scriptEvents ScriptEvents
771 { 771 {
772 get { return m_aggregateScriptEvents; } 772 get { return AggregateScriptEvents; }
773 } 773 }
774 774
775 775
@@ -1907,7 +1907,7 @@ namespace OpenSim.Region.Environment.Scenes
1907 oldparts = (scriptEvents) m_scriptEvents[scriptid]; 1907 oldparts = (scriptEvents) m_scriptEvents[scriptid];
1908 1908
1909 // remove values from aggregated script events 1909 // remove values from aggregated script events
1910 m_aggregateScriptEvents &= ~oldparts; 1910 AggregateScriptEvents &= ~oldparts;
1911 m_scriptEvents.Remove(scriptid); 1911 m_scriptEvents.Remove(scriptid);
1912 } 1912 }
1913 } 1913 }
@@ -2098,8 +2098,8 @@ namespace OpenSim.Region.Environment.Scenes
2098 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; 2098 byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
2099 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, 2099 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
2100 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, 2100 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID,
2101 m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, 2101 m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, IsAttachment,
2102 m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); 2102 AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius);
2103 } 2103 }
2104 2104
2105 /// <summary> 2105 /// <summary>
@@ -2213,7 +2213,7 @@ namespace OpenSim.Region.Environment.Scenes
2213 // TODO: I have no idea why we are making this check. This should be sorted out 2213 // TODO: I have no idea why we are making this check. This should be sorted out
2214 if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0) 2214 if ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) == 0)
2215 { 2215 {
2216 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, fromAssetID); 2216 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, FromAssetID);
2217 } 2217 }
2218 else 2218 else
2219 { 2219 {
@@ -2226,15 +2226,15 @@ namespace OpenSim.Region.Environment.Scenes
2226 public void SendTerseUpdateToClient(IClientAPI remoteClient, LLVector3 lPos) 2226 public void SendTerseUpdateToClient(IClientAPI remoteClient, LLVector3 lPos)
2227 { 2227 {
2228 LLQuaternion mRot = RotationOffset; 2228 LLQuaternion mRot = RotationOffset;
2229 if (m_IsAttachment) 2229 if (IsAttachment)
2230 { 2230 {
2231 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, (byte)((m_attachmentPoint % 16) * 16 + (m_attachmentPoint / 16)),fromAssetID); 2231 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, (byte)((AttachmentPoint % 16) * 16 + (AttachmentPoint / 16)),FromAssetID);
2232 } 2232 }
2233 else 2233 else
2234 { 2234 {
2235 if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0) 2235 if ((ObjectFlags & (uint)LLObject.ObjectFlags.Physics) == 0)
2236 { 2236 {
2237 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, fromAssetID); 2237 remoteClient.SendPrimTerseUpdate(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, mRot, Velocity, RotationalVelocity, Shape.State, FromAssetID);
2238 } 2238 }
2239 else 2239 else
2240 { 2240 {
@@ -2247,7 +2247,7 @@ namespace OpenSim.Region.Environment.Scenes
2247 2247
2248 public void SetAttachmentPoint(uint AttachmentPoint) 2248 public void SetAttachmentPoint(uint AttachmentPoint)
2249 { 2249 {
2250 m_attachmentPoint = AttachmentPoint; 2250 this.AttachmentPoint = AttachmentPoint;
2251 2251
2252 // save the attachment point. 2252 // save the attachment point.
2253 //if (AttachmentPoint != 0) 2253 //if (AttachmentPoint != 0)
@@ -2335,7 +2335,7 @@ namespace OpenSim.Region.Environment.Scenes
2335 2335
2336 public void SetPhysicsAxisRotation() 2336 public void SetPhysicsAxisRotation()
2337 { 2337 {
2338 PhysActor.LockAngularMotion(m_rotationAxis); 2338 PhysActor.LockAngularMotion(RotationAxis);
2339 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); 2339 m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
2340 } 2340 }
2341 2341
@@ -2414,7 +2414,7 @@ namespace OpenSim.Region.Environment.Scenes
2414 2414
2415 public void StoreUndoState() 2415 public void StoreUndoState()
2416 { 2416 {
2417 if (!m_undoing) 2417 if (!Undoing)
2418 { 2418 {
2419 if (m_parentGroup != null) 2419 if (m_parentGroup != null)
2420 { 2420 {
@@ -3232,22 +3232,22 @@ namespace OpenSim.Region.Environment.Scenes
3232 { 3232 {
3233 foreach (scriptEvents s in m_scriptEvents.Values) 3233 foreach (scriptEvents s in m_scriptEvents.Values)
3234 { 3234 {
3235 m_aggregateScriptEvents |= s; 3235 AggregateScriptEvents |= s;
3236 } 3236 }
3237 } 3237 }
3238 3238
3239 uint objectflagupdate = 0; 3239 uint objectflagupdate = 0;
3240 3240
3241 if ( 3241 if (
3242 ((m_aggregateScriptEvents & scriptEvents.touch) != 0) || 3242 ((AggregateScriptEvents & scriptEvents.touch) != 0) ||
3243 ((m_aggregateScriptEvents & scriptEvents.touch_end) != 0) || 3243 ((AggregateScriptEvents & scriptEvents.touch_end) != 0) ||
3244 ((m_aggregateScriptEvents & scriptEvents.touch_start) != 0) 3244 ((AggregateScriptEvents & scriptEvents.touch_start) != 0)
3245 ) 3245 )
3246 { 3246 {
3247 objectflagupdate |= (uint) LLObject.ObjectFlags.Touch; 3247 objectflagupdate |= (uint) LLObject.ObjectFlags.Touch;
3248 } 3248 }
3249 3249
3250 if ((m_aggregateScriptEvents & scriptEvents.money) != 0) 3250 if ((AggregateScriptEvents & scriptEvents.money) != 0)
3251 { 3251 {
3252 objectflagupdate |= (uint) LLObject.ObjectFlags.Money; 3252 objectflagupdate |= (uint) LLObject.ObjectFlags.Money;
3253 } 3253 }
@@ -3258,9 +3258,9 @@ namespace OpenSim.Region.Environment.Scenes
3258 } 3258 }
3259 3259
3260 if ( 3260 if (
3261 ((m_aggregateScriptEvents & scriptEvents.collision) != 0) || 3261 ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
3262 ((m_aggregateScriptEvents & scriptEvents.collision_end) != 0) || 3262 ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
3263 ((m_aggregateScriptEvents & scriptEvents.collision_start) != 0) 3263 ((AggregateScriptEvents & scriptEvents.collision_start) != 0)
3264 ) 3264 )
3265 { 3265 {
3266 // subscribe to physics updates. 3266 // subscribe to physics updates.
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 57b717c..b24ee8a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2293,8 +2293,8 @@ namespace OpenSim.Region.Environment.Scenes
2293 { 2293 {
2294 // Set the parent localID to 0 so it transfers over properly. 2294 // Set the parent localID to 0 so it transfers over properly.
2295 gobj.RootPart.SetParentLocalId(0); 2295 gobj.RootPart.SetParentLocalId(0);
2296 gobj.RootPart.m_IsAttachment = false; 2296 gobj.RootPart.IsAttachment = false;
2297 gobj.AbsolutePosition = gobj.RootPart.m_attachedPos; 2297 gobj.AbsolutePosition = gobj.RootPart.AttachedPos;
2298 gobj.RootPart.LastOwnerID = gobj.GetFromAssetID(); 2298 gobj.RootPart.LastOwnerID = gobj.GetFromAssetID();
2299 m_scene.CrossPrimGroupIntoNewRegion(regionHandle, gobj); 2299 m_scene.CrossPrimGroupIntoNewRegion(regionHandle, gobj);
2300 } 2300 }
diff --git a/OpenSim/Region/Environment/Scenes/UndoState.cs b/OpenSim/Region/Environment/Scenes/UndoState.cs
index daabd8d..5d1f6a0 100644
--- a/OpenSim/Region/Environment/Scenes/UndoState.cs
+++ b/OpenSim/Region/Environment/Scenes/UndoState.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
89 { 89 {
90 if (part != null) 90 if (part != null)
91 { 91 {
92 part.m_undoing = true; 92 part.Undoing = true;
93 93
94 if (part.ParentID == 0) 94 if (part.ParentID == 0)
95 { 95 {
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes
104 part.Resize(Scale); 104 part.Resize(Scale);
105 part.ScheduleTerseUpdate(); 105 part.ScheduleTerseUpdate();
106 } 106 }
107 part.m_undoing = false; 107 part.Undoing = false;
108 108
109 } 109 }
110 } 110 }
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 2ef5c47..a67e7ab 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2554,7 +2554,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2554 2554
2555 m_host.AddScriptLPS(1); 2555 m_host.AddScriptLPS(1);
2556 2556
2557 if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar) 2557 if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar)
2558 { 2558 {
2559 // When attached, certain permissions are implicit if requested from owner 2559 // When attached, certain permissions are implicit if requested from owner
2560 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS | 2560 int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c9c4026..ed9bebf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2432,7 +2432,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2432 2432
2433 m_host.AddScriptLPS(1); 2433 m_host.AddScriptLPS(1);
2434 2434
2435 if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar) 2435 if (m_host.ParentGroup.RootPart.IsAttachment && agent == m_host.ParentGroup.RootPart.AttachedAvatar)
2436 { 2436 {
2437 // When attached, certain permissions are implicit if requested from owner 2437 // When attached, certain permissions are implicit if requested from owner
2438 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | 2438 int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 673189a..cdba1ac 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -468,7 +468,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
468 { 468 {
469 LLUUID appDomain=assetID; 469 LLUUID appDomain=assetID;
470 470
471 if (part.ParentGroup.RootPart.m_IsAttachment) 471 if (part.ParentGroup.RootPart.IsAttachment)
472 appDomain = part.ParentGroup.RootPart.UUID; 472 appDomain = part.ParentGroup.RootPart.UUID;
473 473
474 if (!m_AppDomains.ContainsKey(appDomain)) 474 if (!m_AppDomains.ContainsKey(appDomain))