aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-16 12:42:53 -0700
committerJohn Hurliman2009-10-16 12:42:53 -0700
commiteee1318597eeff27ab0df4fa0596aea2acad568f (patch)
treef861868740cdbdbc6db9650677ff75557e137f35 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
parent* Change appearance packets from State to Task. This will hopefully fix the c... (diff)
parent* One more attempt at the NullRef In The OdePlugin. This might fix it, but ... (diff)
downloadopensim-SC_OLD-eee1318597eeff27ab0df4fa0596aea2acad568f.zip
opensim-SC_OLD-eee1318597eeff27ab0df4fa0596aea2acad568f.tar.gz
opensim-SC_OLD-eee1318597eeff27ab0df4fa0596aea2acad568f.tar.bz2
opensim-SC_OLD-eee1318597eeff27ab0df4fa0596aea2acad568f.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index e5458d4..1fff846 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1109,10 +1109,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1109 try 1109 try
1110 { 1110 {
1111 vec = d.BodyGetPosition(Body); 1111 vec = d.BodyGetPosition(Body);
1112
1113 } 1112 }
1114 catch (NullReferenceException) 1113 catch (NullReferenceException)
1115 { 1114 {
1115 _parent_scene.BadCharacter(this);
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); // Tells ScenePresence that there's a problem! 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 m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name);