From 2c3a1995fcdaecffbd8cc7efea2be4adf505321b Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 21 Jun 2009 18:38:12 +0000 Subject: Publish a method on ICompiler to generate the CIL assembly path Cause group deeding to apply next owner perms --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 1 + OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs | 1 + OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 1a40a0d..c24ecf5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -2724,6 +2724,7 @@ namespace OpenSim.Region.Framework.Scenes } sog.SetOwnerId(groupID); + sog.ApplyNextOwnerPermissions(); } } } diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs index 2fd819d..7456ca9 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs @@ -38,5 +38,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces string[] GetWarnings(); Dictionary, KeyValuePair> LineMap(); + string GetAssemblyName(UUID assetID); } } diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index a1525b9..35f791e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -259,6 +259,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools // } //} + public string GetAssemblyName(UUID assetID) + { + return Path.Combine(ScriptEnginesPath, Path.Combine( + m_scriptEngine.World.RegionInfo.RegionID.ToString(), + FilePrefix + "_compiled_" + assetID + ".dll")); + } + /// /// Converts script from LSL to CS and calls CompileFromCSText /// -- cgit v1.1