diff options
| author | Melanie | 2012-03-07 01:05:32 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-07 01:05:32 +0000 |
| commit | f8b1b86c3ad4602a246a7642035e5bef4004a930 (patch) | |
| tree | 0c33449e198e3411636a29e989ab1292b69f0d93 /OpenSim/Tests/Torture/ScriptTortureTests.cs | |
| parent | Fix merge issue (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.zip opensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.tar.gz opensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.tar.bz2 opensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Tests/Torture/ScriptTortureTests.cs')
| -rw-r--r-- | OpenSim/Tests/Torture/ScriptTortureTests.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Tests/Torture/ScriptTortureTests.cs b/OpenSim/Tests/Torture/ScriptTortureTests.cs index 87932cb..2ef55b3 100644 --- a/OpenSim/Tests/Torture/ScriptTortureTests.cs +++ b/OpenSim/Tests/Torture/ScriptTortureTests.cs | |||
| @@ -95,6 +95,7 @@ namespace OpenSim.Tests.Torture | |||
| 95 | public void TearDown() | 95 | public void TearDown() |
| 96 | { | 96 | { |
| 97 | m_scene.Close(); | 97 | m_scene.Close(); |
| 98 | m_scene = null; | ||
| 98 | GC.Collect(); | 99 | GC.Collect(); |
| 99 | GC.WaitForPendingFinalizers(); | 100 | GC.WaitForPendingFinalizers(); |
| 100 | } | 101 | } |