diff options
| author | Kitto Flora | 2010-08-04 21:08:00 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-08-04 21:08:00 +0000 |
| commit | cb3b124df9213bf12383a5625ac4e545fcc91b87 (patch) | |
| tree | d7d2abfaf0e845f538622d5e9bb9e69d9bceefa7 /OpenSim | |
| parent | Log the UUID of a prim that fails meshing and set the prim to phantom during (diff) | |
| download | opensim-SC-cb3b124df9213bf12383a5625ac4e545fcc91b87.zip opensim-SC-cb3b124df9213bf12383a5625ac4e545fcc91b87.tar.gz opensim-SC-cb3b124df9213bf12383a5625ac4e545fcc91b87.tar.bz2 opensim-SC-cb3b124df9213bf12383a5625ac4e545fcc91b87.tar.xz | |
Fixes fresh hollowed prim collision shape.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 7e70db9..6aa28e0 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -1331,10 +1331,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1331 | _parent_scene.waitForSpaceUnlock(m_targetSpace); | 1331 | _parent_scene.waitForSpaceUnlock(m_targetSpace); |
| 1332 | try | 1332 | try |
| 1333 | { | 1333 | { |
| 1334 | if (prim_geom == IntPtr.Zero) | 1334 | // if (prim_geom == IntPtr.Zero) // setGeom takes care of phys engine recreate and prim_geom pointer |
| 1335 | { | 1335 | // { |
| 1336 | SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null)); | 1336 | SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null)); |
| 1337 | } | 1337 | // } |
| 1338 | } | 1338 | } |
| 1339 | catch (AccessViolationException) | 1339 | catch (AccessViolationException) |
| 1340 | { | 1340 | { |