ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 00:15:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-01-24 00:27:00 +00:00
parent be4c8c4931 b775761104
commit 2ce4a758e2
8 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -307,6 +307,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
null,
constructorParams,
null,
null,
null);
else
m_Script

8
OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
View File

@@ -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();