aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-09-06 15:55:57 +0100
committerMelanie2009-09-06 15:55:57 +0100
commit67d9a6bcc15fe3fdc499d674276461a5eddd14ce (patch)
treee7e30625f5079e5960480557f7e8a82fcaf74f82
parentRemove the encryption from the IAuthenticationService interface. That (diff)
parent* Typo in previous commit. (diff)
downloadopensim-SC_OLD-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.zip
opensim-SC_OLD-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.tar.gz
opensim-SC_OLD-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.tar.bz2
opensim-SC_OLD-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs10
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs1
2 files changed, 11 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");
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 44f44fe..63e09ae 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -78,6 +78,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
78 78
79 foreach (IConfig config in source.Configs) 79 foreach (IConfig config in source.Configs)
80 { 80 {
81 //m_log.Info("[REGIONLOADERFILESYSTEM]: Creating RegionInfo for " + config.Name);
81 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name); 82 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
82 regionInfos.Add(regionInfo); 83 regionInfos.Add(regionInfo);
83 i++; 84 i++;