diff options
author | David Walter Seikel | 2016-11-04 00:46:34 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-04 00:46:34 +1000 |
commit | 58783a5216b81863988110174229a65ceb315e1e (patch) | |
tree | 74d08dcd7e127f288cd7a8026c776385a738d484 /OpenSim/Region/ScriptEngine | |
parent | Even OpenSim removed the silly IAR avatar presence check. Purge it with fire. (diff) | |
download | opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.zip opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.tar.gz opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.tar.bz2 opensim-SC_OLD-58783a5216b81863988110174229a65ceb315e1e.tar.xz |
Attempt to move everything writable, and the configs, out of the bin directory.
Log configs are still in the bin directory.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 | ||||
-rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
2 files changed, 3 insertions, 3 deletions
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 | |||
44 | string dirName = myDomain.FriendlyName; | 44 | string dirName = myDomain.FriendlyName; |
45 | string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath; | 45 | string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath; |
46 | 46 | ||
47 | string[] pathList = new string[] {"", "bin", ScriptEnginesPath, | 47 | string[] pathList = new string[] {"", "caches", ScriptEnginesPath, |
48 | Path.Combine(ScriptEnginesPath, dirName)}; | 48 | Path.Combine(ScriptEnginesPath, dirName)}; |
49 | 49 | ||
50 | string assemblyName = args.Name; | 50 | 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 | |||
309 | m_WaitForEventCompletionOnScriptStop | 309 | m_WaitForEventCompletionOnScriptStop |
310 | = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); | 310 | = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); |
311 | 311 | ||
312 | m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); | 312 | m_ScriptEnginesPath = "../caches/" + m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); |
313 | 313 | ||
314 | m_Prio = ThreadPriority.BelowNormal; | 314 | m_Prio = ThreadPriority.BelowNormal; |
315 | switch (priority) | 315 | switch (priority) |
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1817 | if (!(sender is System.AppDomain)) | 1817 | if (!(sender is System.AppDomain)) |
1818 | return null; | 1818 | return null; |
1819 | 1819 | ||
1820 | string[] pathList = new string[] {"bin", m_ScriptEnginesPath, | 1820 | string[] pathList = new string[] {"caches", m_ScriptEnginesPath, |
1821 | Path.Combine(m_ScriptEnginesPath, | 1821 | Path.Combine(m_ScriptEnginesPath, |
1822 | m_Scene.RegionInfo.RegionID.ToString())}; | 1822 | m_Scene.RegionInfo.RegionID.ToString())}; |
1823 | 1823 | ||