From 9fcf3f1a3f3457debf0f59ba7659492b44172b99 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Nov 2012 05:48:41 +0000
Subject: Make "config show/set/get/save" console commands available on all
servers
---
OpenSim/Server/Base/HttpServerBase.cs | 2 +-
OpenSim/Server/Base/ServicesServerBase.cs | 19 +++++--------------
2 files changed, 6 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Server')
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 29b1c00..954783c 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Server.Base
protected override void ReadConfig()
{
- IConfig networkConfig = m_Config.Configs["Network"];
+ IConfig networkConfig = Config.Configs["Network"];
if (networkConfig == null)
{
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index ade4bab..2c2b8ed 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -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);
--
cgit v1.1