aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs27
1 files changed, 20 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 8535587..ec37836 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1886,15 +1886,14 @@ namespace OpenSim.Region.Framework.Scenes
1886 return Vector3.Zero; 1886 return Vector3.Zero;
1887 } 1887 }
1888 1888
1889 public void moveToTarget(Vector3 target, float tau) 1889 public void MoveToTarget(Vector3 target, float tau)
1890 { 1890 {
1891 if (IsAttachment) 1891 if (IsAttachment)
1892 { 1892 {
1893 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); 1893 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1894
1894 if (avatar != null) 1895 if (avatar != null)
1895 {
1896 avatar.MoveToTarget(target, false, false); 1896 avatar.MoveToTarget(target, false, false);
1897 }
1898 } 1897 }
1899 else 1898 else
1900 { 1899 {
@@ -1909,12 +1908,26 @@ namespace OpenSim.Region.Framework.Scenes
1909 } 1908 }
1910 } 1909 }
1911 1910
1912 public void stopMoveToTarget() 1911 public void StopMoveToTarget()
1913 { 1912 {
1914 PhysicsActor pa = RootPart.PhysActor; 1913 if (IsAttachment)
1914 {
1915 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1915 1916
1916 if (pa != null) 1917 if (avatar != null)
1917 pa.PIDActive = false; 1918 avatar.ResetMoveToTarget();
1919 }
1920 else
1921 {
1922 PhysicsActor pa = RootPart.PhysActor;
1923
1924 if (pa != null && pa.PIDActive)
1925 {
1926 pa.PIDActive = false;
1927
1928 ScheduleGroupForTerseUpdate();
1929 }
1930 }
1918 } 1931 }
1919 1932
1920 /// <summary> 1933 /// <summary>