Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

This commit is contained in:
Melanie
2010-09-07 01:45:08 +01:00
2 changed files with 14 additions and 5 deletions

View File

@@ -307,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void TestDelinkPersistence()
{
TestHelper.InMethod();
log4net.Config.XmlConfigurator.Configure();
//log4net.Config.XmlConfigurator.Configure();
TestScene scene = SceneSetupHelpers.SetupScene();
@@ -342,4 +342,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid));
}
}
}
}