1 files changed, 27 insertions, 12 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index de22fae..72b01ac 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -37,6 +37,18 @@ namespace OpenSim.Region.Physics.Manager
     public delegate void physicsCrash();
 
     public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal);
+    public delegate void RayCallback(List<ContactResult> list);
+
+    /// <summary>
+    /// Contact result from a raycast.
+    /// </summary>
+    public struct ContactResult
+    {
+        public Vector3 Pos;
+        public float Depth;
+        public uint ConsumerID;
+        public Vector3 Normal;
+    }
 
     public abstract class PhysicsScene
     {
@@ -61,7 +73,6 @@ namespace OpenSim.Region.Physics.Manager
             }
         }
 
-
         public abstract void Initialise(IMesher meshmerizer, IConfigSource config);
 
         public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying);
@@ -75,6 +86,10 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract void RemoveAvatar(PhysicsActor actor);
 
+        /// <summary>
+        /// Remove a prim from the physics scene.
+        /// </summary>
+        /// <param name="prim"></param>
         public abstract void RemovePrim(PhysicsActor prim);
 
         //public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
@@ -83,17 +98,6 @@ namespace OpenSim.Region.Physics.Manager
         public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                   Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
 
-        public virtual PhysicsActor AddPrimShape(uint localID, string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
-        {
-            PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
-
-            if (ret != null)
-                ret.LocalID = localID;
-
-            return ret;
-        }
-
         public virtual float TimeDilation
         {
             get { return 1.0f; }
@@ -226,6 +230,17 @@ namespace OpenSim.Region.Physics.Manager
                 retMethod(false, Vector3.Zero, 0, 999999999999f, Vector3.Zero);
         }
 
+        public virtual void RaycastWorld(Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod)
+        {
+            if (retMethod != null)
+                retMethod(new List<ContactResult>());
+        }
+
+        public virtual List<ContactResult> RaycastWorld(Vector3 position, Vector3 direction, float length, int Count)
+        {
+            return new List<ContactResult>();
+        }
+
         private class NullPhysicsScene : PhysicsScene
         {
             private static int m_workIndicator;