diff options
author | MW | 2008-06-26 17:20:08 +0000 |
---|---|---|
committer | MW | 2008-06-26 17:20:08 +0000 |
commit | 682ec53420ffac9918febc12b7140363602812e5 (patch) | |
tree | a3d45436d19e0388c9f52f7e4bc8058f52d71ec5 /OpenSim/Framework/RegionLoader/Web | |
parent | WORK-IN-PRGRESS: beware of falling pieces and shifting (diff) | |
download | opensim-SC-682ec53420ffac9918febc12b7140363602812e5.zip opensim-SC-682ec53420ffac9918febc12b7140363602812e5.tar.gz opensim-SC-682ec53420ffac9918febc12b7140363602812e5.tar.bz2 opensim-SC-682ec53420ffac9918febc12b7140363602812e5.tar.xz |
As per the suggestion on the mailing list, added support for a OpenSim.xml config file, instead of a ini file. INI files still work the same as they did before, just now if a ini file isn't found, it looks for a OpenSim.xml file (of course in xml format) and if found uses that.
Includes a OpenSim.Example.xml for reference (the default settings saved as a xml file).
Diffstat (limited to 'OpenSim/Framework/RegionLoader/Web')
-rw-r--r-- | OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs index 17077e7..029d396 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |||
@@ -39,9 +39,9 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | private IniConfigSource m_configSouce; | 42 | private IConfigSource m_configSouce; |
43 | 43 | ||
44 | public void SetIniConfigSource(IniConfigSource configSource) | 44 | public void SetIniConfigSource(IConfigSource configSource) |
45 | { | 45 | { |
46 | m_configSouce = configSource; | 46 | m_configSouce = configSource; |
47 | } | 47 | } |
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
55 | } | 55 | } |
56 | else | 56 | else |
57 | { | 57 | { |
58 | IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; | 58 | IConfig startupConfig = (IConfig) m_configSouce.Configs["Startup"]; |
59 | string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim(); | 59 | string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim(); |
60 | if (url == String.Empty) | 60 | if (url == String.Empty) |
61 | { | 61 | { |