diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 | ||||
-rw-r--r--[-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 05124fc..da5b77a 100755..100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -315,7 +315,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
315 | m_WaitForEventCompletionOnScriptStop | 315 | m_WaitForEventCompletionOnScriptStop |
316 | = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); | 316 | = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); |
317 | 317 | ||
318 | m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); | 318 | m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", Path.Combine(Util.cacheDir(), "ScriptEngines")); |
319 | 319 | ||
320 | m_Prio = ThreadPriority.BelowNormal; | 320 | m_Prio = ThreadPriority.BelowNormal; |
321 | switch (priority) | 321 | switch (priority) |
@@ -1874,7 +1874,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1874 | if (!(sender is System.AppDomain)) | 1874 | if (!(sender is System.AppDomain)) |
1875 | return null; | 1875 | return null; |
1876 | 1876 | ||
1877 | string[] pathList = new string[] {"bin", m_ScriptEnginesPath, | 1877 | string[] pathList = new string[] {"caches", m_ScriptEnginesPath, |
1878 | Path.Combine(m_ScriptEnginesPath, | 1878 | Path.Combine(m_ScriptEnginesPath, |
1879 | m_Scene.RegionInfo.RegionID.ToString())}; | 1879 | m_Scene.RegionInfo.RegionID.ToString())}; |
1880 | 1880 | ||