diff options
| author | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
| commit | 45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a (patch) | |
| tree | 0351fb2c756a46d522fe41798c3969e020a3258d /OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |
| parent | Merge branch 'master-core' into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.zip opensim-SC-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.gz opensim-SC-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.bz2 opensim-SC-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')
| -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 b16f46c..7ef0f5f 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
| @@ -106,8 +106,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
| 106 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule()); | 106 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule()); |
| 107 | m_log.Info("[LOADREGIONSPLUGIN]: XMLRPCModule..."); | 107 | m_log.Info("[LOADREGIONSPLUGIN]: XMLRPCModule..."); |
| 108 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule()); | 108 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule()); |
| 109 | m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule..."); | 109 | // m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule..."); |
| 110 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); | 110 | // m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); |
| 111 | m_log.Info("[LOADREGIONSPLUGIN]: Done."); | 111 | m_log.Info("[LOADREGIONSPLUGIN]: Done."); |
| 112 | 112 | ||
| 113 | if (!CheckRegionsForSanity(regionsToLoad)) | 113 | if (!CheckRegionsForSanity(regionsToLoad)) |