diff options
| author | UbitUmarov | 2015-09-08 15:03:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-08 15:03:22 +0100 |
| commit | 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch) | |
| tree | 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Tests/Common/OpenSimTestCase.cs | |
| parent | add script events per sec stat, using the time report code, but ignoring the... (diff) | |
| parent | More 'everything is a module' merging. (diff) | |
| download | opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz | |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/OpenSimTestCase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/OpenSimTestCase.cs b/OpenSim/Tests/Common/OpenSimTestCase.cs index c1415af..9fea348 100644 --- a/OpenSim/Tests/Common/OpenSimTestCase.cs +++ b/OpenSim/Tests/Common/OpenSimTestCase.cs | |||
| @@ -38,7 +38,7 @@ namespace OpenSim.Tests.Common | |||
| 38 | [SetUp] | 38 | [SetUp] |
| 39 | public virtual void SetUp() | 39 | public virtual void SetUp() |
| 40 | { | 40 | { |
| 41 | // TestHelpers.InMethod(); | 41 | //TestHelpers.InMethod(); |
| 42 | // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests | 42 | // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests |
| 43 | // to have logging on if it failed with an exception. | 43 | // to have logging on if it failed with an exception. |
| 44 | TestHelpers.DisableLogging(); | 44 | TestHelpers.DisableLogging(); |