diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs index e9394c4f9a..f57583dc0e 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs @@ -976,6 +976,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde if (collider != IntPtr.Zero) { m_parent_scene.actor_name_map.Remove(collider); + m_parent_scene.waitForSpaceUnlock(m_parent_scene.CharsSpace); SafeNativeMethods.GeomDestroy(collider); collider = IntPtr.Zero; } diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index 24eb83261e..0c4469ac06 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs @@ -378,10 +378,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde } // move to high level - SafeNativeMethods.SpaceSetSublevel(ActiveSpace, 256); - SafeNativeMethods.SpaceSetSublevel(CharsSpace, 256); - SafeNativeMethods.SpaceSetSublevel(StaticSpace, 256); - SafeNativeMethods.SpaceSetSublevel(GroundSpace, 256); + SafeNativeMethods.SpaceSetSublevel(ActiveSpace, 1); + SafeNativeMethods.SpaceSetSublevel(CharsSpace, 1); + SafeNativeMethods.SpaceSetSublevel(StaticSpace, 1); + SafeNativeMethods.SpaceSetSublevel(GroundSpace, 1); SafeNativeMethods.GeomSetCategoryBits(ActiveSpace, (uint)(CollisionCategories.Space | CollisionCategories.Geom | diff --git a/bin/lib32/ubode.dll b/bin/lib32/ubode.dll index d59ea19e5d..dc4f9f877d 100755 Binary files a/bin/lib32/ubode.dll and b/bin/lib32/ubode.dll differ diff --git a/bin/lib64/libubode-x86_64.so b/bin/lib64/libubode-x86_64.so index d52ba3834f..b6581d2bf2 100755 Binary files a/bin/lib64/libubode-x86_64.so and b/bin/lib64/libubode-x86_64.so differ diff --git a/bin/lib64/libubode.dylib b/bin/lib64/libubode.dylib index 57834bebaf..a5f528f422 100755 Binary files a/bin/lib64/libubode.dylib and b/bin/lib64/libubode.dylib differ diff --git a/bin/lib64/ubode.dll b/bin/lib64/ubode.dll index 6584527123..13ebcf918c 100755 Binary files a/bin/lib64/ubode.dll and b/bin/lib64/ubode.dll differ