Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2010-10-30 00:56:42 +0100
committer: Melanie 2010-10-30 00:56:42 +0100
commit: 7503c4ad6148d0483b0465911ee94bb6ccc9cb0a (patch)
tree: afb5fb0be6c41e4f47d5177903443e753b93e904 /OpenSim/Region/CoreModules/World
parent: READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. (diff)
parent: Change level of some logging messages, turning some info into arguably more a... (diff)
download: opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.zip
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.gz
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.bz2
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index a182eea..3e478b0 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            if (threadrunning) return;
            threadrunning = true;
-            m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
+//            m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
            Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true);
        }
author	Melanie	2010-10-30 00:56:42 +0100
committer	Melanie	2010-10-30 00:56:42 +0100
commit	7503c4ad6148d0483b0465911ee94bb6ccc9cb0a (patch)
tree	afb5fb0be6c41e4f47d5177903443e753b93e904 /OpenSim/Region/CoreModules/World
parent	READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. (diff)
parent	Change level of some logging messages, turning some info into arguably more a... (diff)
download	opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.zip opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.gz opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.bz2 opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a182eea..3e478b0 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
324	if (threadrunning) return;	324	if (threadrunning) return;
325	threadrunning = true;	325	threadrunning = true;
326		326
327	m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");	327	// m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
328		328
329	Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true);	329	Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true);
330	}	330	}