aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-19 20:13:51 +0000
committerJustin Clarke Casey2008-11-19 20:13:51 +0000
commit14f3ac144060491761a57137b99173e65252d806 (patch)
treeb958133886407fbd551376671a56f8d757c49579 /OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
parentGuard against a strange nullref in ODE (diff)
downloadopensim-SC-14f3ac144060491761a57137b99173e65252d806.zip
opensim-SC-14f3ac144060491761a57137b99173e65252d806.tar.gz
opensim-SC-14f3ac144060491761a57137b99173e65252d806.tar.bz2
opensim-SC-14f3ac144060491761a57137b99173e65252d806.tar.xz
* Add just enough to allow the scene presences test to establish a new user connection (though not yet an actual ScenePresence)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index c20dacf..26c148f 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -29,6 +29,7 @@ using Nini.Config;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Servers;
32using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
33 34
34namespace OpenSim.Region.Environment.Scenes.Tests 35namespace OpenSim.Region.Environment.Scenes.Tests
@@ -41,19 +42,27 @@ namespace OpenSim.Region.Environment.Scenes.Tests
41 /// <summary> 42 /// <summary>
42 /// Set up a test scene 43 /// Set up a test scene
43 /// </summary> 44 /// </summary>
45 /// <returns></returns>
44 public static TestScene SetupScene() 46 public static TestScene SetupScene()
45 { 47 {
46 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null); 48 RegionInfo regInfo = new RegionInfo(1000, 1000, null, null);
47 regInfo.RegionName = "Unit test region"; 49 regInfo.RegionName = "Unit test region";
50 regInfo.ExternalHostName = "1.2.3.4";
51
48 AgentCircuitManager acm = new AgentCircuitManager(); 52 AgentCircuitManager acm = new AgentCircuitManager();
49 //CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null); 53 CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null);
50 CommunicationsManager cm = null;
51 //SceneCommunicationService scs = new SceneCommunicationService(cm); 54 //SceneCommunicationService scs = new SceneCommunicationService(cm);
52 SceneCommunicationService scs = null; 55 SceneCommunicationService scs = null;
53 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); 56 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
57 BaseHttpServer httpServer = new BaseHttpServer(666);
54 IConfigSource configSource = new IniConfigSource(); 58 IConfigSource configSource = new IniConfigSource();
55 59
56 return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); 60 TestScene testScene = new TestScene(
61 regInfo, acm, cm, scs, null, sm, httpServer, null, false, false, false, configSource, null);
62
63 testScene.LandChannel = new TestLandChannel();
64
65 return testScene;
57 } 66 }
58 67
59 /// <summary> 68 /// <summary>