aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/LoadRegions
diff options
context:
space:
mode:
authorMW2008-06-26 17:20:08 +0000
committerMW2008-06-26 17:20:08 +0000
commit682ec53420ffac9918febc12b7140363602812e5 (patch)
treea3d45436d19e0388c9f52f7e4bc8058f52d71ec5 /OpenSim/ApplicationPlugins/LoadRegions
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 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 8dde28c..01ea3eb 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -51,7 +51,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
51 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); 51 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
52 52
53 IRegionLoader regionLoader; 53 IRegionLoader regionLoader;
54 if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") 54 if (openSim.ConfigSource.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
55 { 55 {
56 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem"); 56 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
57 regionLoader = new RegionLoaderFileSystem(); 57 regionLoader = new RegionLoaderFileSystem();
@@ -62,7 +62,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
62 regionLoader = new RegionLoaderWebServer(); 62 regionLoader = new RegionLoaderWebServer();
63 } 63 }
64 64
65 regionLoader.SetIniConfigSource(openSim.ConfigSource); 65 regionLoader.SetIniConfigSource(openSim.ConfigSource.ConfigSource);
66 RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); 66 RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
67 67
68 openSim.ModuleLoader.LoadDefaultSharedModules(); 68 openSim.ModuleLoader.LoadDefaultSharedModules();
@@ -89,7 +89,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
89 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); 89 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
90 90
91 IRegionLoader regionLoader; 91 IRegionLoader regionLoader;
92 if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") 92 if (openSim.ConfigSource.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
93 { 93 {
94 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem"); 94 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
95 regionLoader = new RegionLoaderFileSystem(); 95 regionLoader = new RegionLoaderFileSystem();
@@ -100,7 +100,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
100 regionLoader = new RegionLoaderWebServer(); 100 regionLoader = new RegionLoaderWebServer();
101 } 101 }
102 102
103 regionLoader.SetIniConfigSource(openSim.ConfigSource); 103 regionLoader.SetIniConfigSource(openSim.ConfigSource.ConfigSource);
104 RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); 104 RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
105 for (int i = 0; i < regionsToLoad.Length; i++) 105 for (int i = 0; i < regionsToLoad.Length; i++)
106 { 106 {