diff options
author | Adam Frisby | 2009-08-18 00:23:27 +1000 |
---|---|---|
committer | Adam Frisby | 2009-08-18 00:23:27 +1000 |
commit | 58d9d6026eb36d530c7cec753279b7aeaa6b43eb (patch) | |
tree | 86a09687ef01b308ac2ae8e1023ec9ddb943c54f /OpenSim/Region/Framework/Scenes/Tests | |
parent | * Implementing a bunch of Unimplemented MRM stubs. (diff) | |
parent | Add System.Xml reference to the console project (diff) | |
download | opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.zip opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.tar.gz opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.tar.bz2 opensim-SC_OLD-58d9d6026eb36d530c7cec753279b7aeaa6b43eb.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 8ec14c7..88452d2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); | 72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); |
73 | 73 | ||
74 | ISharedRegionModule interregionComms = new RESTInterregionComms(); | 74 | ISharedRegionModule interregionComms = new RESTInterregionComms(); |
75 | interregionComms.Initialise( new IniConfigSource()); | 75 | interregionComms.Initialise(new IniConfigSource()); |
76 | interregionComms.PostInitialise(); | 76 | interregionComms.PostInitialise(); |
77 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); | 77 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); |
78 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); | 78 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); |