diff options
| author | UbitUmarov | 2012-02-24 18:25:43 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-02-24 18:25:43 +0000 |
| commit | ec94b82f514b988ad9b931c842a022a0fb5b3bae (patch) | |
| tree | c2efafd196dc9c91c994f6ba94e9bcff385858f8 | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| download | opensim-SC_OLD-ec94b82f514b988ad9b931c842a022a0fb5b3bae.zip opensim-SC_OLD-ec94b82f514b988ad9b931c842a022a0fb5b3bae.tar.gz opensim-SC_OLD-ec94b82f514b988ad9b931c842a022a0fb5b3bae.tar.bz2 opensim-SC_OLD-ec94b82f514b988ad9b931c842a022a0fb5b3bae.tar.xz | |
stop using useless geom tricallback.
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 80c1277..41afe76 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -1810,7 +1810,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1810 | { | 1810 | { |
| 1811 | // if (prim_geom == IntPtr.Zero) // setGeom takes care of phys engine recreate and prim_geom pointer | 1811 | // if (prim_geom == IntPtr.Zero) // setGeom takes care of phys engine recreate and prim_geom pointer |
| 1812 | // { | 1812 | // { |
| 1813 | SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null)); | 1813 | // SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null)); |
| 1814 | SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, null, null, null)); | ||
| 1814 | // } | 1815 | // } |
| 1815 | } | 1816 | } |
| 1816 | catch (AccessViolationException) | 1817 | catch (AccessViolationException) |