diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 6f5abfa..b9c0936 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -127,6 +127,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
127 | private bool m_isphysical = false; | 127 | private bool m_isphysical = false; |
128 | private bool m_isSelected = false; | 128 | private bool m_isSelected = false; |
129 | 129 | ||
130 | internal bool m_isVolumeDetect = false; // If true, this prim only detects collisions but doesn't collide actively | ||
131 | |||
130 | private bool m_throttleUpdates = false; | 132 | private bool m_throttleUpdates = false; |
131 | private int throttleCounter = 0; | 133 | private int throttleCounter = 0; |
132 | public int m_interpenetrationcount = 0; | 134 | public int m_interpenetrationcount = 0; |
@@ -2226,7 +2228,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2226 | 2228 | ||
2227 | public override void SetVolumeDetect(int param) | 2229 | public override void SetVolumeDetect(int param) |
2228 | { | 2230 | { |
2229 | 2231 | lock (_parent_scene.OdeLock) | |
2232 | { | ||
2233 | m_isVolumeDetect = (param!=0); | ||
2234 | } | ||
2230 | } | 2235 | } |
2231 | 2236 | ||
2232 | public override PhysicsVector CenterOfMass | 2237 | public override PhysicsVector CenterOfMass |