aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Torture/ObjectTortureTests.cs
diff options
context:
space:
mode:
authorMelanie2012-02-07 20:52:04 +0100
committerMelanie2012-02-07 20:52:04 +0100
commitde255321f1f1868e641f935ecaa25151867be1e3 (patch)
tree9baf834c0ad1eb40f5fd4dbae30efc7e992d54ee /OpenSim/Tests/Torture/ObjectTortureTests.cs
parentExperimental. Expand Fire & Forget for NPC delete (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-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.cs2
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;