aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorCareminster Team2011-07-19 10:25:49 -0700
committerroot2011-07-19 18:26:36 +0100
commit9fc7d65df7a094649eaa34921827ed1316ab67a5 (patch)
tree84a0668273995924c62cd2669a773f5c252b76c1 /OpenSim/Region/Physics/OdePlugin/OdeScene.cs
parentTidy up a superfluous AddPrimShape override in PhysicsScene (diff)
downloadopensim-SC_OLD-9fc7d65df7a094649eaa34921827ed1316ab67a5.zip
opensim-SC_OLD-9fc7d65df7a094649eaa34921827ed1316ab67a5.tar.gz
opensim-SC_OLD-9fc7d65df7a094649eaa34921827ed1316ab67a5.tar.bz2
opensim-SC_OLD-9fc7d65df7a094649eaa34921827ed1316ab67a5.tar.xz
Apply the localID to the Physics actor to prevent null calls later
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs6
1 files changed, 3 insertions, 3 deletions
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 }