aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/LoadRegions
diff options
context:
space:
mode:
authorMelanie2011-10-12 00:10:15 +0200
committerMelanie2011-10-12 00:10:15 +0200
commit1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch)
tree97fa9c758f429d5dee64234e442f2c83cd1b9994 /OpenSim/ApplicationPlugins/LoadRegions
parentMerge branch 'careminster-presence-refactor' into bigmerge (diff)
parentMerge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff)
downloadopensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip
opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz
opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2
opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs30
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}