diff options
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index a622745..353db44 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||
@@ -1717,7 +1717,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1717 | } | 1717 | } |
1718 | 1718 | ||
1719 | private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation, | 1719 | private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation, |
1720 | IMesh mesh, PrimitiveBaseShape pbs, bool isphysical) | 1720 | IMesh mesh, PrimitiveBaseShape pbs, bool isphysical, uint localid) |
1721 | { | 1721 | { |
1722 | 1722 | ||
1723 | Vector3 pos = position; | 1723 | Vector3 pos = position; |
@@ -1727,7 +1727,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1727 | OdePrim newPrim; | 1727 | OdePrim newPrim; |
1728 | lock (OdeLock) | 1728 | lock (OdeLock) |
1729 | { | 1729 | { |
1730 | newPrim = new OdePrim(name, this, pos, siz, rot, mesh, pbs, isphysical, ode); | 1730 | newPrim = new OdePrim(name, this, pos, siz, rot, mesh, pbs, isphysical, ode, localid); |
1731 | 1731 | ||
1732 | lock (_prims) | 1732 | lock (_prims) |
1733 | _prims.Add(newPrim); | 1733 | _prims.Add(newPrim); |
@@ -1749,13 +1749,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1749 | } | 1749 | } |
1750 | 1750 | ||
1751 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 1751 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
1752 | Vector3 size, Quaternion rotation) //To be removed | 1752 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) |
1753 | { | ||
1754 | return AddPrimShape(primName, pbs, position, size, rotation, false); | ||
1755 | } | ||
1756 | |||
1757 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
1758 | Vector3 size, Quaternion rotation, bool isPhysical) | ||
1759 | { | 1753 | { |
1760 | PhysicsActor result; | 1754 | PhysicsActor result; |
1761 | IMesh mesh = null; | 1755 | IMesh mesh = null; |
@@ -1763,7 +1757,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1763 | if (needsMeshing(pbs)) | 1757 | if (needsMeshing(pbs)) |
1764 | mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical); | 1758 | mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical); |
1765 | 1759 | ||
1766 | result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); | 1760 | result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical, localid); |
1767 | 1761 | ||
1768 | return result; | 1762 | return result; |
1769 | } | 1763 | } |