Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs
index 8d7d3b3..8d610f7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs
@@ -31,11 +31,11 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
 using OpenMetaverse;
-using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.PhysicsModules.SharedBase;
 using Ode.NET;
 using log4net;
 
-namespace OpenSim.Region.Physics.OdePlugin
+namespace OpenSim.Region.PhysicsModule.ODE
 {
     /// <summary>
     /// Processes raycast requests as ODE is in a state to be able to do them.
@@ -172,6 +172,13 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// <param name="req"></param>
         private void RayCast(ODERayCastRequest req)
         {
+            // NOTE: limit ray length or collisions will take all avaiable stack space
+            // this value may still be too large, depending on machine configuration
+            // of maximum stack
+            float len = req.length;
+            if (len > 250f)
+                len = 250f;
+
             // Create the ray
             IntPtr ray = d.CreateRay(m_scene.space, req.length);
             d.GeomRaySet(ray, req.Origin.X, req.Origin.Y, req.Origin.Z, req.Normal.X, req.Normal.Y, req.Normal.Z);