aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Tests
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-06 20:38:04 +0000
committerJustin Clarke Casey2008-11-06 20:38:04 +0000
commit9770cf778efa929255c40ec4a547aea3097b1edc (patch)
tree9fea7f614724af6a37d7cc5b4416315b7eb21800 /OpenSim/Region/Environment/Scenes/Tests
parenta little bit more refactoring of startup (diff)
downloadopensim-SC_OLD-9770cf778efa929255c40ec4a547aea3097b1edc.zip
opensim-SC_OLD-9770cf778efa929255c40ec4a547aea3097b1edc.tar.gz
opensim-SC_OLD-9770cf778efa929255c40ec4a547aea3097b1edc.tar.bz2
opensim-SC_OLD-9770cf778efa929255c40ec4a547aea3097b1edc.tar.xz
* minor: Make some 'startup config failed to load' log messages more consistent
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Tests')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs19
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
index 0ec4a8b..dd0ca8c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs
@@ -40,6 +40,19 @@ namespace OpenSim.Region.Environment.Scenes.Tests
40 [TestFixture] 40 [TestFixture]
41 public class SceneTests 41 public class SceneTests
42 { 42 {
43 [SetUp]
44 public void Init()
45 {
46 try
47 {
48 log4net.Config.XmlConfigurator.Configure();
49 }
50 catch
51 {
52 // I don't care, just leave log4net off
53 }
54 }
55
43 /// <summary> 56 /// <summary>
44 /// Test adding an object to a scene. Doesn't yet do what it says on the tin. 57 /// Test adding an object to a scene. Doesn't yet do what it says on the tin.
45 /// </summary> 58 /// </summary>
@@ -56,7 +69,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests
56 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); 69 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
57 IConfigSource configSource = new IniConfigSource(); 70 IConfigSource configSource = new IniConfigSource();
58 71
59 new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); 72 Scene scene
73 = new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);
74
75 SceneObjectGroup sceneObject = new SceneObjectGroup();
76 scene.AddNewSceneObject(sceneObject, false);
60 } 77 }
61 } 78 }
62} \ No newline at end of file 79} \ No newline at end of file