aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorMelanie2013-01-16 23:37:27 +0100
committerMelanie2013-01-16 23:37:27 +0100
commit777c80becbe349ac24043ab33782842608e19bbe (patch)
tree354c157f4c13a58c7288d76d231d2b5a063c3b65 /OpenSim/Region/ScriptEngine/Shared/Api
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)
downloadopensim-SC_OLD-777c80becbe349ac24043ab33782842608e19bbe.zip
opensim-SC_OLD-777c80becbe349ac24043ab33782842608e19bbe.tar.gz
opensim-SC_OLD-777c80becbe349ac24043ab33782842608e19bbe.tar.bz2
opensim-SC_OLD-777c80becbe349ac24043ab33782842608e19bbe.tar.xz
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs14
1 files changed, 8 insertions, 6 deletions
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 }