aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs18
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 29f607b..b8a937a 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>();
@@ -219,11 +227,6 @@ namespace OpenSim.Region.Framework.Scenes
219 227
220 protected AvatarAppearance m_appearance; 228 protected AvatarAppearance m_appearance;
221 229
222 public List<SceneObjectGroup> Attachments
223 {
224 get { return m_attachments; }
225 }
226
227 // neighbouring regions we have enabled a child agent in 230 // neighbouring regions we have enabled a child agent in
228 // holds the seed cap for the child agent in that region 231 // holds the seed cap for the child agent in that region
229 private Dictionary<ulong, string> m_knownChildRegions = new Dictionary<ulong, string>(); 232 private Dictionary<ulong, string> m_knownChildRegions = new Dictionary<ulong, string>();
@@ -3210,8 +3213,7 @@ namespace OpenSim.Region.Framework.Scenes
3210 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3213 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
3211 m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3214 m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3212 m_physicsActor.SubscribeEvents(500); 3215 m_physicsActor.SubscribeEvents(500);
3213 m_physicsActor.LocalID = LocalId; 3216 m_physicsActor.LocalID = LocalId;
3214
3215 } 3217 }
3216 3218
3217 private void OutOfBoundsCall(Vector3 pos) 3219 private void OutOfBoundsCall(Vector3 pos)
@@ -3221,7 +3223,7 @@ namespace OpenSim.Region.Framework.Scenes
3221 3223
3222 //AddToPhysicalScene(flying); 3224 //AddToPhysicalScene(flying);
3223 if (ControllingClient != null) 3225 if (ControllingClient != null)
3224 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.",true); 3226 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true);
3225 } 3227 }
3226 3228
3227 // Event called by the physics plugin to tell the avatar about a collision. 3229 // Event called by the physics plugin to tell the avatar about a collision.