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/OdePlugin/OdeScene.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/OdePlugin/OdeScene.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 88902b0..f5172aa 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -1708,7 +1708,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1708 | } | 1708 | } |
1709 | 1709 | ||
1710 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 1710 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
1711 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) | 1711 | Vector3 size, Quaternion rotation) //To be removed |
1712 | { | ||
1713 | return AddPrimShape(primName, pbs, position, size, rotation, false); | ||
1714 | } | ||
1715 | |||
1716 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
1717 | Vector3 size, Quaternion rotation, bool isPhysical) | ||
1712 | { | 1718 | { |
1713 | #if SPAM | 1719 | #if SPAM |
1714 | m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName); | 1720 | m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName); |