From b47e405420b316a2f68b3e6f4c5ed35dc713260e Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Wed, 12 Aug 2009 22:54:57 -0400
Subject: * minor: Comments
---
OpenSim/Region/Application/ConfigurationLoader.cs | 45 ++++++++++++++++++++++-
1 file changed, 43 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3a65242..c3e7b86 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -37,12 +37,32 @@ using OpenSim.Framework;
namespace OpenSim
{
+ ///
+ /// Loads the Configuration files into nIni
+ ///
public class ConfigurationLoader
{
+ ///
+ /// Various Config settings the region needs to start
+ /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
+ /// StorageDLL, Storage Connection String, Estate connection String, Client Stack
+ /// Standalone settings.
+ ///
protected ConfigSettings m_configSettings;
+
+ ///
+ /// A source of Configuration data
+ ///
protected OpenSimConfigSource m_config;
+
+ ///
+ /// Grid Service Information. This refers to classes and addresses of the grid service
+ ///
protected NetworkServersInfo m_networkServersInfo;
+ ///
+ /// Console logger
+ ///
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,6 +71,13 @@ namespace OpenSim
{
}
+ ///
+ /// Loads the region configuration
+ ///
+ /// Parameters passed into the process when started
+ ///
+ ///
+ /// A configuration that gets passed to modules
public OpenSimConfigSource LoadConfigSettings(
IConfigSource argvSource, out ConfigSettings configSettings,
out NetworkServersInfo networkInfo)
@@ -169,15 +196,22 @@ namespace OpenSim
return m_config;
}
+ ///
+ /// Adds the included files as ini configuration files
+ ///
+ /// List of URL strings or filename strings
private void AddIncludes(List sources)
{
+ //loop over config sources
foreach (IConfig config in m_config.Source.Configs)
{
+ // Look for Include-* in the key name
string[] keys = config.GetKeys();
foreach (string k in keys)
{
if (k.StartsWith("Include-"))
{
+ // read the config file to be included.
string file = config.GetString(k);
if (IsUri(file))
{
@@ -199,7 +233,11 @@ namespace OpenSim
}
}
}
-
+ ///
+ /// Check if we can convert the string to a URI
+ ///
+ /// String uri to the remote resource
+ /// true if we can convert the string to a Uri object
bool IsUri(string file)
{
Uri configUri;
@@ -253,7 +291,7 @@ namespace OpenSim
///
/// Setup a default config values in case they aren't present in the ini file
///
- ///
+ /// A Configuration source containing the default configuration
private static IConfigSource DefaultConfig()
{
IConfigSource defaultConfig = new IniConfigSource();
@@ -322,6 +360,9 @@ namespace OpenSim
return defaultConfig;
}
+ ///
+ /// Read initial region settings from the ConfigSource
+ ///
protected virtual void ReadConfigSettings()
{
IConfig startupConfig = m_config.Source.Configs["Startup"];
--
cgit v1.1