aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs11
2 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 94e6185..af05a15 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -595,8 +595,8 @@ namespace OpenSim.Region.Physics.OdePlugin
595 break; 595 break;
596 596
597 case HollowShape.Circle: 597 case HollowShape.Circle:
598 // Hollow shape is a perfect cyllinder in respect to the cube's scale 598 // Hollow shape is a perfect cylinder in respect to the cube's scale
599 // Cyllinder hollow volume calculation 599 // Cylinder hollow volume calculation
600 600
601 hollowVolume *= 0.1963495f * 3.07920140172638f; 601 hollowVolume *= 0.1963495f * 3.07920140172638f;
602 break; 602 break;
@@ -2836,7 +2836,7 @@ Console.WriteLine(" JointCreateFixed");
2836 } 2836 }
2837 public override bool PIDActive { set { m_usePID = value; } } 2837 public override bool PIDActive { set { m_usePID = value; } }
2838 public override float PIDTau { set { m_PIDTau = value; } } 2838 public override float PIDTau { set { m_PIDTau = value; } }
2839 2839
2840 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } 2840 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
2841 public override bool PIDHoverActive { set { m_useHoverPID = value; } } 2841 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
2842 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } 2842 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index 8d7d3b3..7e3ec63 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -137,8 +137,15 @@ namespace OpenSim.Region.Physics.OdePlugin
137 ODERayCastRequest[] reqs = m_PendingRequests.ToArray(); 137 ODERayCastRequest[] reqs = m_PendingRequests.ToArray();
138 for (int i = 0; i < reqs.Length; i++) 138 for (int i = 0; i < reqs.Length; i++)
139 { 139 {
140 if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast 140 try
141 RayCast(reqs[i]); // if there isn't anyone to send results 141 {
142 if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast
143 RayCast(reqs[i]); // if there isn't anyone to send results
144 }
145 catch
146 {
147 //Fail silently
148 }
142 } 149 }
143 150
144 m_PendingRequests.Clear(); 151 m_PendingRequests.Clear();