From 05cacf6eb6b2276f7130e8b6e2d70f429b7ff230 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Wed, 9 Jul 2014 12:29:06 +0300 Subject: Eliminated common but un-useful log messages --- .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 4 +++- OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 38fa890..731bd28 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -222,6 +222,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid if (region == null) { region = m_GridService.GetRegionByPosition(scopeID, x, y); + /* if (region == null) { m_log.DebugFormat("{0} GetRegionByPosition. Region not found by grid service. Pos=<{1},{2}>", @@ -232,6 +233,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid m_log.DebugFormat("{0} GetRegionByPosition. Requested region {1} from grid service. Pos=<{2},{3}>", LogHeader, region.RegionName, regionX, regionY); } + */ } return region; } @@ -296,4 +298,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid MainConsole.Instance.Output(caps.ToString()); } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 04e02c7..3af8ac4 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -60,7 +60,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap public class WorldMapModule : INonSharedRegionModule, IWorldMapModule { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +#pragma warning disable 414 private static string LogHeader = "[WORLD MAP]"; +#pragma warning restore 414 private static readonly string DEFAULT_WORLD_MAP_EXPORT_PATH = "exportmap.jpg"; private static readonly UUID STOP_UUID = UUID.Random(); @@ -1048,8 +1050,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, (int)Util.RegionToWorldLoc((uint)(minX - 4)), (int)Util.RegionToWorldLoc((uint)(maxX + 4)), (int)Util.RegionToWorldLoc((uint)(minY - 4)), (int)Util.RegionToWorldLoc((uint)(maxY + 4)) ); - m_log.DebugFormat("{0} GetAndSendBlocks. min=<{1},{2}>, max=<{3},{4}>, cntFound={5}", - LogHeader, minX, minY, maxX, maxY, regions.Count); + //m_log.DebugFormat("{0} GetAndSendBlocks. min=<{1},{2}>, max=<{3},{4}>, cntFound={5}", + // LogHeader, minX, minY, maxX, maxY, regions.Count); foreach (GridRegion r in regions) { // Version 2 viewers can handle the larger regions -- cgit v1.1