diff options
| author | Robert Adams | 2015-09-08 04:54:16 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 04:54:16 -0700 |
| commit | e5367d822be9b05e74c859afe2d2956a3e95aa33 (patch) | |
| tree | e904050a30715df587aa527d7f313755177726a7 /OpenSim/Tests/Common/OpenSimTestCase.cs | |
| parent | add lost admin_reset_land method (diff) | |
| parent | Deleted access control spec from [LoginService] section of standalone config.... (diff) | |
| download | opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.zip opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.gz opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.bz2 opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.xz | |
Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
Diffstat (limited to 'OpenSim/Tests/Common/OpenSimTestCase.cs')
| -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(); |