aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-01-05 19:32:57 +0000
committerUbitUmarov2017-01-05 19:32:57 +0000
commit254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch)
tree8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/Application/ConfigurationLoader.cs
parentMerge branch 'master' into httptests (diff)
parentMassive tab and trailing space cleanup (diff)
downloadopensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip
opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz
opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2
opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz
fix merge
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 4f141a6..62bd4f4 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -43,10 +43,10 @@ namespace OpenSim
43 public class ConfigurationLoader 43 public class ConfigurationLoader
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 /// <summary> 47 /// <summary>
48 /// Various Config settings the region needs to start 48 /// Various Config settings the region needs to start
49 /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, 49 /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
50 /// StorageDLL, Storage Connection String, Estate connection String, Client Stack 50 /// StorageDLL, Storage Connection String, Estate connection String, Client Stack
51 /// Standalone settings. 51 /// Standalone settings.
52 /// </summary> 52 /// </summary>
@@ -188,7 +188,7 @@ namespace OpenSim
188 { 188 {
189 iniFileExists = true; 189 iniFileExists = true;
190 AddIncludes(overrideConfig, overrideSources); 190 AddIncludes(overrideConfig, overrideSources);
191 } 191 }
192 } 192 }
193 m_config.Source.Merge(overrideConfig.Source); 193 m_config.Source.Merge(overrideConfig.Source);
194 } 194 }
@@ -198,7 +198,7 @@ namespace OpenSim
198 { 198 {
199 m_log.FatalFormat("[CONFIG]: Could not load any configuration"); 199 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
200 Environment.Exit(1); 200 Environment.Exit(1);
201 } 201 }
202 else if (!iniFileExists) 202 else if (!iniFileExists)
203 { 203 {
204 m_log.FatalFormat("[CONFIG]: Could not load any configuration"); 204 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
@@ -257,14 +257,14 @@ namespace OpenSim
257 string path = Path.Combine(basepath, chunkWithoutWildcards); 257 string path = Path.Combine(basepath, chunkWithoutWildcards);
258 path = Path.GetFullPath(path) + chunkWithWildcards; 258 path = Path.GetFullPath(path) + chunkWithWildcards;
259 string[] paths = Util.Glob(path); 259 string[] paths = Util.Glob(path);
260 260
261 // If the include path contains no wildcards, then warn the user that it wasn't found. 261 // If the include path contains no wildcards, then warn the user that it wasn't found.
262 if (wildcardIndex == -1 && paths.Length == 0) 262 if (wildcardIndex == -1 && paths.Length == 0)
263 { 263 {
264 m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path); 264 m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
265 } 265 }
266 else 266 else
267 { 267 {
268 foreach (string p in paths) 268 foreach (string p in paths)
269 { 269 {
270 if (!sources.Contains(p)) 270 if (!sources.Contains(p))
@@ -377,7 +377,7 @@ namespace OpenSim
377 m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); 377 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
378 m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); 378 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
379 379
380 m_configSettings.ClientstackDll 380 m_configSettings.ClientstackDll
381 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 381 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
382 } 382 }
383 383