From 682ec53420ffac9918febc12b7140363602812e5 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 26 Jun 2008 17:20:08 +0000
Subject: 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).

---
 OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/LoadRegions')

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
             m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
 
             IRegionLoader regionLoader;
-            if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
+            if (openSim.ConfigSource.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
             {
                 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
                 regionLoader = new RegionLoaderFileSystem();
@@ -62,7 +62,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                 regionLoader = new RegionLoaderWebServer();
             }
 
-            regionLoader.SetIniConfigSource(openSim.ConfigSource);
+            regionLoader.SetIniConfigSource(openSim.ConfigSource.ConfigSource);
             RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
 
             openSim.ModuleLoader.LoadDefaultSharedModules();
@@ -89,7 +89,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
 
             IRegionLoader regionLoader;
-            if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
+            if (openSim.ConfigSource.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
             {
                 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
                 regionLoader = new RegionLoaderFileSystem();
@@ -100,7 +100,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                 regionLoader = new RegionLoaderWebServer();
             }
 
-            regionLoader.SetIniConfigSource(openSim.ConfigSource);
+            regionLoader.SetIniConfigSource(openSim.ConfigSource.ConfigSource);
             RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
             for (int i = 0; i < regionsToLoad.Length; i++)
             {
-- 
cgit v1.1