aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs1
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs11
3 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 7f3ae6b..7788fba 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1221,7 +1221,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1221 1221
1222 public override float APIDDamping{ set { return; } } 1222 public override float APIDDamping{ set { return; } }
1223 1223
1224
1225 public override void SubscribeEvents(int ms) 1224 public override void SubscribeEvents(int ms)
1226 { 1225 {
1227 m_requestedUpdateFrequency = ms; 1226 m_requestedUpdateFrequency = ms;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 19fecf3..3b12b17 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -598,8 +598,8 @@ namespace OpenSim.Region.Physics.OdePlugin
598 break; 598 break;
599 599
600 case HollowShape.Circle: 600 case HollowShape.Circle:
601 // Hollow shape is a perfect cyllinder in respect to the cube's scale 601 // Hollow shape is a perfect cylinder in respect to the cube's scale
602 // Cyllinder hollow volume calculation 602 // Cylinder hollow volume calculation
603 603
604 hollowVolume *= 0.1963495f * 3.07920140172638f; 604 hollowVolume *= 0.1963495f * 3.07920140172638f;
605 break; 605 break;
@@ -2843,7 +2843,7 @@ Console.WriteLine(" JointCreateFixed");
2843 } 2843 }
2844 public override bool PIDActive { set { m_usePID = value; } } 2844 public override bool PIDActive { set { m_usePID = value; } }
2845 public override float PIDTau { set { m_PIDTau = value; } } 2845 public override float PIDTau { set { m_PIDTau = value; } }
2846 2846
2847 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } 2847 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
2848 public override bool PIDHoverActive { set { m_useHoverPID = value; } } 2848 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
2849 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } 2849 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();