3 files changed, 9 insertions, 9 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
             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++)
             {
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 232fd09..947f833 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -58,11 +58,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         {
             try
             {
-                if (openSim.ConfigSource.Configs["RemoteAdmin"] != null &&
-                    openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
+                if (openSim.ConfigSource.ConfigSource.Configs["RemoteAdmin"] != null &&
+                    openSim.ConfigSource.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
                 {
                     m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
-                    requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
+                    requiredPassword = openSim.ConfigSource.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
 
                     m_app = openSim;
                     m_httpd = openSim.HttpServer;
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index e4bd544..60a7d27 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -203,7 +203,7 @@ namespace OpenSim.ApplicationPlugins.Rest
 
             try
             {
-                if ((_config = openSim.ConfigSource.Configs["RestPlugins"]) == null)
+                if ((_config = openSim.ConfigSource.ConfigSource.Configs["RestPlugins"]) == null)
                 {
                     m_log.WarnFormat("{0} Rest Plugins not configured", MsgID);
                     return;
@@ -225,7 +225,7 @@ namespace OpenSim.ApplicationPlugins.Rest
                 _prefix = _config.GetString("prefix", "/admin");
 
                 // Get plugin specific config
-                _pluginConfig = openSim.ConfigSource.Configs[ConfigName];
+                _pluginConfig = openSim.ConfigSource.ConfigSource.Configs[ConfigName];
 
 
                 m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID);