aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2012-05-07 12:07:47 +0100
committerMelanie2012-05-07 12:07:47 +0100
commitdf7abbb367ecac2fb09e1af10d3ec2a792ea2ed2 (patch)
tree3e36b8757455c88c3c1f20c14b635e662350aab9 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentMerge branch 'avination' into careminster (diff)
parentadd a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O... (diff)
downloadopensim-SC_OLD-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.zip
opensim-SC_OLD-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.gz
opensim-SC_OLD-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.bz2
opensim-SC_OLD-df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 468c7ea..72d96d1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3515,7 +3515,7 @@ namespace OpenSim.Region.Framework.Scenes
3515 3515
3516 //we need to do a terse update even if the move wasn't allowed 3516 //we need to do a terse update even if the move wasn't allowed
3517 // so that the position is reset in the client (the object snaps back) 3517 // so that the position is reset in the client (the object snaps back)
3518 ScheduleGroupForTerseUpdate(); 3518 RootPart.ScheduleTerseUpdate();
3519 } 3519 }
3520 3520
3521 /// <summary> 3521 /// <summary>