diff options
| author | Adam Frisby | 2009-08-17 02:25:24 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-08-17 02:25:24 +1000 |
| commit | e5b94346b65fcdf3fcae6dbb6b69a843fae5b360 (patch) | |
| tree | baf493ddfadf6de2ad9a24a639a25b779e11552b /OpenSim/Region/Framework | |
| parent | * Implements AppDomain Security for MRM Scripts. (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-e5b94346b65fcdf3fcae6dbb6b69a843fae5b360.zip opensim-SC_OLD-e5b94346b65fcdf3fcae6dbb6b69a843fae5b360.tar.gz opensim-SC_OLD-e5b94346b65fcdf3fcae6dbb6b69a843fae5b360.tar.bz2 opensim-SC_OLD-e5b94346b65fcdf3fcae6dbb6b69a843fae5b360.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 88452d2..8ec14c7 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); |