diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bcf22c3..e960d51 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3184,8 +3184,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3184 | m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; | 3184 | m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; |
3185 | m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong | 3185 | m_physicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong |
3186 | m_physicsActor.SubscribeEvents(500); | 3186 | m_physicsActor.SubscribeEvents(500); |
3187 | m_physicsActor.LocalID = LocalId; | 3187 | m_physicsActor.LocalID = LocalId; |
3188 | |||
3189 | } | 3188 | } |
3190 | 3189 | ||
3191 | private void OutOfBoundsCall(Vector3 pos) | 3190 | private void OutOfBoundsCall(Vector3 pos) |
@@ -3195,7 +3194,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3195 | 3194 | ||
3196 | //AddToPhysicalScene(flying); | 3195 | //AddToPhysicalScene(flying); |
3197 | if (ControllingClient != null) | 3196 | 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); | 3197 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); |
3199 | } | 3198 | } |
3200 | 3199 | ||
3201 | // Event called by the physics plugin to tell the avatar about a collision. | 3200 | // Event called by the physics plugin to tell the avatar about a collision. |