aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2013-01-23 02:39:30 +0000
committerMelanie2013-01-23 02:39:30 +0000
commit74e04c0f03c4142fc92338fdaef07a176b1749e1 (patch)
treec525970b2266e7754b5604ef7bf80711e0340bbf /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'avination' (diff)
downloadopensim-SC_OLD-74e04c0f03c4142fc92338fdaef07a176b1749e1.zip
opensim-SC_OLD-74e04c0f03c4142fc92338fdaef07a176b1749e1.tar.gz
opensim-SC_OLD-74e04c0f03c4142fc92338fdaef07a176b1749e1.tar.bz2
opensim-SC_OLD-74e04c0f03c4142fc92338fdaef07a176b1749e1.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-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 d5d3dc1..0fe9842 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3751,7 +3751,7 @@ namespace OpenSim.Region.Framework.Scenes
3751 { 3751 {
3752 ParentGroup.stopMoveToTarget(); 3752 ParentGroup.stopMoveToTarget();
3753 3753
3754 ParentGroup.ScheduleGroupForTerseUpdate(); 3754// ParentGroup.ScheduleGroupForTerseUpdate();
3755 //ParentGroup.ScheduleGroupForFullUpdate(); 3755 //ParentGroup.ScheduleGroupForFullUpdate();
3756 } 3756 }
3757 3757