diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bcf22c3..6b95624 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -104,6 +104,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
104 | } | 104 | } |
105 | protected ScenePresenceAnimator m_animator; | 105 | protected ScenePresenceAnimator m_animator; |
106 | 106 | ||
107 | /// <value> | ||
108 | /// The scene objects attached to this avatar. Do not change this list directly - use methods such as | ||
109 | /// AddAttachment() and RemoveAttachment(). Lock this list when performing any read operations upon it. | ||
110 | /// </value> | ||
111 | public List<SceneObjectGroup> Attachments | ||
112 | { | ||
113 | get { return m_attachments; } | ||
114 | } | ||
107 | protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>(); | 115 | protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>(); |
108 | 116 | ||
109 | private Dictionary<UUID, ScriptControllers> scriptedcontrols = new Dictionary<UUID, ScriptControllers>(); | 117 | private Dictionary<UUID, ScriptControllers> scriptedcontrols = new Dictionary<UUID, ScriptControllers>(); |
@@ -1105,7 +1113,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1105 | 1113 | ||
1106 | m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); | 1114 | m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); |
1107 | SendInitialData(); | 1115 | SendInitialData(); |
1108 | |||
1109 | } | 1116 | } |
1110 | 1117 | ||
1111 | /// <summary> | 1118 | /// <summary> |
@@ -3184,8 +3191,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3184 | m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; | 3191 | m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; |
3185 | m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong | 3192 | m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong |
3186 | m_physicsActor.SubscribeEvents(500); | 3193 | m_physicsActor.SubscribeEvents(500); |
3187 | m_physicsActor.LocalID = LocalId; | 3194 | m_physicsActor.LocalID = LocalId; |
3188 | |||
3189 | } | 3195 | } |
3190 | 3196 | ||
3191 | private void OutOfBoundsCall(Vector3 pos) | 3197 | private void OutOfBoundsCall(Vector3 pos) |
@@ -3195,7 +3201,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3195 | 3201 | ||
3196 | //AddToPhysicalScene(flying); | 3202 | //AddToPhysicalScene(flying); |
3197 | if (ControllingClient != null) | 3203 | if (ControllingClient != null) |
3198 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.",true); | 3204 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); |
3199 | } | 3205 | } |
3200 | 3206 | ||
3201 | // Event called by the physics plugin to tell the avatar about a collision. | 3207 | // Event called by the physics plugin to tell the avatar about a collision. |