Merge branch 'master' into careminster

2 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 891e453..c8ced43 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -307,6 +307,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             null,
                             constructorParams,
                             null,
+                            null,
                             null);
                 else
                     m_Script 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
index 52d75a0..3b13386 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -264,7 +264,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
             TestStop(script);
         }
 
-        [Test]
+        // Disabling for now as these are not particularly useful tests (since they fail due to stack overflow before
+        // termination can even be tried.
+//        [Test]
         public void TestStopOnInfiniteUserFunctionCallLoop()
         {
             TestHelpers.InMethod();
@@ -294,7 +296,9 @@ default
             TestStop(script);
         }
 
-        [Test]
+        // Disabling for now as these are not particularly useful tests (since they fail due to stack overflow before
+        // termination can even be tried.
+//        [Test]
         public void TestStopOnInfiniteManualEventCallLoop()
         {
             TestHelpers.InMethod();