diff options
| author | Melanie | 2010-01-29 07:20:13 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-29 07:21:06 +0000 |
| commit | a87a247f0548d39a8c39b1d28123d7da8db44598 (patch) | |
| tree | 7f9f77c38a224bc6d4bea7ccced1d4710c8a91b1 /OpenSim/ApplicationPlugins/LoadRegions | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.zip opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.gz opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.bz2 opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.xz | |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
| -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 64863c5..6fd3d30 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"); |