diff options
author | Melanie | 2012-02-07 20:52:04 +0100 |
---|---|---|
committer | Melanie | 2012-02-07 20:52:04 +0100 |
commit | de255321f1f1868e641f935ecaa25151867be1e3 (patch) | |
tree | 9baf834c0ad1eb40f5fd4dbae30efc7e992d54ee /OpenSim/Tests/Torture/ObjectTortureTests.cs | |
parent | Experimental. Expand Fire & Forget for NPC delete (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.zip opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.tar.gz opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.tar.bz2 opensim-SC-de255321f1f1868e641f935ecaa25151867be1e3.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
-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 b9764d7..444b7ec 100644 --- a/OpenSim/Tests/Torture/ObjectTortureTests.cs +++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs | |||
@@ -118,7 +118,7 @@ namespace OpenSim.Tests.Torture | |||
118 | 118 | ||
119 | TestScene scene = SceneHelpers.SetupScene(); | 119 | TestScene scene = SceneHelpers.SetupScene(); |
120 | 120 | ||
121 | Process process = Process.GetCurrentProcess(); | 121 | // Process process = Process.GetCurrentProcess(); |
122 | // long startProcessMemory = process.PrivateMemorySize64; | 122 | // long startProcessMemory = process.PrivateMemorySize64; |
123 | long startGcMemory = GC.GetTotalMemory(true); | 123 | long startGcMemory = GC.GetTotalMemory(true); |
124 | DateTime start = DateTime.Now; | 124 | DateTime start = DateTime.Now; |