diff options
| author | Melanie | 2011-07-15 12:08:40 -0700 |
|---|---|---|
| committer | Melanie | 2011-07-15 19:36:00 +0200 |
| commit | c7dbd7cbd035ccc412624cd221348479d43798d6 (patch) | |
| tree | f1e1791757cef6d0818d7c5d16b9fec687bf55cc /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Revert "Add localid support to ch0de properly" (diff) | |
| download | opensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.zip opensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.gz opensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.bz2 opensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.xz | |
Fox some local id issues in physics glue
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index f5172aa..88902b0 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -1708,13 +1708,7 @@ 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) //To be removed | 1711 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) |
| 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) | ||
| 1718 | { | 1712 | { |
| 1719 | #if SPAM | 1713 | #if SPAM |
| 1720 | m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName); | 1714 | m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName); |