From 11209c72f5e728052654225d58b0fad7774c3b84 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sun, 23 Aug 2015 21:13:40 -0700 Subject: [PATCH] In ScenePresence, when removing from the physical scene, unsubscribe from collisions before removing the collision callbacks. Should not make operational differences. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 687a23c511..2f19b50ea5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1398,9 +1398,9 @@ namespace OpenSim.Region.Framework.Scenes if (PhysicsActor != null) { // PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; + PhysicsActor.UnSubscribeEvents(); PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; - PhysicsActor.UnSubscribeEvents(); m_scene.PhysicsScene.RemoveAvatar(PhysicsActor); PhysicsActor = null; }