diff options
author | Kevin Houlihan | 2011-09-22 18:11:55 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-24 02:06:34 +0100 |
commit | e789ab659c8a35a32f4edfc8f79f367b9a993721 (patch) | |
tree | 9a2d8d29ba1c03d9177485c22276e091a7a56b68 /OpenSim/ApplicationPlugins/LoadRegions | |
parent | Added a setting to [Startup] section of config that will allow the simulator ... (diff) | |
download | opensim-SC-e789ab659c8a35a32f4edfc8f79f367b9a993721.zip opensim-SC-e789ab659c8a35a32f4edfc8f79f367b9a993721.tar.gz opensim-SC-e789ab659c8a35a32f4edfc8f79f367b9a993721.tar.bz2 opensim-SC-e789ab659c8a35a32f4edfc8f79f367b9a993721.tar.xz |
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.
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index e26c1d2..6e28eba 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -186,35 +186,5 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
186 | 186 | ||
187 | return true; | 187 | return true; |
188 | } | 188 | } |
189 | |||
190 | public void LoadRegionFromConfig(OpenSimBase openSim, ulong regionhandle) | ||
191 | { | ||
192 | m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); | ||
193 | |||
194 | IRegionLoader regionLoader; | ||
195 | if (openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") | ||
196 | { | ||
197 | m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem"); | ||
198 | regionLoader = new RegionLoaderFileSystem(); | ||
199 | } | ||
200 | else | ||
201 | { | ||
202 | m_log.Info("[LOADREGIONS]: Loading Region Info from web"); | ||
203 | regionLoader = new RegionLoaderWebServer(); | ||
204 | } | ||
205 | |||
206 | regionLoader.SetIniConfigSource(openSim.ConfigSource.Source); | ||
207 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); | ||
208 | for (int i = 0; i < regionsToLoad.Length; i++) | ||
209 | { | ||
210 | if (regionhandle == regionsToLoad[i].RegionHandle) | ||
211 | { | ||
212 | IScene scene; | ||
213 | m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + | ||
214 | Thread.CurrentThread.ManagedThreadId.ToString() + ")"); | ||
215 | openSim.CreateRegion(regionsToLoad[i], true, out scene); | ||
216 | } | ||
217 | } | ||
218 | } | ||
219 | } | 189 | } |
220 | } | 190 | } |