diff options
| author | Teravus Ovares (Dan Olivares) | 2009-10-16 03:40:44 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-10-16 03:40:44 -0400 |
| commit | 1f28c6208be1b3be1acca69f0ac8056d0ceecc06 (patch) | |
| tree | d3a31405ea647e3b068a5cb60622c21837ddc37b | |
| parent | * A hacky attempt at resolving mantis #4260. I think ODE was unable to allo... (diff) | |
| download | opensim-SC_OLD-1f28c6208be1b3be1acca69f0ac8056d0ceecc06.zip opensim-SC_OLD-1f28c6208be1b3be1acca69f0ac8056d0ceecc06.tar.gz opensim-SC_OLD-1f28c6208be1b3be1acca69f0ac8056d0ceecc06.tar.bz2 opensim-SC_OLD-1f28c6208be1b3be1acca69f0ac8056d0ceecc06.tar.xz | |
* Added a message for when the null reference exception occurs to make debugging easier. Without this, from the user's perspective.. they cannot move, fly or otherwise do anything physical and without a message on the console, it would be hard to tell that this is what is occurring.
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index bd05c92..e5458d4 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1109,12 +1109,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1109 | try | 1109 | try |
| 1110 | { | 1110 | { |
| 1111 | vec = d.BodyGetPosition(Body); | 1111 | vec = d.BodyGetPosition(Body); |
| 1112 | //throw new NullReferenceException("foo!"); | 1112 | |
| 1113 | } | 1113 | } |
| 1114 | catch (NullReferenceException) | 1114 | catch (NullReferenceException) |
| 1115 | { | 1115 | { |
| 1116 | vec = new d.Vector3(Position.X, Position.Y, Position.Z); | 1116 | vec = new d.Vector3(_position.X, _position.Y, _position.Z); |
| 1117 | base.RaiseOutOfBounds(_position); | 1117 | base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem! |
| 1118 | m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name); | ||
| 1118 | } | 1119 | } |
| 1119 | 1120 | ||
| 1120 | 1121 | ||