aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-05-21 00:52:18 +0100
committerUbitUmarov2017-05-21 00:52:18 +0100
commitc7fdb2ec53b67ac4c72d0f0643fb5beb116cb2fc (patch)
tree3ec1610e4ac908058fbcdd51ac8b9aaff16ebd73 /OpenSim/Region/Framework
parent fix a null ref in ubOde character (diff)
downloadopensim-SC_OLD-c7fdb2ec53b67ac4c72d0f0643fb5beb116cb2fc.zip
opensim-SC_OLD-c7fdb2ec53b67ac4c72d0f0643fb5beb116cb2fc.tar.gz
opensim-SC_OLD-c7fdb2ec53b67ac4c72d0f0643fb5beb116cb2fc.tar.bz2
opensim-SC_OLD-c7fdb2ec53b67ac4c72d0f0643fb5beb116cb2fc.tar.xz
on recover form nom finite avatar pos, don't add it physics it it had none
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2731274..474378d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2456,7 +2456,9 @@ namespace OpenSim.Region.Framework.Scenes
2456 // This is irritating. Really. 2456 // This is irritating. Really.
2457 if (!AbsolutePosition.IsFinite()) 2457 if (!AbsolutePosition.IsFinite())
2458 { 2458 {
2459 RemoveFromPhysicalScene(); 2459 bool isphysical = PhysicsActor != null;
2460 if(isphysical)
2461 RemoveFromPhysicalScene();
2460 m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999902"); 2462 m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999902");
2461 2463
2462 m_pos = m_LastFinitePos; 2464 m_pos = m_LastFinitePos;
@@ -2468,7 +2470,8 @@ namespace OpenSim.Region.Framework.Scenes
2468 m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999903"); 2470 m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999903");
2469 } 2471 }
2470 2472
2471 AddToPhysicalScene(false); 2473 if(isphysical)
2474 AddToPhysicalScene(false);
2472 } 2475 }
2473 else 2476 else
2474 { 2477 {