aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/ServicesServerBase.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Server/Base/ServicesServerBase.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index e18594f..f60b5fb 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Server.Base
92 92
93 // Check if a prompt was given on the command line 93 // Check if a prompt was given on the command line
94 prompt = startupConfig.GetString("prompt", prompt); 94 prompt = startupConfig.GetString("prompt", prompt);
95 95
96 // Check for a Log4Net config file on the command line 96 // Check for a Log4Net config file on the command line
97 logConfig =startupConfig.GetString("logconfig", logConfig); 97 logConfig =startupConfig.GetString("logconfig", logConfig);
98 } 98 }
@@ -116,7 +116,7 @@ namespace OpenSim.Server.Base
116 // Merge OpSys env vars 116 // Merge OpSys env vars
117 Console.WriteLine("[CONFIG]: Loading environment variables for Config"); 117 Console.WriteLine("[CONFIG]: Loading environment variables for Config");
118 Util.MergeEnvironmentToConfig(Config); 118 Util.MergeEnvironmentToConfig(Config);
119 119
120 // Merge the configuration from the command line into the loaded file 120 // Merge the configuration from the command line into the loaded file
121 Config.Merge(argvConfig); 121 Config.Merge(argvConfig);
122 122