aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2013-01-19 21:49:33 +0100
committerMelanie2013-01-19 21:49:33 +0100
commit2d3a57a002c74704501f4ce0f0359f2a19699eb5 (patch)
treecc74ca02d7b8f8c9e63e4007c354f3296fe87392 /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentRemove group IM test code also mentioning "OpenSimulator Testing" (diff)
downloadopensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.zip
opensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.gz
opensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.bz2
opensim-SC-2d3a57a002c74704501f4ce0f0359f2a19699eb5.tar.xz
Merge branch 'avination'
Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index dd8541c..9c6a94b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2398,6 +2398,8 @@ namespace OpenSim.Region.Framework.Scenes
2398 2398
2399 if (pa != null) 2399 if (pa != null)
2400 pa.PIDActive = false; 2400 pa.PIDActive = false;
2401
2402 RootPart.ScheduleTerseUpdate(); // send a stop information
2401 } 2403 }
2402 2404
2403 public void rotLookAt(Quaternion target, float strength, float damping) 2405 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 b59ba68..4b3dcbd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3763,7 +3763,7 @@ namespace OpenSim.Region.Framework.Scenes
3763 { 3763 {
3764 ParentGroup.stopMoveToTarget(); 3764 ParentGroup.stopMoveToTarget();
3765 3765
3766 ParentGroup.ScheduleGroupForTerseUpdate(); 3766// ParentGroup.ScheduleGroupForTerseUpdate();
3767 //ParentGroup.ScheduleGroupForFullUpdate(); 3767 //ParentGroup.ScheduleGroupForFullUpdate();
3768 } 3768 }
3769 3769