1 files changed, 26 insertions, 15 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index bed9a49..7497d88 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -138,6 +138,10 @@ namespace OpenSim
         /// <param name="configSource"></param>
         public OpenSimBase(IConfigSource configSource) : base()
         {
+            // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
+            // XmlConfigurator calls first accross servers.
+            m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
+
             LoadConfigSettings(configSource);
         }
 
@@ -331,7 +335,7 @@ namespace OpenSim
         /// <param name="regionInfo"></param>
         /// <param name="portadd_flag"></param>
         /// <returns></returns>
-        public IClientNetworkServer CreateRegion(RegionInfo regionInfo, bool portadd_flag, out IScene scene)
+        public List<IClientNetworkServer> CreateRegion(RegionInfo regionInfo, bool portadd_flag, out IScene scene)
         {
             return CreateRegion(regionInfo, portadd_flag, false, out scene);
         }
@@ -341,7 +345,7 @@ namespace OpenSim
         /// </summary>
         /// <param name="regionInfo"></param>
         /// <returns></returns>
-        public IClientNetworkServer CreateRegion(RegionInfo regionInfo, out IScene scene)
+        public List<IClientNetworkServer> CreateRegion(RegionInfo regionInfo, out IScene scene)
         {
             return CreateRegion(regionInfo, false, true, out scene);
         }
@@ -353,7 +357,7 @@ namespace OpenSim
         /// <param name="portadd_flag"></param>
         /// <param name="do_post_init"></param>
         /// <returns></returns>
-        public IClientNetworkServer CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init, out IScene mscene)
+        public List<IClientNetworkServer> CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init, out IScene mscene)
         {
             int port = regionInfo.InternalEndPoint.Port;
 
@@ -378,8 +382,8 @@ namespace OpenSim
                 Util.XmlRpcCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
             }
 
-            IClientNetworkServer clientServer;
-            Scene scene = SetupScene(regionInfo, proxyOffset, Config, out clientServer);
+            List<IClientNetworkServer> clientServers;
+            Scene scene = SetupScene(regionInfo, proxyOffset, Config, out clientServers);
 
             m_log.Info("[MODULES]: Loading Region's modules (old style)");
 
@@ -483,8 +487,11 @@ namespace OpenSim
 
             if (m_autoCreateClientStack)
             {
-                m_clientServers.Add(clientServer);
-                clientServer.Start();
+                foreach (IClientNetworkServer clientserver in clientServers)
+                {
+                    m_clientServers.Add(clientserver);
+                    clientserver.Start();
+                }
             }
 
             if (scene.SnmpService != null)
@@ -504,7 +511,7 @@ namespace OpenSim
             scene.Start();
             scene.StartScripts();
 
-            return clientServer;
+            return clientServers;
         }
 
         /// <summary>
@@ -725,7 +732,7 @@ namespace OpenSim
         /// <param name="regionInfo"></param>
         /// <param name="clientServer"> </param>
         /// <returns></returns>
-        protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer)
+        protected Scene SetupScene(RegionInfo regionInfo, out List<IClientNetworkServer> clientServer)
         {
             return SetupScene(regionInfo, 0, null, out clientServer);
         }
@@ -739,8 +746,10 @@ namespace OpenSim
         /// <param name="clientServer"> </param>
         /// <returns></returns>
         protected Scene SetupScene(
-            RegionInfo regionInfo, int proxyOffset, IConfigSource configSource, out IClientNetworkServer clientServer)
+            RegionInfo regionInfo, int proxyOffset, IConfigSource configSource, out List<IClientNetworkServer> clientServer)
         {
+            List<IClientNetworkServer> clientNetworkServers = null;
+
             AgentCircuitManager circuitManager = new AgentCircuitManager();
             IPAddress listenIP = regionInfo.InternalEndPoint.Address;
             //if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP))
@@ -750,8 +759,7 @@ namespace OpenSim
 
             if (m_autoCreateClientStack)
             {
-                clientServer
-                    = m_clientStackManager.CreateServer(
+                clientNetworkServers = m_clientStackManager.CreateServers(
                         listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, configSource,
                         circuitManager);
             }
@@ -766,9 +774,12 @@ namespace OpenSim
 
             if (m_autoCreateClientStack)
             {
-                clientServer.AddScene(scene);
+                foreach (IClientNetworkServer clientnetserver in clientNetworkServers)
+                {
+                    clientnetserver.AddScene(scene);
+                }
             }
-
+            clientServer = clientNetworkServers;
             scene.LoadWorldMap();
 
             scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName);
@@ -791,7 +802,7 @@ namespace OpenSim
 
             return new Scene(
                 regionInfo, circuitManager, sceneGridService,
-                simDataService, estateDataService, false,
+                simDataService, estateDataService,
                 Config, m_version);
         }