aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
diff options
context:
space:
mode:
authorMelanie2012-12-22 01:04:49 +0100
committerMelanie2012-12-22 01:04:49 +0100
commit2313a86e327c895667b133af785e1bd13233ffa2 (patch)
tree6180c1546b9f911b81fcaa50f1bb587611135ce3 /OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
parent* Partial Commit for Avatar Appearance to include the functionality of Cached... (diff)
parentMerge branch 'avination' into ubitwork (diff)
downloadopensim-SC-2313a86e327c895667b133af785e1bd13233ffa2.zip
opensim-SC-2313a86e327c895667b133af785e1bd13233ffa2.tar.gz
opensim-SC-2313a86e327c895667b133af785e1bd13233ffa2.tar.bz2
opensim-SC-2313a86e327c895667b133af785e1bd13233ffa2.tar.xz
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
index 561ab1c..54a83c2 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
@@ -199,6 +199,20 @@ namespace OpenSim.Region.Physics.OdePlugin
199 m_PendingRequests.Enqueue(req); 199 m_PendingRequests.Enqueue(req);
200 } 200 }
201 201
202 public void QueueRequest(IntPtr geom, Vector3 position, Vector3 direction, float length, int count,RayFilterFlags flags, RayCallback retMethod)
203 {
204 ODERayRequest req = new ODERayRequest();
205 req.geom = geom;
206 req.callbackMethod = retMethod;
207 req.length = length;
208 req.Normal = direction;
209 req.Origin = position;
210 req.Count = count;
211 req.filter = flags;
212
213 m_PendingRequests.Enqueue(req);
214 }
215
202 public void QueueRequest(Vector3 position, Vector3 direction, float length, int count, RaycastCallback retMethod) 216 public void QueueRequest(Vector3 position, Vector3 direction, float length, int count, RaycastCallback retMethod)
203 { 217 {
204 ODERayRequest req = new ODERayRequest(); 218 ODERayRequest req = new ODERayRequest();