diff options
| author | Justin Clark-Casey (justincc) | 2011-08-01 06:35:59 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-01 06:35:59 +0100 |
| commit | f79df6f43f76fee577e987d1b931b4e30ad8b0d5 (patch) | |
| tree | d5b2f8307b56c23704205175107f7d2da0bcc422 | |
| parent | When an ODE geom is removed (as when a non-phantom prim is deleted, resized o... (diff) | |
| download | opensim-SC-f79df6f43f76fee577e987d1b931b4e30ad8b0d5.zip opensim-SC-f79df6f43f76fee577e987d1b931b4e30ad8b0d5.tar.gz opensim-SC-f79df6f43f76fee577e987d1b931b4e30ad8b0d5.tar.bz2 opensim-SC-f79df6f43f76fee577e987d1b931b4e30ad8b0d5.tar.xz | |
remove the unused ODEPrim.prev_geom field
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 16764c2..345156e 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -163,7 +163,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 163 | public IntPtr m_targetSpace = IntPtr.Zero; | 163 | public IntPtr m_targetSpace = IntPtr.Zero; |
| 164 | 164 | ||
| 165 | public IntPtr prim_geom; | 165 | public IntPtr prim_geom; |
| 166 | public IntPtr prev_geom; | ||
| 167 | public IntPtr _triMeshData; | 166 | public IntPtr _triMeshData; |
| 168 | 167 | ||
| 169 | private IntPtr _linkJointGroup = IntPtr.Zero; | 168 | private IntPtr _linkJointGroup = IntPtr.Zero; |
| @@ -228,7 +227,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 228 | body_autodisable_frames = parent_scene.bodyFramesAutoDisable; | 227 | body_autodisable_frames = parent_scene.bodyFramesAutoDisable; |
| 229 | 228 | ||
| 230 | prim_geom = IntPtr.Zero; | 229 | prim_geom = IntPtr.Zero; |
| 231 | prev_geom = IntPtr.Zero; | ||
| 232 | 230 | ||
| 233 | if (!pos.IsFinite()) | 231 | if (!pos.IsFinite()) |
| 234 | { | 232 | { |
| @@ -330,7 +328,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 330 | /// <param name="geom"></param> | 328 | /// <param name="geom"></param> |
| 331 | public void SetGeom(IntPtr geom) | 329 | public void SetGeom(IntPtr geom) |
| 332 | { | 330 | { |
| 333 | prev_geom = prim_geom; | ||
| 334 | prim_geom = geom; | 331 | prim_geom = geom; |
| 335 | //Console.WriteLine("SetGeom to " + prim_geom + " for " + Name); | 332 | //Console.WriteLine("SetGeom to " + prim_geom + " for " + Name); |
| 336 | if (prim_geom != IntPtr.Zero) | 333 | if (prim_geom != IntPtr.Zero) |