aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs51
1 files changed, 31 insertions, 20 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 4db2907..4006066 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -70,6 +70,13 @@ namespace OpenSim.Region.ClientStack
70 { 70 {
71 get { return m_sceneManager; } 71 get { return m_sceneManager; }
72 } 72 }
73
74 protected abstract void Initialize();
75 protected abstract PhysicsScene GetPhysicsScene();
76 protected abstract StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring);
77 protected abstract ClientStackManager CreateClientStackManager();
78 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
79 AgentCircuitManager circuitManager);
73 80
74 protected override void StartupSpecific() 81 protected override void StartupSpecific()
75 { 82 {
@@ -79,7 +86,11 @@ namespace OpenSim.Region.ClientStack
79 86
80 Initialize(); 87 Initialize();
81 88
82 m_httpServer = new BaseHttpServer(m_httpServerPort,m_networkServersInfo.HttpUsesSSL,m_networkServersInfo.httpSSLPort, m_networkServersInfo.HttpSSLCN); 89 m_httpServer
90 = new BaseHttpServer(
91 m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort,
92 m_networkServersInfo.HttpSSLCN);
93
83 if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort)) 94 if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort))
84 { 95 {
85 m_log.Error("[HTTP]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports"); 96 m_log.Error("[HTTP]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports");
@@ -89,19 +100,6 @@ namespace OpenSim.Region.ClientStack
89 m_httpServer.Start(); 100 m_httpServer.Start();
90 } 101 }
91 102
92 protected abstract void Initialize();
93
94 // protected void StartConsole()
95 // {
96 // m_console = CreateConsole();
97 // MainConsole.Instance = m_console;
98 // }
99
100 // protected abstract ConsoleBase CreateConsole();
101 protected abstract PhysicsScene GetPhysicsScene();
102 protected abstract StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring);
103 protected abstract ClientStackManager CreateClientStackManager();
104
105 protected PhysicsScene GetPhysicsScene(string engine, string meshEngine, IConfigSource config) 103 protected PhysicsScene GetPhysicsScene(string engine, string meshEngine, IConfigSource config)
106 { 104 {
107 PhysicsPluginManager physicsPluginManager; 105 PhysicsPluginManager physicsPluginManager;
@@ -110,12 +108,28 @@ namespace OpenSim.Region.ClientStack
110 return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config); 108 return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config);
111 } 109 }
112 110
111 /// <summary>
112 /// Create a scene and its initial base structures.
113 /// </summary>
114 /// <param name="regionInfo"></param>
115 /// <param name="clientServer"> </param>
116 /// <returns></returns>
113 protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer) 117 protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer)
114 { 118 {
115 return SetupScene(regionInfo, 0, out clientServer); 119 return SetupScene(regionInfo, 0, null, out clientServer);
116 } 120 }
117 121
118 protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out IClientNetworkServer clientServer) 122 /// <summary>
123 /// Create a scene and its initial base structures.
124 /// </summary>
125 /// <param name="regionInfo"></param>
126 /// <param name="proxyOffset"></param>
127 /// <param name="clientStackUserSettings"></param>
128 /// <param name="clientServer"> </param>
129 /// <returns></returns>
130 protected Scene SetupScene(
131 RegionInfo regionInfo, int proxyOffset, ClientStackUserSettings clientStackUserSettings,
132 out IClientNetworkServer clientServer)
119 { 133 {
120 AgentCircuitManager circuitManager = new AgentCircuitManager(); 134 AgentCircuitManager circuitManager = new AgentCircuitManager();
121 IPAddress listenIP = regionInfo.InternalEndPoint.Address; 135 IPAddress listenIP = regionInfo.InternalEndPoint.Address;
@@ -126,7 +140,7 @@ namespace OpenSim.Region.ClientStack
126 140
127 clientServer 141 clientServer
128 = m_clientStackManager.CreateServer( 142 = m_clientStackManager.CreateServer(
129 listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, new ClientStackUserSettings(), 143 listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, clientStackUserSettings,
130 m_assetCache, circuitManager); 144 m_assetCache, circuitManager);
131 145
132 regionInfo.InternalEndPoint.Port = (int)port; 146 regionInfo.InternalEndPoint.Port = (int)port;
@@ -172,8 +186,5 @@ namespace OpenSim.Region.ClientStack
172 186
173 return scene; 187 return scene;
174 } 188 }
175
176 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
177 AgentCircuitManager circuitManager);
178 } 189 }
179} 190}