From eb837defdf7d9f260603fe400b3a482258605f43 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Mon, 14 Aug 2017 16:55:50 -0700
Subject: [PATCH] Revert "Let's try giving Common a default constructor instead
 of the workaround"

This reverts commit 8b6557e377f7bac1bdb38f3e6dd22c797417d09c.
---
 OpenSim/Tests/Permissions/Common.cs                | 4 ----
 OpenSim/Tests/Permissions/DirectTransferTests.cs   | 7 +++++++
 OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs
index cf4d2bd718..4ecce383e4 100644
--- a/OpenSim/Tests/Permissions/Common.cs
+++ b/OpenSim/Tests/Permissions/Common.cs
@@ -60,10 +60,6 @@ namespace OpenSim.Tests.Permissions
         private TestScene m_Scene;
         private ScenePresence[] m_Avatars = new ScenePresence[3];
 
-        public Common()
-        {
-        }
-
         [SetUp]
         public override void SetUp()
         {
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index c68bbdfed7..0f251dba43 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.TheInstance = new Common();
+                Common.TheInstance.SetUp();
+            }
+
             Common.TheInstance.DeleteObjectsFolders();
         }
 
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
index 66a228a28d..fb96b8b194 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.TheInstance = new Common();
+                Common.TheInstance.SetUp();
+            }
             Common.TheInstance.DeleteObjectsFolders();
         }