ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 14:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Server/Base/HttpServerBase.cs
View File

@@ -116,20 +116,6 @@ namespace OpenSim.Server.Base
{
uint https_port = (uint)networkConfig.GetInt("https_port", 0);
<<<<<<< HEAD
string cert_path = networkConfig.GetString("cert_path",String.Empty);
if (cert_path == String.Empty)
{
System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
Environment.Exit(1);
}
string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
if (cert_pass == String.Empty)
{
System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
Environment.Exit(1);
=======
m_log.WarnFormat("[SSL]: External flag is {0}", ssl_external);
if (!ssl_external)
{
@@ -152,7 +138,6 @@ namespace OpenSim.Server.Base
{
m_log.WarnFormat("[SSL]: SSL port is active but no SSL is used because external SSL was requested.");
MainServer.AddHttpServer(new BaseHttpServer(https_port));
>>>>>>> avn/ubitvar
}
}
}