Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

author: sacha 2010-12-04 21:50:48 +0000
committer: sacha 2010-12-04 21:50:48 +0000
commit: 835103af82eb0b8c0916bbbe3c5a981e92e5a47e (patch)
tree: 154f02cada4bf550b7278aef31c42f9ba8da3ef5 /OpenSim/ApplicationPlugins/LoadRegions
parent: add more detail to the log in case of FORM Timeout (diff)
parent: Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims (diff)
download: opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.zip
opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.gz
opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.bz2
opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.xz
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
            m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
            m_log.Info("[LOADREGIONSPLUGIN]: XMLRPCModule...");
            m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
-            m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
+//            m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
-            m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
+//            m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
            m_log.Info("[LOADREGIONSPLUGIN]: Done.");
            if (!CheckRegionsForSanity(regionsToLoad))
author	sacha	2010-12-04 21:50:48 +0000
committer	sacha	2010-12-04 21:50:48 +0000
commit	835103af82eb0b8c0916bbbe3c5a981e92e5a47e (patch)
tree	154f02cada4bf550b7278aef31c42f9ba8da3ef5 /OpenSim/ApplicationPlugins/LoadRegions
parent	add more detail to the log in case of FORM Timeout (diff)
parent	Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims (diff)
download	opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.zip opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.gz opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.bz2 opensim-SC-835103af82eb0b8c0916bbbe3c5a981e92e5a47e.tar.xz

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))