From 4f25b73b572e458a3e98614fc5694286e5e3fb92 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 25 Sep 2010 16:22:18 -0400
Subject: Add configurable path to script engine assemblies

Adding ability to place script engine assemblies outside
	the codebase directories.

	Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"

Signed-off-by: Melanie <melanie@t-data.com>
---
 OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs   | 7 ++++---
 OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared')

diff --git a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
index ade1924..130e197 100644
--- a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
@@ -32,7 +32,7 @@ using System.Reflection;
 namespace OpenSim.Region.ScriptEngine.Shared
 {
     [Serializable]
-    public class AssemblyResolver
+    public class AssemblyResolver : MarshalByRefObject
     {
         public static Assembly OnAssemblyResolve(object sender,
                 ResolveEventArgs args)
@@ -42,9 +42,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             AppDomain myDomain = (AppDomain)sender;
             string dirName = myDomain.FriendlyName;
+            string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath;
 
-            string[] pathList = new string[] {"bin", "ScriptEngines",
-                                              Path.Combine("ScriptEngines", dirName)};
+            string[] pathList = new string[] {"bin", ScriptEnginesPath,
+                                              Path.Combine(ScriptEnginesPath, dirName)};
 
             string assemblyName = args.Name;
             if (assemblyName.IndexOf(",") != -1)
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index cd8c67e..49d6abe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         private Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(StringComparer.CurrentCultureIgnoreCase);
 
         private string FilePrefix;
-        private string ScriptEnginesPath = "ScriptEngines";
+        private string ScriptEnginesPath = null;
         // mapping between LSL and C# line/column numbers
         private ICodeConverter LSL_Converter;
 
@@ -95,7 +95,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
         public Compiler(IScriptEngine scriptEngine)
         {
-            m_scriptEngine = scriptEngine;
+            m_scriptEngine = scriptEngine;;
+            ScriptEnginesPath = scriptEngine.ScriptEnginePath;
             ReadConfig();
         }
 
-- 
cgit v1.1