diff options
| author | Melanie | 2011-07-15 19:35:49 +0200 |
|---|---|---|
| committer | Melanie | 2011-07-15 19:35:49 +0200 |
| commit | 8dff9d564dfbf4841f03a919df44e8ae3d76de25 (patch) | |
| tree | 787a083ac9efc5e3a67f271e7fe6bc4a22d0ea94 /OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.zip opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.gz opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.bz2 opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.xz | |
Revert "Add localid support to ch0de properly"
This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 82f1b94..7cd2dd1 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -256,9 +256,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 256 | 256 | ||
| 257 | 257 | ||
| 258 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, | 258 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, |
| 259 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode, uint localid) | 259 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode) |
| 260 | { | 260 | { |
| 261 | m_localID = localid; | ||
| 262 | ode = dode; | 261 | ode = dode; |
| 263 | if (!pos.IsFinite()) | 262 | if (!pos.IsFinite()) |
| 264 | { | 263 | { |