diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index c497b1c..d58ab94 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -101,13 +101,25 @@ namespace OpenSim.Region.ClientStack | |||
101 | // "OOB" Server | 101 | // "OOB" Server |
102 | if (m_networkServersInfo.ssl_listener) | 102 | if (m_networkServersInfo.ssl_listener) |
103 | { | 103 | { |
104 | BaseHttpServer server = new BaseHttpServer( | 104 | if (!m_networkServersInfo.ssl_external) |
105 | m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path, | 105 | { |
106 | m_networkServersInfo.cert_pass); | 106 | BaseHttpServer server = new BaseHttpServer( |
107 | m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path, | ||
108 | m_networkServersInfo.cert_pass); | ||
107 | 109 | ||
108 | m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port); | 110 | m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port); |
109 | MainServer.AddHttpServer(server); | 111 | MainServer.AddHttpServer(server); |
110 | server.Start(); | 112 | server.Start(); |
113 | } | ||
114 | else | ||
115 | { | ||
116 | BaseHttpServer server = new BaseHttpServer( | ||
117 | m_networkServersInfo.https_port); | ||
118 | |||
119 | m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0} for external HTTPS", server.Port); | ||
120 | MainServer.AddHttpServer(server); | ||
121 | server.Start(); | ||
122 | } | ||
111 | } | 123 | } |
112 | 124 | ||
113 | base.StartupSpecific(); | 125 | base.StartupSpecific(); |
@@ -129,8 +141,12 @@ namespace OpenSim.Region.ClientStack | |||
129 | PhysicsPluginManager physicsPluginManager; | 141 | PhysicsPluginManager physicsPluginManager; |
130 | physicsPluginManager = new PhysicsPluginManager(); | 142 | physicsPluginManager = new PhysicsPluginManager(); |
131 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); | 143 | physicsPluginManager.LoadPluginsFromAssemblies("Physics"); |
144 | <<<<<<< HEAD | ||
132 | 145 | ||
146 | ======= | ||
147 | |||
148 | >>>>>>> avn/ubitvar | ||
133 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent); | 149 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier, regionExtent); |
134 | } | 150 | } |
135 | } | 151 | } |
136 | } \ No newline at end of file | 152 | } |