diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 0cf2f5d..123c8ff 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2104,6 +2104,7 @@ Console.WriteLine("changeshape not need meshing"); | |||
2104 | parent.ChildSetGeom(this); | 2104 | parent.ChildSetGeom(this); |
2105 | } | 2105 | } |
2106 | } | 2106 | } |
2107 | |||
2107 | resetCollisionAccounting(); | 2108 | resetCollisionAccounting(); |
2108 | m_taintshape = false; | 2109 | m_taintshape = false; |
2109 | } | 2110 | } |
@@ -2343,7 +2344,7 @@ Console.WriteLine("changeshape not need meshing"); | |||
2343 | { | 2344 | { |
2344 | lock (_parent_scene.OdeLock) | 2345 | lock (_parent_scene.OdeLock) |
2345 | { | 2346 | { |
2346 | m_isVolumeDetect = (param!=0); | 2347 | m_isVolumeDetect = (param != 0); |
2347 | } | 2348 | } |
2348 | } | 2349 | } |
2349 | 2350 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index f5172aa..99392cc 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | //#define USE_DRAWSTUFF | 28 | //#define USE_DRAWSTUFF |
29 | #define SPAM | 29 | //#define SPAM |
30 | 30 | ||
31 | using System; | 31 | using System; |
32 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |