aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-22 22:37:06 +0000
committerJustin Clark-Casey (justincc)2011-11-22 22:37:06 +0000
commitace4324e753435e317ec388b5b25a8e3ffd84db4 (patch)
treea7e1b478932ec380e27136eb28ea710af502e31f /OpenSim
parentComment out uncalled OdeScene.UnCombine() (diff)
downloadopensim-SC_OLD-ace4324e753435e317ec388b5b25a8e3ffd84db4.zip
opensim-SC_OLD-ace4324e753435e317ec388b5b25a8e3ffd84db4.tar.gz
opensim-SC_OLD-ace4324e753435e317ec388b5b25a8e3ffd84db4.tar.bz2
opensim-SC_OLD-ace4324e753435e317ec388b5b25a8e3ffd84db4.tar.xz
Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since this is now being down in OdeCharacter.DestroyOdeStructures()
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index b5436bd..7b04bcf 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -1735,12 +1735,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1735 1735
1736 internal void RemoveCharacter(OdeCharacter chr) 1736 internal void RemoveCharacter(OdeCharacter chr)
1737 { 1737 {
1738 if (_characters.Contains(chr)) 1738 _characters.Remove(chr);
1739 {
1740 _characters.Remove(chr);
1741 geom_name_map.Remove(chr.Shell);
1742 actor_name_map.Remove(chr.Shell);
1743 }
1744 } 1739 }
1745 1740
1746 private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation, 1741 private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation,