mirror of
https://github.com/opensim/opensim.git
synced 2026-08-06 01:06:30 +08:00
Revert "Let's try giving Common a default constructor instead of the workaround"
This reverts commit 8b6557e377.
This commit is contained in:
@@ -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()
|
||||
{
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user