From c7fdb2ec53b67ac4c72d0f0643fb5beb116cb2fc Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 21 May 2017 00:52:18 +0100
Subject: on recover form nom finite avatar pos, don't add it physics it it
had none
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region')
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
// This is irritating. Really.
if (!AbsolutePosition.IsFinite())
{
- RemoveFromPhysicalScene();
+ bool isphysical = PhysicsActor != null;
+ if(isphysical)
+ RemoveFromPhysicalScene();
m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999902");
m_pos = m_LastFinitePos;
@@ -2468,7 +2470,8 @@ namespace OpenSim.Region.Framework.Scenes
m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999903");
}
- AddToPhysicalScene(false);
+ if(isphysical)
+ AddToPhysicalScene(false);
}
else
{
--
cgit v1.1