diff options
| author | Dr Scofield | 2009-06-10 11:48:13 +0000 |
|---|---|---|
| committer | Dr Scofield | 2009-06-10 11:48:13 +0000 |
| commit | 8045ed28ecb89b7342c78ed083ce9536dee79770 (patch) | |
| tree | b52ee9811d8454df8f0bb6301a19c2c558815653 /OpenSim | |
| parent | persists Estate.PublicAccess settings across reboots [re #552] (diff) | |
| download | opensim-SC-8045ed28ecb89b7342c78ed083ce9536dee79770.zip opensim-SC-8045ed28ecb89b7342c78ed083ce9536dee79770.tar.gz opensim-SC-8045ed28ecb89b7342c78ed083ce9536dee79770.tar.bz2 opensim-SC-8045ed28ecb89b7342c78ed083ce9536dee79770.tar.xz | |
From: Alan Webb <alan_webb@us.ibm.com>
Eat collision errors --- NOTE: this fix might be naive, it seems to
have helped us getting to 81 avatars (whereas we'd crash with 20
before), but it sure would benefit from some check-over by a person
skilled in the art of ODE physics.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 60ac724..46689eb 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -769,9 +769,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 769 | ode.drelease(world); | 769 | ode.drelease(world); |
| 770 | base.TriggerPhysicsBasedRestart(); | 770 | base.TriggerPhysicsBasedRestart(); |
| 771 | } | 771 | } |
| 772 | catch (AccessViolationException) | 772 | catch (Exception e) |
| 773 | { | 773 | { |
| 774 | m_log.Warn("[PHYSICS]: Unable to collide test an object"); | 774 | m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message); |
| 775 | return; | 775 | return; |
| 776 | } | 776 | } |
| 777 | 777 | ||