aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-11-19 20:11:16 +0000
committerUbitUmarov2014-11-19 20:11:16 +0000
commit6bebb9206cc0ec966f75ab52c76c66b4546d730f (patch)
treeba0dff59dda459e7fdc8340036e93d7d02832cc3 /OpenSim
parent fix rez position being for root or center for a single object case (diff)
downloadopensim-SC_OLD-6bebb9206cc0ec966f75ab52c76c66b4546d730f.zip
opensim-SC_OLD-6bebb9206cc0ec966f75ab52c76c66b4546d730f.tar.gz
opensim-SC_OLD-6bebb9206cc0ec966f75ab52c76c66b4546d730f.tar.bz2
opensim-SC_OLD-6bebb9206cc0ec966f75ab52c76c66b4546d730f.tar.xz
fix stopMoveToTarget in attachments case ( similar to core fix)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs19
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9a2707b..89c7a1a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2468,12 +2468,23 @@ namespace OpenSim.Region.Framework.Scenes
2468 2468
2469 public void stopMoveToTarget() 2469 public void stopMoveToTarget()
2470 { 2470 {
2471 PhysicsActor pa = RootPart.PhysActor; 2471 if (IsAttachment)
2472 {
2473 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
2474 if (avatar != null)
2475 {
2476 avatar.ResetMoveToTarget();
2477 }
2478 }
2479 else
2480 {
2481 PhysicsActor pa = RootPart.PhysActor;
2472 2482
2473 if (pa != null) 2483 if (pa != null)
2474 pa.PIDActive = false; 2484 pa.PIDActive = false;
2475 2485
2476 RootPart.ScheduleTerseUpdate(); // send a stop information 2486 RootPart.ScheduleTerseUpdate(); // send a stop information
2487 }
2477 } 2488 }
2478 2489
2479 public void rotLookAt(Quaternion target, float strength, float damping) 2490 public void rotLookAt(Quaternion target, float strength, float damping)