diff options
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 490c178..7718a29 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
@@ -1198,7 +1198,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1198 | } | 1198 | } |
1199 | Body = IntPtr.Zero; | 1199 | Body = IntPtr.Zero; |
1200 | hasOOBoffsetFromMesh = false; | 1200 | hasOOBoffsetFromMesh = false; |
1201 | // CalcPrimBodyData(); | 1201 | CalcPrimBodyData(); |
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | private void ChildSetGeom(OdePrim odePrim) | 1204 | private void ChildSetGeom(OdePrim odePrim) |
@@ -1223,7 +1223,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1223 | { | 1223 | { |
1224 | if (m_isphysical && Body != IntPtr.Zero && prim_geom != IntPtr.Zero) | 1224 | if (m_isphysical && Body != IntPtr.Zero && prim_geom != IntPtr.Zero) |
1225 | { | 1225 | { |
1226 | /* | ||
1227 | if (m_targetSpace != _parent_scene.ActiveSpace) | 1226 | if (m_targetSpace != _parent_scene.ActiveSpace) |
1228 | { | 1227 | { |
1229 | m_targetSpace = _parent_scene.ActiveSpace; | 1228 | m_targetSpace = _parent_scene.ActiveSpace; |
@@ -1238,7 +1237,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1238 | } | 1237 | } |
1239 | d.SpaceAdd(m_targetSpace, prim_geom); | 1238 | d.SpaceAdd(m_targetSpace, prim_geom); |
1240 | } | 1239 | } |
1241 | */ | ||
1242 | d.GeomEnable(prim_geom); | 1240 | d.GeomEnable(prim_geom); |
1243 | foreach (OdePrim prm in childrenPrim) | 1241 | foreach (OdePrim prm in childrenPrim) |
1244 | d.GeomEnable(prm.prim_geom); | 1242 | d.GeomEnable(prm.prim_geom); |
@@ -1256,7 +1254,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1256 | { | 1254 | { |
1257 | if (m_isphysical && Body != IntPtr.Zero && prim_geom != IntPtr.Zero) | 1255 | if (m_isphysical && Body != IntPtr.Zero && prim_geom != IntPtr.Zero) |
1258 | { | 1256 | { |
1259 | /* | ||
1260 | if (m_targetSpace == _parent_scene.ActiveSpace) | 1257 | if (m_targetSpace == _parent_scene.ActiveSpace) |
1261 | { | 1258 | { |
1262 | foreach (OdePrim prm in childrenPrim) | 1259 | foreach (OdePrim prm in childrenPrim) |
@@ -1270,7 +1267,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1270 | d.SpaceRemove(m_targetSpace, prim_geom); | 1267 | d.SpaceRemove(m_targetSpace, prim_geom); |
1271 | m_targetSpace = IntPtr.Zero; | 1268 | m_targetSpace = IntPtr.Zero; |
1272 | } | 1269 | } |
1273 | */ | ||
1274 | d.GeomDisable(prim_geom); | 1270 | d.GeomDisable(prim_geom); |
1275 | foreach (OdePrim prm in childrenPrim) | 1271 | foreach (OdePrim prm in childrenPrim) |
1276 | d.GeomDisable(prm.prim_geom); | 1272 | d.GeomDisable(prm.prim_geom); |