diff options
| author | UbitUmarov | 2012-05-20 13:18:15 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-05-20 13:18:15 +0100 |
| commit | 11f582b26da987afe4c9ad76c6ce35b58a8bc6fd (patch) | |
| tree | 0f6255c1502399613a9f133d2fb8a5cb47fc81e1 /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
| parent | fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable... (diff) | |
| download | opensim-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/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index b2af180..62fd279 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) |