aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/LoadRegions
diff options
context:
space:
mode:
authoropensim mirror account2010-12-03 21:30:05 -0800
committeropensim mirror account2010-12-03 21:30:05 -0800
commitcdd0df9aae4642f65bcdad119c9d92cecd3d9007 (patch)
treed7de55ec34f769e0536f63e81c1465ab6feac328 /OpenSim/ApplicationPlugins/LoadRegions
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-cdd0df9aae4642f65bcdad119c9d92cecd3d9007.zip
opensim-SC_OLD-cdd0df9aae4642f65bcdad119c9d92cecd3d9007.tar.gz
opensim-SC_OLD-cdd0df9aae4642f65bcdad119c9d92cecd3d9007.tar.bz2
opensim-SC_OLD-cdd0df9aae4642f65bcdad119c9d92cecd3d9007.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs4
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))