diff options
| author | Melanie | 2011-07-15 19:30:23 +0200 |
|---|---|---|
| committer | Melanie | 2011-07-15 19:30:23 +0200 |
| commit | 8925fb5537f9abe150fb2dcf8345a329aaedc9f5 (patch) | |
| tree | f1e1791757cef6d0818d7c5d16b9fec687bf55cc /OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Add localid support to ch0de properly (diff) | |
| download | opensim-SC-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.zip opensim-SC-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.tar.gz opensim-SC-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.tar.bz2 opensim-SC-8925fb5537f9abe150fb2dcf8345a329aaedc9f5.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs')
| -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 7cd2dd1..82f1b94 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -256,8 +256,9 @@ 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) | 259 | Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode, uint localid) |
| 260 | { | 260 | { |
| 261 | m_localID = localid; | ||
| 261 | ode = dode; | 262 | ode = dode; |
| 262 | if (!pos.IsFinite()) | 263 | if (!pos.IsFinite()) |
| 263 | { | 264 | { |