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