aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-09-01 01:53:54 +0100
committerMelanie2009-09-01 01:53:54 +0100
commite458a87e91090ce94c31f6cc2f049dcda28600de (patch)
tree0fc63d09425242b383a3244633e41660f739a3cf /OpenSim/Region
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-e458a87e91090ce94c31f6cc2f049dcda28600de.zip
opensim-SC_OLD-e458a87e91090ce94c31f6cc2f049dcda28600de.tar.gz
opensim-SC_OLD-e458a87e91090ce94c31f6cc2f049dcda28600de.tar.bz2
opensim-SC_OLD-e458a87e91090ce94c31f6cc2f049dcda28600de.tar.xz
Experimental. Set attachment flag early on rezzing from inventory.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs1
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 650fc7e..b4887c2 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.IsAttachment = true;
2021 }
2019 2022
2020 AddNewSceneObject(group, true); 2023 AddNewSceneObject(group, true);
2021 2024
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index 1e35559..f8af902 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -38,6 +38,5 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
38 string[] GetWarnings(); 38 string[] GetWarnings();
39 Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> 39 Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
40 LineMap(); 40 LineMap();
41 object GetCompilerOutput(UUID assetID);
42 } 41 }
43} 42}