1 files changed, 27 insertions, 26 deletions

diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index e57e298..6e3a58e 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 
@@ -48,30 +49,16 @@ namespace OpenSim.Region.ClientStack
 
         protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
         protected NetworkServersInfo m_networkServersInfo;
-
-        public NetworkServersInfo NetServersInfo
-        {
-            get { return m_networkServersInfo; }
-        }
-
         protected uint m_httpServerPort;
-        
-        public CommunicationsManager CommunicationsManager 
-        {
-            get { return m_commsManager; }
-            set { m_commsManager = value; }
-        }
-        protected CommunicationsManager m_commsManager;
-
-        protected StorageManager m_storageManager;
-        
+        protected ISimulationDataService m_simulationDataService;
+        protected IEstateDataService m_estateDataService;
         protected ClientStackManager m_clientStackManager;
-
-        public SceneManager SceneManager
-        {
-            get { return m_sceneManager; }
-        }
         protected SceneManager m_sceneManager = new SceneManager();
+
+        public SceneManager SceneManager { get { return m_sceneManager; } }
+        public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } }
+        public ISimulationDataService SimulationDataService { get { return m_simulationDataService; } }
+        public IEstateDataService EstateDataService { get { return m_estateDataService; } }
        
         protected abstract void Initialize();
         
@@ -85,15 +72,11 @@ namespace OpenSim.Region.ClientStack
         /// <returns></returns>
         protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier);
         
-        protected abstract StorageManager CreateStorageManager();
         protected abstract ClientStackManager CreateClientStackManager();
-        protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
-                                             AgentCircuitManager circuitManager);
+        protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager);
 
         protected override void StartupSpecific()
         {
-            m_storageManager = CreateStorageManager();
-
             m_clientStackManager = CreateClientStackManager();
 
             Initialize();
@@ -111,6 +94,24 @@ namespace OpenSim.Region.ClientStack
             m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0}", m_httpServerPort);
             m_httpServer.Start();
 
+            MainServer.Instance = m_httpServer;
+
+            // "OOB" Server
+            if (m_networkServersInfo.ssl_listener)
+            {
+                BaseHttpServer server = null;
+                server = new BaseHttpServer(
+                    m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
+                    m_networkServersInfo.cert_pass);
+                // Add the server to m_Servers
+                if(server != null)
+                {
+                    m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
+                    MainServer.AddHttpServer(server);
+                    server.Start();
+                }
+            }
+
             base.StartupSpecific();
         }