diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3380191..21311b0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1994,6 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1994 | public void SaveScriptedState(XmlTextWriter writer, bool oldIDs) | 1994 | public void SaveScriptedState(XmlTextWriter writer, bool oldIDs) |
1995 | { | 1995 | { |
1996 | XmlDocument doc = new XmlDocument(); | 1996 | XmlDocument doc = new XmlDocument(); |
1997 | doc.XmlResolver=null; | ||
1997 | Dictionary<UUID,string> states = new Dictionary<UUID,string>(); | 1998 | Dictionary<UUID,string> states = new Dictionary<UUID,string>(); |
1998 | 1999 | ||
1999 | SceneObjectPart[] parts = m_parts.GetArray(); | 2000 | SceneObjectPart[] parts = m_parts.GetArray(); |
@@ -2782,7 +2783,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2782 | return RootPart.Torque; | 2783 | return RootPart.Torque; |
2783 | } | 2784 | } |
2784 | 2785 | ||
2785 | // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object | 2786 | // This is used by llMoveToTarget() in an attached object |
2786 | public void MoveToTarget(Vector3 target, float tau) | 2787 | public void MoveToTarget(Vector3 target, float tau) |
2787 | { | 2788 | { |
2788 | if (IsAttachment) | 2789 | if (IsAttachment) |
@@ -2790,7 +2791,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2790 | ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); | 2791 | ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); |
2791 | 2792 | ||
2792 | if (avatar != null) | 2793 | if (avatar != null) |
2793 | avatar.MoveToTarget(target, false, false); | 2794 | avatar.MoveToTarget(target, false, false, tau); |
2794 | } | 2795 | } |
2795 | else | 2796 | else |
2796 | { | 2797 | { |