diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 2f9a54b..ffd6dc0 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -606,8 +606,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
606 | break; | 606 | break; |
607 | 607 | ||
608 | case HollowShape.Circle: | 608 | case HollowShape.Circle: |
609 | // Hollow shape is a perfect cyllinder in respect to the cube's scale | 609 | // Hollow shape is a perfect cylinder in respect to the cube's scale |
610 | // Cyllinder hollow volume calculation | 610 | // Cylinder hollow volume calculation |
611 | 611 | ||
612 | hollowVolume *= 0.1963495f * 3.07920140172638f; | 612 | hollowVolume *= 0.1963495f * 3.07920140172638f; |
613 | break; | 613 | break; |
@@ -2847,7 +2847,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
2847 | } | 2847 | } |
2848 | public override bool PIDActive { set { m_usePID = value; } } | 2848 | public override bool PIDActive { set { m_usePID = value; } } |
2849 | public override float PIDTau { set { m_PIDTau = value; } } | 2849 | public override float PIDTau { set { m_PIDTau = value; } } |
2850 | 2850 | ||
2851 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } | 2851 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } |
2852 | public override bool PIDHoverActive { set { m_useHoverPID = value; } } | 2852 | public override bool PIDHoverActive { set { m_useHoverPID = value; } } |
2853 | public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } | 2853 | 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 6c2bdde..9d7aa94 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(); |