aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorroot2011-07-15 20:07:59 +0100
committerroot2011-07-15 20:07:59 +0100
commite9dbe54ab1217e4310b0e7e014516363237e2a21 (patch)
treea7dc65799c92dc288c8d4d3d6c6f0c4adc824380 /OpenSim/Region/Physics/OdePlugin
parentfix duplication of physical objects for physics engines that care about the i... (diff)
downloadopensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.zip
opensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.tar.gz
opensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.tar.bz2
opensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.tar.xz
Fix some local id issues in physics glue
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs8
-rw-r--r--OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs2
2 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index ba8cba4..6fda32d 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);
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
index fbd1574..2ea810f 100644
--- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Physics.OdePlugin.Tests
84 Vector3 position = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f), 128f); 84 Vector3 position = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f), 128f);
85 Vector3 size = new Vector3(0.5f, 0.5f, 0.5f); 85 Vector3 size = new Vector3(0.5f, 0.5f, 0.5f);
86 Quaternion rot = Quaternion.Identity; 86 Quaternion rot = Quaternion.Identity;
87 PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true); 87 PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true, 0);
88 OdePrim oprim = (OdePrim)prim; 88 OdePrim oprim = (OdePrim)prim;
89 OdeScene pscene = (OdeScene) ps; 89 OdeScene pscene = (OdeScene) ps;
90 90