aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-06-21 18:38:12 +0000
committerMelanie Thielker2009-06-21 18:38:12 +0000
commit2c3a1995fcdaecffbd8cc7efea2be4adf505321b (patch)
tree8710a8a6d10c9ed02d0df72b73ecb6bc97fa702c /OpenSim
parentProperly reset a vehicle's status to VEHICLE_TYPE_NONE when requested (diff)
downloadopensim-SC_OLD-2c3a1995fcdaecffbd8cc7efea2be4adf505321b.zip
opensim-SC_OLD-2c3a1995fcdaecffbd8cc7efea2be4adf505321b.tar.gz
opensim-SC_OLD-2c3a1995fcdaecffbd8cc7efea2be4adf505321b.tar.bz2
opensim-SC_OLD-2c3a1995fcdaecffbd8cc7efea2be4adf505321b.tar.xz
Publish a method on ICompiler to generate the CIL assembly path
Cause group deeding to apply next owner perms
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs7
3 files changed, 9 insertions, 0 deletions
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
2724 } 2724 }
2725 2725
2726 sog.SetOwnerId(groupID); 2726 sog.SetOwnerId(groupID);
2727 sog.ApplyNextOwnerPermissions();
2727 } 2728 }
2728 } 2729 }
2729 } 2730 }
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
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 string GetAssemblyName(UUID assetID);
41 } 42 }
42} 43}
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
259 // } 259 // }
260 //} 260 //}
261 261
262 public string GetAssemblyName(UUID assetID)
263 {
264 return Path.Combine(ScriptEnginesPath, Path.Combine(
265 m_scriptEngine.World.RegionInfo.RegionID.ToString(),
266 FilePrefix + "_compiled_" + assetID + ".dll"));
267 }
268
262 /// <summary> 269 /// <summary>
263 /// Converts script from LSL to CS and calls CompileFromCSText 270 /// Converts script from LSL to CS and calls CompileFromCSText
264 /// </summary> 271 /// </summary>