aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionLoader/Filesystem
diff options
context:
space:
mode:
authorMW2008-06-26 17:20:08 +0000
committerMW2008-06-26 17:20:08 +0000
commit682ec53420ffac9918febc12b7140363602812e5 (patch)
treea3d45436d19e0388c9f52f7e4bc8058f52d71ec5 /OpenSim/Framework/RegionLoader/Filesystem
parentWORK-IN-PRGRESS: beware of falling pieces and shifting (diff)
downloadopensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.zip
opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.gz
opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.bz2
opensim-SC_OLD-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 '')
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 0c01c5a..c345fce 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -33,9 +33,9 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
33{ 33{
34 public class RegionLoaderFileSystem : IRegionLoader 34 public class RegionLoaderFileSystem : IRegionLoader
35 { 35 {
36 private IniConfigSource m_configSouce; 36 private IConfigSource m_configSouce;
37 37
38 public void SetIniConfigSource(IniConfigSource configSource) 38 public void SetIniConfigSource(IConfigSource configSource)
39 { 39 {
40 m_configSouce = configSource; 40 m_configSouce = configSource;
41 } 41 }
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
46 46
47 try 47 try
48 { 48 {
49 IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"]; 49 IConfig startupConfig = (IConfig)m_configSouce.Configs["Startup"];
50 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim(); 50 regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim();
51 } 51 }
52 catch (Exception) 52 catch (Exception)