diff options
author | Melanie | 2013-01-16 23:37:27 +0100 |
---|---|---|
committer | Melanie | 2013-01-16 23:37:27 +0100 |
commit | 777c80becbe349ac24043ab33782842608e19bbe (patch) | |
tree | 354c157f4c13a58c7288d76d231d2b5a063c3b65 /OpenSim/Region/Framework | |
parent | * Enables loading cached bakes on teleport by filling in the appropriate avat... (diff) | |
parent | dont send a full grp update on stopmovetotarget. just a rootpart terse (diff) | |
download | opensim-SC-777c80becbe349ac24043ab33782842608e19bbe.zip opensim-SC-777c80becbe349ac24043ab33782842608e19bbe.tar.gz opensim-SC-777c80becbe349ac24043ab33782842608e19bbe.tar.bz2 opensim-SC-777c80becbe349ac24043ab33782842608e19bbe.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b008e66..b474979 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2369,6 +2369,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2369 | 2369 | ||
2370 | if (pa != null) | 2370 | if (pa != null) |
2371 | pa.PIDActive = false; | 2371 | pa.PIDActive = false; |
2372 | |||
2373 | RootPart.ScheduleTerseUpdate(); // send a stop information | ||
2372 | } | 2374 | } |
2373 | 2375 | ||
2374 | public void rotLookAt(Quaternion target, float strength, float damping) | 2376 | public void rotLookAt(Quaternion target, float strength, float damping) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ff4ae85..8528edc 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3760,7 +3760,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3760 | { | 3760 | { |
3761 | ParentGroup.stopMoveToTarget(); | 3761 | ParentGroup.stopMoveToTarget(); |
3762 | 3762 | ||
3763 | ParentGroup.ScheduleGroupForTerseUpdate(); | 3763 | // ParentGroup.ScheduleGroupForTerseUpdate(); |
3764 | //ParentGroup.ScheduleGroupForFullUpdate(); | 3764 | //ParentGroup.ScheduleGroupForFullUpdate(); |
3765 | } | 3765 | } |
3766 | 3766 | ||