diff options
| author | Melanie | 2010-01-26 14:53:14 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-26 14:53:14 +0000 |
| commit | b80ea002654bd0ab232aee2b0f842be18b8d4edc (patch) | |
| tree | 35971637efd7ec9cbfaee88bc5ea56edffddfc1b /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Replace dome tabs with spaces (diff) | |
| download | opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.zip opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.gz opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.bz2 opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 6fd3d30..64863c5 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
| @@ -99,7 +99,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
| 99 | regionLoader.SetIniConfigSource(m_openSim.ConfigSource.Source); | 99 | regionLoader.SetIniConfigSource(m_openSim.ConfigSource.Source); |
| 100 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); | 100 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); |
| 101 | 101 | ||
| 102 | m_log.Info("[LOADREGIONSPLUGIN]: Loading specific shared modules..."); | 102 | /*m_log.Info("[LOADREGIONSPLUGIN]: Loading specific shared modules..."); |
| 103 | m_log.Info("[LOADREGIONSPLUGIN]: DynamicTextureModule..."); | 103 | m_log.Info("[LOADREGIONSPLUGIN]: DynamicTextureModule..."); |
| 104 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule()); | 104 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule()); |
| 105 | m_log.Info("[LOADREGIONSPLUGIN]: InstantMessageModule..."); | 105 | m_log.Info("[LOADREGIONSPLUGIN]: InstantMessageModule..."); |
| @@ -111,7 +111,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
| 111 | m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule..."); | 111 | m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule..."); |
| 112 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); | 112 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); |
| 113 | m_log.Info("[LOADREGIONSPLUGIN]: Done."); | 113 | m_log.Info("[LOADREGIONSPLUGIN]: Done."); |
| 114 | 114 | */ | |
| 115 | if (!CheckRegionsForSanity(regionsToLoad)) | 115 | if (!CheckRegionsForSanity(regionsToLoad)) |
| 116 | { | 116 | { |
| 117 | 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"); |