diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Server/ServerMain.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
| -rw-r--r-- | OpenSim/Server/ServerMain.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 9d6a3d0..75aef5f 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
| @@ -82,7 +82,7 @@ namespace OpenSim.Server | |||
| 82 | ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate; | 82 | ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate; |
| 83 | 83 | ||
| 84 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); | 84 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); |
| 85 | 85 | ||
| 86 | string registryLocation; | 86 | string registryLocation; |
| 87 | 87 | ||
| 88 | IConfig serverConfig = m_Server.Config.Configs["Startup"]; | 88 | IConfig serverConfig = m_Server.Config.Configs["Startup"]; |
| @@ -97,7 +97,7 @@ namespace OpenSim.Server | |||
| 97 | 97 | ||
| 98 | 98 | ||
| 99 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); | 99 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); |
| 100 | 100 | ||
| 101 | registryLocation = serverConfig.GetString("RegistryLocation","."); | 101 | registryLocation = serverConfig.GetString("RegistryLocation","."); |
| 102 | 102 | ||
| 103 | IConfig servicesConfig = m_Server.Config.Configs["ServiceList"]; | 103 | IConfig servicesConfig = m_Server.Config.Configs["ServiceList"]; |