diff options
| author | Melanie | 2011-11-02 23:42:37 +0100 |
|---|---|---|
| committer | Melanie | 2011-11-02 23:42:37 +0100 |
| commit | 26a4f320135d79da16094f3b218f607c3fd628c6 (patch) | |
| tree | 9da53bad404a7d9a0de5065bc7cf6719566a0f17 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Fix link order when linking sets to sets (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-26a4f320135d79da16094f3b218f607c3fd628c6.zip opensim-SC-26a4f320135d79da16094f3b218f607c3fd628c6.tar.gz opensim-SC-26a4f320135d79da16094f3b218f607c3fd628c6.tar.bz2 opensim-SC-26a4f320135d79da16094f3b218f607c3fd628c6.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 0f5e99d..e1fde64 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -1907,8 +1907,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1907 | SceneObjectPart newRoot = newSet[0]; | 1907 | SceneObjectPart newRoot = newSet[0]; |
| 1908 | newSet.RemoveAt(0); | 1908 | newSet.RemoveAt(0); |
| 1909 | 1909 | ||
| 1910 | foreach (SceneObjectPart newChild in newSet) | 1910 | foreach (SceneObjectPart newChild in newSet) |
| 1911 | newChild.UpdateFlag = 0; | 1911 | newChild.ClearUpdateSchedule(); |
| 1912 | 1912 | ||
| 1913 | newRoot.ParentGroup.areUpdatesSuspended = true; | 1913 | newRoot.ParentGroup.areUpdatesSuspended = true; |
| 1914 | LinkObjects(newRoot, newSet); | 1914 | LinkObjects(newRoot, newSet); |