ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make "config show/set/get/save" console commands available on all servers

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2012-11-22 05:48:41 +00:00
parent 8269d2b893
commit 9fcf3f1a3f
6 changed files with 172 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Server/Base/ServicesServerBase.cs
View File

@@ -56,15 +56,6 @@ namespace OpenSim.Server.Base
//
protected string[] m_Arguments;
// Configuration
//
protected IConfigSource m_Config = null;
public IConfigSource Config
{
get { return m_Config; }
}
// Run flag
//
private bool m_Running = true;
@@ -118,11 +109,11 @@ namespace OpenSim.Server.Base
configUri.Scheme == Uri.UriSchemeHttp)
{
XmlReader r = XmlReader.Create(iniFile);
m_Config = new XmlConfigSource(r);
Config = new XmlConfigSource(r);
}
else
{
m_Config = new IniConfigSource(iniFile);
Config = new IniConfigSource(iniFile);
}
}
catch (Exception e)
@@ -134,13 +125,13 @@ namespace OpenSim.Server.Base
// Merge the configuration from the command line into the
// loaded file
//
m_Config.Merge(argvConfig);
Config.Merge(argvConfig);
// Refresh the startupConfig post merge
//
if (m_Config.Configs["Startup"] != null)
if (Config.Configs["Startup"] != null)
{
startupConfig = m_Config.Configs["Startup"];
startupConfig = Config.Configs["Startup"];
}
prompt = startupConfig.GetString("Prompt", prompt);