diff options
| author | Melanie | 2012-05-04 20:06:42 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-04 20:06:42 +0200 |
| commit | b5b21013da0663db2aacac3c2361e9904bb7a457 (patch) | |
| tree | 64d60b819545f85f3a20c2a8102ad9462aa18311 /OpenSim | |
| parent | Retain velocity on walking crossing - adapted from Ubit's reverted patch (diff) | |
| download | opensim-SC_OLD-b5b21013da0663db2aacac3c2361e9904bb7a457.zip opensim-SC_OLD-b5b21013da0663db2aacac3c2361e9904bb7a457.tar.gz opensim-SC_OLD-b5b21013da0663db2aacac3c2361e9904bb7a457.tar.bz2 opensim-SC_OLD-b5b21013da0663db2aacac3c2361e9904bb7a457.tar.xz | |
Reverse the order of physics event unsubscription to allow GC. Adapted from Unit's reverted patch
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 43b8746..ad6679e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1065,9 +1065,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1065 | { | 1065 | { |
| 1066 | // PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; | 1066 | // PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; |
| 1067 | PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; | 1067 | PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; |
| 1068 | m_scene.PhysicsScene.RemoveAvatar(PhysicsActor); | ||
| 1069 | PhysicsActor.UnSubscribeEvents(); | ||
| 1070 | PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; | 1068 | PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; |
| 1069 | PhysicsActor.UnSubscribeEvents(); | ||
| 1070 | m_scene.PhysicsScene.RemoveAvatar(PhysicsActor); | ||
| 1071 | PhysicsActor = null; | 1071 | PhysicsActor = null; |
| 1072 | } | 1072 | } |
| 1073 | // else | 1073 | // else |