aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs28
1 files changed, 26 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 14516f9..b111172 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1140,12 +1140,29 @@ namespace OpenSim.Region.Physics.OdePlugin
1140 OdePrim newPrim; 1140 OdePrim newPrim;
1141 lock (OdeLock) 1141 lock (OdeLock)
1142 { 1142 {
1143 newPrim = new OdePrim(name, this, pos, siz, rot, pbs, isphysical); 1143 newPrim = new OdePrim(name, this, pos, siz, rot, pbs, isphysical,false,localID);
1144
1145 lock (_prims)
1146 _prims.Add(newPrim);
1147 }
1148 return newPrim;
1149 }
1150
1151 private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation,
1152 PrimitiveBaseShape pbs, bool isphysical, bool isPhantom, uint localID)
1153 {
1154 Vector3 pos = position;
1155 Vector3 siz = size;
1156 Quaternion rot = rotation;
1157
1158 OdePrim newPrim;
1159 lock (OdeLock)
1160 {
1161 newPrim = new OdePrim(name, this, pos, siz, rot, pbs, isphysical,isPhantom,localID);
1144 1162
1145 lock (_prims) 1163 lock (_prims)
1146 _prims.Add(newPrim); 1164 _prims.Add(newPrim);
1147 } 1165 }
1148 newPrim.LocalID = localID;
1149 return newPrim; 1166 return newPrim;
1150 } 1167 }
1151 1168
@@ -1169,6 +1186,13 @@ namespace OpenSim.Region.Physics.OdePlugin
1169 } 1186 }
1170 1187
1171 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 1188 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1189 Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, uint localid)
1190 {
1191 return AddPrim(primName, position, size, rotation, pbs, isPhysical, isPhantom, localid);
1192 }
1193
1194
1195 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1172 Vector3 size, Quaternion rotation, bool isPhysical, uint localid) 1196 Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
1173 { 1197 {
1174#if SPAM 1198#if SPAM