aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs1
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs14
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs6
3 files changed, 3 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f74f263..4629757 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4533,7 +4533,6 @@ namespace OpenSim.Region.Framework.Scenes
4533 { 4533 {
4534 // It's not phantom anymore. So make sure the physics engine get's knowledge of it 4534 // It's not phantom anymore. So make sure the physics engine get's knowledge of it
4535 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 4535 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
4536 LocalId,
4537 string.Format("{0}/{1}", Name, UUID), 4536 string.Format("{0}/{1}", Name, UUID),
4538 Shape, 4537 Shape,
4539 AbsolutePosition, 4538 AbsolutePosition,
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 28ace34..3870411 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -88,23 +88,9 @@ namespace OpenSim.Region.Physics.Manager
88 88
89 public abstract void RemovePrim(PhysicsActor prim); 89 public abstract void RemovePrim(PhysicsActor prim);
90 90
91 //public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
92 // Vector3 size, Quaternion rotation); //To be removed - Actually removed!
93
94 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 91 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
95 Vector3 size, Quaternion rotation, bool isPhysical, uint localid); 92 Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
96 93
97 public virtual PhysicsActor AddPrimShape(uint localID, string primName, PrimitiveBaseShape pbs, Vector3 position,
98 Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
99 {
100 PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
101
102 if (ret != null)
103 ret.LocalID = localID;
104
105 return ret;
106 }
107
108 public virtual float TimeDilation 94 public virtual float TimeDilation
109 { 95 {
110 get { return 1.0f; } 96 get { return 1.0f; }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 6fda32d..a307469 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -1677,7 +1677,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1677 } 1677 }
1678 1678
1679 private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation, 1679 private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation,
1680 IMesh mesh, PrimitiveBaseShape pbs, bool isphysical) 1680 IMesh mesh, PrimitiveBaseShape pbs, bool isphysical, uint localID)
1681 { 1681 {
1682 Vector3 pos = position; 1682 Vector3 pos = position;
1683 Vector3 siz = size; 1683 Vector3 siz = size;
@@ -1691,7 +1691,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1691 lock (_prims) 1691 lock (_prims)
1692 _prims.Add(newPrim); 1692 _prims.Add(newPrim);
1693 } 1693 }
1694 1694 newPrim.LocalID = localID;
1695 return newPrim; 1695 return newPrim;
1696 } 1696 }
1697 1697
@@ -1733,7 +1733,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1733// } 1733// }
1734// } 1734// }
1735 1735
1736 result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); 1736 result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical, localid);
1737 1737
1738 return result; 1738 return result;
1739 } 1739 }