aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-31 22:51:03 -0400
committerTeravus Ovares (Dan Olivares)2009-08-31 22:51:03 -0400
commit3718bbc6a5d9e85d3dc7dce025ca144393a68a73 (patch)
tree72bc385fe8f02bec33b2609e689a0f4211455b0d /OpenSim/Region/Framework/Scenes
parentNo more fuzzy borders (diff)
parentminor edit to debug git process (diff)
downloadopensim-SC_OLD-3718bbc6a5d9e85d3dc7dce025ca144393a68a73.zip
opensim-SC_OLD-3718bbc6a5d9e85d3dc7dce025ca144393a68a73.tar.gz
opensim-SC_OLD-3718bbc6a5d9e85d3dc7dce025ca144393a68a73.tar.bz2
opensim-SC_OLD-3718bbc6a5d9e85d3dc7dce025ca144393a68a73.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 650fc7e..f638386 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2015,7 +2015,10 @@ namespace OpenSim.Region.Framework.Scenes
2015 group.ResetIDs(); 2015 group.ResetIDs();
2016 2016
2017 if (attachment) 2017 if (attachment)
2018 {
2018 group.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom; 2019 group.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom;
2020 group.RootPart.IsAttachment = true;
2021 }
2019 2022
2020 AddNewSceneObject(group, true); 2023 AddNewSceneObject(group, true);
2021 2024