diff options
author | Justin Clark-Casey (justincc) | 2015-01-26 23:16:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2015-01-26 23:31:46 +0000 |
commit | 1bed3aff0b21102f04481b2345a0d804c2e5716c (patch) | |
tree | 36c9b6fb997849ca0831e690d9c4b210789b680b /OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs | |
parent | BulletSim: update DLLs, SOs, and dylib with latest versions. (diff) | |
download | opensim-SC-1bed3aff0b21102f04481b2345a0d804c2e5716c.zip opensim-SC-1bed3aff0b21102f04481b2345a0d804c2e5716c.tar.gz opensim-SC-1bed3aff0b21102f04481b2345a0d804c2e5716c.tar.bz2 opensim-SC-1bed3aff0b21102f04481b2345a0d804c2e5716c.tar.xz |
On a multi-region simulator when AppDomain = true, make sure the DLL from the appropriate script engines subdir is loaded rather than always that of the first engine to load the DLL.
This resolves a DLL load failure on my Linux box when an attachment script was present on another region before the avatar arrived.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs index 1fff6ba..5b9794b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs | |||
@@ -76,6 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests | |||
76 | //AppDomain.CurrentDomain.SetData("APPBASE", Environment.CurrentDirectory + "/bin"); | 76 | //AppDomain.CurrentDomain.SetData("APPBASE", Environment.CurrentDirectory + "/bin"); |
77 | // Console.WriteLine(AppDomain.CurrentDomain.BaseDirectory); | 77 | // Console.WriteLine(AppDomain.CurrentDomain.BaseDirectory); |
78 | m_xEngine = new OpenSim.Region.ScriptEngine.XEngine.XEngine(); | 78 | m_xEngine = new OpenSim.Region.ScriptEngine.XEngine.XEngine(); |
79 | m_xEngine.DebugLevel = 1; | ||
79 | 80 | ||
80 | IniConfigSource configSource = new IniConfigSource(); | 81 | IniConfigSource configSource = new IniConfigSource(); |
81 | 82 | ||
@@ -336,7 +337,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests | |||
336 | public void TestStopOnInfiniteJumpLoop() | 337 | public void TestStopOnInfiniteJumpLoop() |
337 | { | 338 | { |
338 | TestHelpers.InMethod(); | 339 | TestHelpers.InMethod(); |
339 | // TestHelpers.EnableLogging(); | 340 | TestHelpers.EnableLogging(); |
340 | 341 | ||
341 | string script = | 342 | string script = |
342 | @"default | 343 | @"default |