aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2011-04-08 04:16:29 +0100
committerMelanie2011-04-08 04:16:29 +0100
commit738daadaceada157eb0a8ea4a3437e037859b4d2 (patch)
tree1d0f8d63180928d77a7842e73c56e922666af75b /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentAdd support for the new display name related functions in LSL. This does not (diff)
parenttrivial whitespace removal to trigger a panda rebuild (diff)
downloadopensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.zip
opensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.gz
opensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.bz2
opensim-SC_OLD-738daadaceada157eb0a8ea4a3437e037859b4d2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 62e7d36..6773e08 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1957,7 +1957,7 @@ namespace OpenSim.Region.Framework.Scenes
1957 { 1957 {
1958 SceneObjectGroupsByLocalPartID[copy.LocalId] = copy; 1958 SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
1959 foreach (SceneObjectPart part in children) 1959 foreach (SceneObjectPart part in children)
1960 SceneObjectGroupsByLocalPartID[copy.LocalId] = copy; 1960 SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
1961 } 1961 }
1962 // PROBABLE END OF FIXME 1962 // PROBABLE END OF FIXME
1963 1963