diff options
author | Melanie | 2010-09-07 01:45:08 +0100 |
---|---|---|
committer | Melanie | 2010-09-07 01:45:08 +0100 |
commit | 99bfb0d2a2ff44644ac1bfaee4e134dc0d26921e (patch) | |
tree | 71f301ad6a27ccf9bd194fade9709ccb0a79812a /OpenSim/Region/Framework/Scenes/Tests | |
parent | Fix deletion persistence when freshly delinked prims are removed (diff) | |
parent | minor: comment out some excessive test logging (diff) | |
download | opensim-SC_OLD-99bfb0d2a2ff44644ac1bfaee4e134dc0d26921e.zip opensim-SC_OLD-99bfb0d2a2ff44644ac1bfaee4e134dc0d26921e.tar.gz opensim-SC_OLD-99bfb0d2a2ff44644ac1bfaee4e134dc0d26921e.tar.bz2 opensim-SC_OLD-99bfb0d2a2ff44644ac1bfaee4e134dc0d26921e.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index 62761fb..e3ef263 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |||
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
307 | public void TestDelinkPersistence() | 307 | public void TestDelinkPersistence() |
308 | { | 308 | { |
309 | TestHelper.InMethod(); | 309 | TestHelper.InMethod(); |
310 | log4net.Config.XmlConfigurator.Configure(); | 310 | //log4net.Config.XmlConfigurator.Configure(); |
311 | 311 | ||
312 | TestScene scene = SceneSetupHelpers.SetupScene(); | 312 | TestScene scene = SceneSetupHelpers.SetupScene(); |
313 | 313 | ||
@@ -342,4 +342,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
342 | Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid)); | 342 | Assert.That(storedObjects[0].Children.ContainsKey(rootPartUuid)); |
343 | } | 343 | } |
344 | } | 344 | } |
345 | } \ No newline at end of file | 345 | } |