ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
UbitUmarov
2017-01-05 19:32:57 +00:00
parent 9d28fd41c6 b16abc8166
commit 254b26a7d5
960 changed files with 23754 additions and 23741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Server/ServerMain.cs
View File

@@ -82,7 +82,7 @@ namespace OpenSim.Server
ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;
m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
string registryLocation;
IConfig serverConfig = m_Server.Config.Configs["Startup"];
@@ -97,7 +97,7 @@ namespace OpenSim.Server
string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
registryLocation = serverConfig.GetString("RegistryLocation",".");
IConfig servicesConfig = m_Server.Config.Configs["ServiceList"];