aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorRobert Adams2015-08-23 21:13:40 -0700
committerRobert Adams2015-08-23 21:13:40 -0700
commit11209c72f5e728052654225d58b0fad7774c3b84 (patch)
tree13114282d6c7a84734802621e58f76b99355e949 /OpenSim/Region/Framework
parentAdd Culture.FormatProvider to String.Format, like it is done for LSLFloat (diff)
downloadopensim-SC-11209c72f5e728052654225d58b0fad7774c3b84.zip
opensim-SC-11209c72f5e728052654225d58b0fad7774c3b84.tar.gz
opensim-SC-11209c72f5e728052654225d58b0fad7774c3b84.tar.bz2
opensim-SC-11209c72f5e728052654225d58b0fad7774c3b84.tar.xz
In ScenePresence, when removing from the physical scene, unsubscribe
from collisions before removing the collision callbacks. Should not make operational differences.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 687a23c..2f19b50 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1398,9 +1398,9 @@ namespace OpenSim.Region.Framework.Scenes
1398 if (PhysicsActor != null) 1398 if (PhysicsActor != null)
1399 { 1399 {
1400// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; 1400// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
1401 PhysicsActor.UnSubscribeEvents();
1401 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; 1402 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
1402 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; 1403 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
1403 PhysicsActor.UnSubscribeEvents();
1404 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor); 1404 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
1405 PhysicsActor = null; 1405 PhysicsActor = null;
1406 } 1406 }