diff --git a/.nant/local.include b/.nant/local.include index c4a056cd5d..be79d1cfce 100644 --- a/.nant/local.include +++ b/.nant/local.include @@ -145,12 +145,10 @@ - @@ -267,12 +265,10 @@ - @@ -285,7 +281,7 @@ - + diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs index c68bbdfed7..c3dfa6c942 100644 --- a/OpenSim/Tests/Permissions/DirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs @@ -44,6 +44,13 @@ namespace OpenSim.Tests.Permissions [SetUp] public void SetUp() { + // In case we're dealing with some older version of nunit + if (Common.TheInstance == null) + { + Common c = new Common(); + c.SetUp(); + } + Common.TheInstance.DeleteObjectsFolders(); } diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index 66a228a28d..e33332a6c5 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs @@ -46,6 +46,12 @@ namespace OpenSim.Tests.Permissions [SetUp] public void SetUp() { + // In case we're dealing with some older version of nunit + if (Common.TheInstance == null) + { + Common c = new Common(); + c.SetUp(); + } Common.TheInstance.DeleteObjectsFolders(); }