From 295e91b8f44a356ab742dedd27c1b7edfe7b1157 Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 22:15:41 +1000
Subject: Move cache, config, logs out of tree, and various related clean ups.

---
 OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 +-
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

(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
old mode 100755
new mode 100644
index 05124fc..da5b77a
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             m_WaitForEventCompletionOnScriptStop
                 = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop);
 
-            m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines");
+            m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", Path.Combine(Util.cacheDir(), "ScriptEngines"));
 
             m_Prio = ThreadPriority.BelowNormal;
             switch (priority)
@@ -1874,7 +1874,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