aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/ServicesServerBase.cs
diff options
context:
space:
mode:
authorBlueWall2012-10-03 16:07:11 -0400
committerBlueWall2012-10-03 16:07:11 -0400
commit3e71c71cbffb0de454759e2bbd0ff840dfa480bc (patch)
treed6cbdc998bd4d7f9309bb73866e1ebaf72cb1b1b /OpenSim/Server/Base/ServicesServerBase.cs
parentAllow setting connection limits, part 2 (diff)
downloadopensim-SC_OLD-3e71c71cbffb0de454759e2bbd0ff840dfa480bc.zip
opensim-SC_OLD-3e71c71cbffb0de454759e2bbd0ff840dfa480bc.tar.gz
opensim-SC_OLD-3e71c71cbffb0de454759e2bbd0ff840dfa480bc.tar.bz2
opensim-SC_OLD-3e71c71cbffb0de454759e2bbd0ff840dfa480bc.tar.xz
Add modular configuration for Robust connectors
We can provide modular ini for connectors... look for our configuration in the following places... 1) in the default ini/-inifile 2) in the named file (ConfigName) located in the configured directory (see Robust[.HG].ini [Start] section for ConfigDirectory) 3) in the repository named in the connector (ConfigURL) In this case, the file will be written into the configured directory with the specified See example connector/service @ https://github.com/BlueWall/SlipStream for testing.
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 0cff6ed..2f12288 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -64,6 +64,12 @@ namespace OpenSim.Server.Base
64 get { return m_Config; } 64 get { return m_Config; }
65 } 65 }
66 66
67 public string ConfigDirectory
68 {
69 get;
70 private set;
71 }
72
67 // Run flag 73 // Run flag
68 // 74 //
69 private bool m_Running = true; 75 private bool m_Running = true;
@@ -153,6 +159,8 @@ namespace OpenSim.Server.Base
153 startupConfig = m_Config.Configs["Startup"]; 159 startupConfig = m_Config.Configs["Startup"];
154 } 160 }
155 161
162 ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
163
156 prompt = startupConfig.GetString("Prompt", prompt); 164 prompt = startupConfig.GetString("Prompt", prompt);
157 165
158 // Allow derived classes to load config before the console is 166 // Allow derived classes to load config before the console is