From 14f3ac144060491761a57137b99173e65252d806 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 19 Nov 2008 20:13:51 +0000
Subject: * Add just enough to allow the scene presences test to establish a
 new user connection (though not yet an actual ScenePresence)

---
 OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs')

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;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Scenes.Tests
@@ -41,19 +42,27 @@ namespace OpenSim.Region.Environment.Scenes.Tests
         /// <summary>
         /// Set up a test scene
         /// </summary>
+        /// <returns></returns>
         public static TestScene SetupScene()
         {
             RegionInfo regInfo = new RegionInfo(1000, 1000, null, null);
             regInfo.RegionName = "Unit test region";
+            regInfo.ExternalHostName = "1.2.3.4";
+            
             AgentCircuitManager acm = new AgentCircuitManager();
-            //CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null);
-            CommunicationsManager cm = null;
+            CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null);
             //SceneCommunicationService scs = new SceneCommunicationService(cm);
             SceneCommunicationService scs = null;
             StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
+            BaseHttpServer httpServer = new BaseHttpServer(666);
             IConfigSource configSource = new IniConfigSource();
             
-            return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null);            
+            TestScene testScene = new TestScene(
+                regInfo, acm, cm, scs, null, sm, httpServer, null, false, false, false, configSource, null);
+            
+            testScene.LandChannel = new TestLandChannel();
+            
+            return testScene;
         }
         
         /// <summary>
-- 
cgit v1.1