bad merge?

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index fd49c88..32d6649 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -43,7 +43,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
     [TestFixture]
-    public class SceneObjectUserGroupTests : OpenSimTestCase
+    public class SceneObjectUserGroupTests
     {
         /// <summary>
         /// Test share with group object functionality
@@ -53,6 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestShareWithGroup()
         {
             TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             
@@ -69,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                        
             SceneHelpers.SetupSceneModules(
                 scene, configSource, new object[] 
-                   { new PermissionsModule(), 
+                   { new DefaultPermissionsModule(), 
                      new GroupsModule(), 
                      new MockGroupsServicesConnector() });
             
@@ -80,4 +81,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             groupsModule.CreateGroup(client, "group1", "To boldly go", true, UUID.Zero, 5, true, true, true);
         }
     }
-}
\ No newline at end of file
+}