diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 3ed3b5a..42a408e 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
@@ -131,6 +131,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
131 | public bool m_disabled; | 131 | public bool m_disabled; |
132 | public bool m_taintadd; | 132 | public bool m_taintadd; |
133 | public bool m_taintselected; | 133 | public bool m_taintselected; |
134 | public bool m_taintphantom; | ||
134 | public bool m_taintCollidesWater; | 135 | public bool m_taintCollidesWater; |
135 | 136 | ||
136 | public uint m_localID; | 137 | public uint m_localID; |
@@ -161,6 +162,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
161 | 162 | ||
162 | private bool iscolliding; | 163 | private bool iscolliding; |
163 | private bool m_isphysical; | 164 | private bool m_isphysical; |
165 | private bool m_isphantom; | ||
164 | private bool m_isSelected; | 166 | private bool m_isSelected; |
165 | 167 | ||
166 | private bool m_NoColide; // for now only for internal use for bad meshs | 168 | private bool m_NoColide; // for now only for internal use for bad meshs |
@@ -311,8 +313,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
311 | m_taintvehicledata = vdata; | 313 | m_taintvehicledata = vdata; |
312 | _parent_scene.AddPhysicsActorTaint(this); | 314 | _parent_scene.AddPhysicsActorTaint(this); |
313 | } | 315 | } |
316 | |||
314 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, | 317 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, |
315 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode, uint localid) | 318 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical,bool pisPhantom, CollisionLocker dode, uint localid) |
316 | { | 319 | { |
317 | m_localID = localid; | 320 | m_localID = localid; |
318 | ode = dode; | 321 | ode = dode; |
@@ -373,6 +376,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
373 | m_targetSpace = _parent_scene.space; | 376 | m_targetSpace = _parent_scene.space; |
374 | } | 377 | } |
375 | 378 | ||
379 | m_isphantom = pisPhantom; | ||
380 | m_taintphantom = pisPhantom; | ||
381 | |||
376 | _triMeshData = IntPtr.Zero; | 382 | _triMeshData = IntPtr.Zero; |
377 | m_NoColide = false; | 383 | m_NoColide = false; |
378 | 384 | ||