diff options
author | Justin Clark-Casey (justincc) | 2011-07-31 00:49:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-31 00:49:49 +0100 |
commit | bd8f538f800afeffdb6b8ced11e65940921424ab (patch) | |
tree | d4e8133cbe2e8308c27d0bbbc8072169cfe62745 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | minor: correct method doc for last commit (diff) | |
download | opensim-SC_OLD-bd8f538f800afeffdb6b8ced11e65940921424ab.zip opensim-SC_OLD-bd8f538f800afeffdb6b8ced11e65940921424ab.tar.gz opensim-SC_OLD-bd8f538f800afeffdb6b8ced11e65940921424ab.tar.bz2 opensim-SC_OLD-bd8f538f800afeffdb6b8ced11e65940921424ab.tar.xz |
refactor: Remove argument to pass in an initial mesh to OdePrim since this is no longer required and it prevents removal of the _mesh field (which is only used temporarily)
If passing in a mesh becomes important again in the future then this can be reinstated.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 712f7cd..cd6a0fb 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -208,7 +208,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
208 | internal int m_material = (int)Material.Wood; | 208 | internal int m_material = (int)Material.Wood; |
209 | 209 | ||
210 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, | 210 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, |
211 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) | 211 | Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) |
212 | { | 212 | { |
213 | Name = primName; | 213 | Name = primName; |
214 | m_vehicle = new ODEDynamics(); | 214 | m_vehicle = new ODEDynamics(); |
@@ -252,7 +252,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
252 | 252 | ||
253 | _orientation = rotation; | 253 | _orientation = rotation; |
254 | m_taintrot = _orientation; | 254 | m_taintrot = _orientation; |
255 | _mesh = mesh; | ||
256 | _pbs = pbs; | 255 | _pbs = pbs; |
257 | 256 | ||
258 | _parent_scene = parent_scene; | 257 | _parent_scene = parent_scene; |