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 | |
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
3 files changed, 11 insertions, 7 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 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 525e575..617f382 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2309,9 +2309,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2309 | else | 2309 | else |
2310 | { | 2310 | { |
2311 | part.OffsetPosition = (Vector3)toPos; | 2311 | part.OffsetPosition = (Vector3)toPos; |
2312 | SceneObjectGroup parent = part.ParentGroup; | 2312 | // SceneObjectGroup parent = part.ParentGroup; |
2313 | parent.HasGroupChanged = true; | 2313 | // parent.HasGroupChanged = true; |
2314 | parent.ScheduleGroupForTerseUpdate(); | 2314 | // parent.ScheduleGroupForTerseUpdate(); |
2315 | part.ScheduleTerseUpdate(); | ||
2315 | } | 2316 | } |
2316 | } | 2317 | } |
2317 | 2318 | ||
@@ -8341,9 +8342,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8341 | else | 8342 | else |
8342 | { | 8343 | { |
8343 | part.OffsetPosition = currentPosition; | 8344 | part.OffsetPosition = currentPosition; |
8344 | SceneObjectGroup parent = part.ParentGroup; | 8345 | // SceneObjectGroup parent = part.ParentGroup; |
8345 | parent.HasGroupChanged = true; | 8346 | // parent.HasGroupChanged = true; |
8346 | parent.ScheduleGroupForTerseUpdate(); | 8347 | // parent.ScheduleGroupForTerseUpdate(); |
8348 | part.ScheduleTerseUpdate(); | ||
8347 | } | 8349 | } |
8348 | } | 8350 | } |
8349 | } | 8351 | } |