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