diff options
| author | Diva Canto | 2012-04-27 09:26:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-04-27 09:26:14 -0700 |
| commit | 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch) | |
| tree | e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Tests/Torture/ObjectTortureTests.cs | |
| parent | Minor change in error message (HG teleport failures) (diff) | |
| parent | Add regression test for teleporting an agent between separated regions on the... (diff) | |
| download | opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests/Torture/ObjectTortureTests.cs')
| -rw-r--r-- | OpenSim/Tests/Torture/ObjectTortureTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Torture/ObjectTortureTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs index d0d2199..195d47b 100644 --- a/OpenSim/Tests/Torture/ObjectTortureTests.cs +++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs | |||
| @@ -126,7 +126,7 @@ namespace OpenSim.Tests.Torture | |||
| 126 | // Using a local variable for scene, at least on mono 2.6.7, means that it's much more likely to be garbage | 126 | // Using a local variable for scene, at least on mono 2.6.7, means that it's much more likely to be garbage |
| 127 | // collected when we teardown this test. If it's done in a member variable, even if that is subsequently | 127 | // collected when we teardown this test. If it's done in a member variable, even if that is subsequently |
| 128 | // nulled out, the garbage collect can be delayed. | 128 | // nulled out, the garbage collect can be delayed. |
| 129 | TestScene scene = SceneHelpers.SetupScene(); | 129 | TestScene scene = new SceneHelpers().SetupScene(); |
| 130 | 130 | ||
| 131 | // Process process = Process.GetCurrentProcess(); | 131 | // Process process = Process.GetCurrentProcess(); |
| 132 | // long startProcessMemory = process.PrivateMemorySize64; | 132 | // long startProcessMemory = process.PrivateMemorySize64; |