aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Torture/ScriptTortureTests.cs
diff options
context:
space:
mode:
authorMelanie2012-03-07 01:04:09 +0000
committerMelanie2012-03-07 01:04:09 +0000
commita1b28a61a698492bbfd202b90211d700789d42ad (patch)
treee2ee13cecfe48356f05002bded89b6533683c7ee /OpenSim/Tests/Torture/ScriptTortureTests.cs
parentAlways zero the PhysActor on dupes to prevent side effects on the orignal prim (diff)
parentminor: make NPC tests run in a given order, comment out log lines in mock reg... (diff)
downloadopensim-SC_OLD-a1b28a61a698492bbfd202b90211d700789d42ad.zip
opensim-SC_OLD-a1b28a61a698492bbfd202b90211d700789d42ad.tar.gz
opensim-SC_OLD-a1b28a61a698492bbfd202b90211d700789d42ad.tar.bz2
opensim-SC_OLD-a1b28a61a698492bbfd202b90211d700789d42ad.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Torture/ScriptTortureTests.cs')
-rw-r--r--OpenSim/Tests/Torture/ScriptTortureTests.cs1
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 }