OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 8356: patched by hand, thx Lotek

0.9.1.0-post-fixes
UbitUmarov 2018-10-20 19:49:37 +01:00
parent 56d5b3bf92
commit 4ca859b4fc
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -567,7 +567,7 @@ namespace OpenSim.Region.Framework.Scenes
if (RootPart.GetStatusSandbox()) if (RootPart.GetStatusSandbox())
{ {
if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) if (Vector3.DistanceSquared(RootPart.StatusSandboxPos, value) > 100)
{ {
RootPart.ScriptSetPhysicsStatus(false); RootPart.ScriptSetPhysicsStatus(false);
@ -1994,7 +1994,6 @@ namespace OpenSim.Region.Framework.Scenes
public void SaveScriptedState(XmlTextWriter writer, bool oldIDs) public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<UUID,string> states = new Dictionary<UUID,string>(); Dictionary<UUID,string> states = new Dictionary<UUID,string>();
SceneObjectPart[] parts = m_parts.GetArray(); SceneObjectPart[] parts = m_parts.GetArray();
@ -2783,14 +2782,14 @@ namespace OpenSim.Region.Framework.Scenes
return RootPart.Torque; return RootPart.Torque;
} }
// This is used by llMoveToTarget() in an attached object // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
public void MoveToTarget(Vector3 target, float tau) public void MoveToTarget(Vector3 target, float tau)
{ {
if (IsAttachment) if (IsAttachment)
{ {
ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
if (avatar != null) if (avatar != null && !avatar.IsSatOnObject)
avatar.MoveToTarget(target, false, false, tau); avatar.MoveToTarget(target, false, false, tau);
} }
else else
@ -4531,7 +4530,7 @@ namespace OpenSim.Region.Framework.Scenes
if (RootPart.GetStatusSandbox()) if (RootPart.GetStatusSandbox())
{ {
if (Util.GetDistanceTo(RootPart.StatusSandboxPos, pos) > 10) if (Vector3.DistanceSquared(RootPart.StatusSandboxPos, pos) > 100)
{ {
RootPart.ScriptSetPhysicsStatus(false); RootPart.ScriptSetPhysicsStatus(false);
pos = AbsolutePosition; pos = AbsolutePosition;
@ -5029,7 +5028,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (uint idx in m_targets.Keys) foreach (uint idx in m_targets.Keys)
{ {
scriptPosTarget target = m_targets[idx]; scriptPosTarget target = m_targets[idx];
if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance) if (Vector3.DistanceSquared(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance * target.tolerance)
{ {
at_target = true; at_target = true;