From 58783a5216b81863988110174229a65ceb315e1e Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 4 Nov 2016 00:46:34 +1000
Subject: Attempt to move everything writable, and the configs, out of the bin
 directory.

Log configs are still in the bin directory.
---
 OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 +-
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
index e35f79f..6c42e2e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             string dirName = myDomain.FriendlyName;
             string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath;
 
-            string[] pathList = new string[] {"", "bin", ScriptEnginesPath,
+            string[] pathList = new string[] {"", "caches", ScriptEnginesPath,
                                               Path.Combine(ScriptEnginesPath, dirName)};
 
             string assemblyName = args.Name;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 78d4ee9..6df36f7 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             m_WaitForEventCompletionOnScriptStop 
                 = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop);
 
-            m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines");
+            m_ScriptEnginesPath = "../caches/" + m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines");
 
             m_Prio = ThreadPriority.BelowNormal;
             switch (priority)
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             if (!(sender is System.AppDomain))
                 return null;
 
-            string[] pathList = new string[] {"bin", m_ScriptEnginesPath,
+            string[] pathList = new string[] {"caches", m_ScriptEnginesPath,
                                               Path.Combine(m_ScriptEnginesPath,
                                                            m_Scene.RegionInfo.RegionID.ToString())};
 
-- 
cgit v1.1