aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-05-20 13:18:15 +0100
committerUbitUmarov2012-05-20 13:18:15 +0100
commit11f582b26da987afe4c9ad76c6ce35b58a8bc6fd (patch)
tree0f6255c1502399613a9f133d2fb8a5cb47fc81e1 /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
parent fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable... (diff)
downloadopensim-SC-11f582b26da987afe4c9ad76c6ce35b58a8bc6fd.zip
opensim-SC-11f582b26da987afe4c9ad76c6ce35b58a8bc6fd.tar.gz
opensim-SC-11f582b26da987afe4c9ad76c6ce35b58a8bc6fd.tar.bz2
opensim-SC-11f582b26da987afe4c9ad76c6ce35b58a8bc6fd.tar.xz
minor changes
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index ca294b8..1084b0e 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -784,8 +784,6 @@ namespace OpenSim.Region.Physics.OdePlugin
784 784
785 // the Amotor still lets avatar rotation to drift during colisions 785 // the Amotor still lets avatar rotation to drift during colisions
786 // so force it back to identity 786 // so force it back to identity
787
788
789 787
790 d.Quaternion qtmp; 788 d.Quaternion qtmp;
791 qtmp.W = 1; 789 qtmp.W = 1;
@@ -1177,9 +1175,8 @@ namespace OpenSim.Region.Physics.OdePlugin
1177 internal void AddCollisionFrameTime(int t) 1175 internal void AddCollisionFrameTime(int t)
1178 { 1176 {
1179 // protect it from overflow crashing 1177 // protect it from overflow crashing
1180 if (m_cureventsubscription + t >= int.MaxValue) 1178 if (m_cureventsubscription < 50000)
1181 m_cureventsubscription = 0; 1179 m_cureventsubscription += t;
1182 m_cureventsubscription += t;
1183 } 1180 }
1184 1181
1185 public override bool SubscribedEvents() 1182 public override bool SubscribedEvents()