aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index b2af180..459cd27 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -987,11 +987,10 @@ namespace OpenSim.Region.Physics.OdePlugin
987 987
988 internal void AddCollisionFrameTime(int t) 988 internal void AddCollisionFrameTime(int t)
989 { 989 {
990 // protect it from overflow crashing 990 if (m_cureventsubscription < 50000)
991 if (m_cureventsubscription + t >= int.MaxValue) 991 m_cureventsubscription += t;
992 m_cureventsubscription = 0;
993 m_cureventsubscription += t;
994 } 992 }
993
995 public override bool SubscribedEvents() 994 public override bool SubscribedEvents()
996 { 995 {
997 if (m_eventsubscription > 0) 996 if (m_eventsubscription > 0)
@@ -2563,10 +2562,10 @@ namespace OpenSim.Region.Physics.OdePlugin
2563 { 2562 {
2564 d.Quaternion qtmp; 2563 d.Quaternion qtmp;
2565 d.GeomCopyQuaternion(prim_geom, out qtmp); 2564 d.GeomCopyQuaternion(prim_geom, out qtmp);
2566 _orientation.W = qtmp.W;
2567 _orientation.X = qtmp.X; 2565 _orientation.X = qtmp.X;
2568 _orientation.Y = qtmp.Y; 2566 _orientation.Y = qtmp.Y;
2569 _orientation.Z = qtmp.Z; 2567 _orientation.Z = qtmp.Z;
2568 _orientation.W = qtmp.W;
2570 2569
2571 d.Vector3 lpos = d.GeomGetPosition(prim_geom); 2570 d.Vector3 lpos = d.GeomGetPosition(prim_geom);
2572 _position.X = lpos.X; 2571 _position.X = lpos.X;