From e789ab659c8a35a32f4edfc8f79f367b9a993721 Mon Sep 17 00:00:00 2001 From: Kevin Houlihan Date: Thu, 22 Sep 2011 18:11:55 +0100 Subject: [PATCH] Removed uncalled region load method. The method LoadRegionsPlugin.LoadRegionFromConfig was no longer being referenced from anywhere, so I removed it. It's function has apparently been taken on by the PostInitialise of that module. --- .../LoadRegions/LoadRegionsPlugin.cs | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index e26c1d23b4..6e28eba1f4 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs @@ -186,35 +186,5 @@ namespace OpenSim.ApplicationPlugins.LoadRegions return true; } - - public void LoadRegionFromConfig(OpenSimBase openSim, ulong regionhandle) - { - m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); - - IRegionLoader regionLoader; - if (openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") - { - m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem"); - regionLoader = new RegionLoaderFileSystem(); - } - else - { - m_log.Info("[LOADREGIONS]: Loading Region Info from web"); - regionLoader = new RegionLoaderWebServer(); - } - - regionLoader.SetIniConfigSource(openSim.ConfigSource.Source); - RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); - for (int i = 0; i < regionsToLoad.Length; i++) - { - if (regionhandle == regionsToLoad[i].RegionHandle) - { - IScene scene; - m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + - Thread.CurrentThread.ManagedThreadId.ToString() + ")"); - openSim.CreateRegion(regionsToLoad[i], true, out scene); - } - } - } } }