aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-07 18:26:53 +0100
committerJustin Clark-Casey (justincc)2009-09-07 18:26:53 +0100
commit116933bee5adfa4a3c1815fb7f3866bdaa584c41 (patch)
treeb1aaf689ad7c9ef07e495e94d64f5978a1d5c9c3 /OpenSim/ApplicationPlugins
parentT012_EstateSettingsRandomStorage() which wasn't being run because the method ... (diff)
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.zip
opensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.tar.gz
opensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.tar.bz2
opensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index dff4d48..6fd3d30 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -94,14 +94,24 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
94 regionLoader = new RegionLoaderWebServer(); 94 regionLoader = new RegionLoaderWebServer();
95 } 95 }
96 96
97 m_log.Info("[LOADREGIONSPLUGIN]: Loading region configurations...");
98
97 regionLoader.SetIniConfigSource(m_openSim.ConfigSource.Source); 99 regionLoader.SetIniConfigSource(m_openSim.ConfigSource.Source);
98 RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); 100 RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
99 101
102 m_log.Info("[LOADREGIONSPLUGIN]: Loading specific shared modules...");
103 m_log.Info("[LOADREGIONSPLUGIN]: DynamicTextureModule...");
100 m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule()); 104 m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
105 m_log.Info("[LOADREGIONSPLUGIN]: InstantMessageModule...");
101 m_openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule()); 106 m_openSim.ModuleLoader.LoadDefaultSharedModule(new InstantMessageModule());
107 m_log.Info("[LOADREGIONSPLUGIN]: LoadImageURLModule...");
102 m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule()); 108 m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
109 m_log.Info("[LOADREGIONSPLUGIN]: XMLRPCModule...");
103 m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule()); 110 m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
111 m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
104 m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); 112 m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
113 m_log.Info("[LOADREGIONSPLUGIN]: Done.");
114
105 if (!CheckRegionsForSanity(regionsToLoad)) 115 if (!CheckRegionsForSanity(regionsToLoad))
106 { 116 {
107 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); 117 m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations");