aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
index aa51c4e..e8d6334 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
179 public virtual PhysicsActor AddAvatar( 179 public virtual PhysicsActor AddAvatar(
180 uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) 180 uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
181 { 181 {
182 PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying); 182 PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying);
183 return ret; 183 return ret;
184 } 184 }
185 185
@@ -217,7 +217,7 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
217 return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid); 217 return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
218 } 218 }
219 219
220 220
221 public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 221 public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
222 Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid) 222 Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid)
223 { 223 {
@@ -335,16 +335,16 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
335 /// <summary> 335 /// <summary>
336 /// Queue a raycast against the physics scene. 336 /// Queue a raycast against the physics scene.
337 /// The provided callback method will be called when the raycast is complete 337 /// The provided callback method will be called when the raycast is complete
338 /// 338 ///
339 /// Many physics engines don't support collision testing at the same time as 339 /// Many physics engines don't support collision testing at the same time as
340 /// manipulating the physics scene, so we queue the request up and callback 340 /// manipulating the physics scene, so we queue the request up and callback
341 /// a custom method when the raycast is complete. 341 /// a custom method when the raycast is complete.
342 /// This allows physics engines that give an immediate result to callback immediately 342 /// This allows physics engines that give an immediate result to callback immediately
343 /// and ones that don't, to callback when it gets a result back. 343 /// and ones that don't, to callback when it gets a result back.
344 /// 344 ///
345 /// ODE for example will not allow you to change the scene while collision testing or 345 /// ODE for example will not allow you to change the scene while collision testing or
346 /// it asserts, 'opteration not valid for locked space'. This includes adding a ray to the scene. 346 /// it asserts, 'opteration not valid for locked space'. This includes adding a ray to the scene.
347 /// 347 ///
348 /// This is named RayCastWorld to not conflict with modrex's Raycast method. 348 /// This is named RayCastWorld to not conflict with modrex's Raycast method.
349 /// </summary> 349 /// </summary>
350 /// <param name="position">Origin of the ray</param> 350 /// <param name="position">Origin of the ray</param>