OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminated common but un-useful log messages

bullet-2.82
Oren Hurvitz 2014-07-09 12:29:06 +03:00
parent f94b3bbe0f
commit 05cacf6eb6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
View File

@ -222,6 +222,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
if (region == null) if (region == null)
{ {
region = m_GridService.GetRegionByPosition(scopeID, x, y); region = m_GridService.GetRegionByPosition(scopeID, x, y);
/*
if (region == null) if (region == null)
{ {
m_log.DebugFormat("{0} GetRegionByPosition. Region not found by grid service. Pos=<{1},{2}>", 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}>", m_log.DebugFormat("{0} GetRegionByPosition. Requested region {1} from grid service. Pos=<{2},{3}>",
LogHeader, region.RegionName, regionX, regionY); LogHeader, region.RegionName, regionX, regionY);
} }
*/
} }
return region; return region;
} }
@ -296,4 +298,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
MainConsole.Instance.Output(caps.ToString()); MainConsole.Instance.Output(caps.ToString());
} }
} }
} }

6
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -60,7 +60,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
public class WorldMapModule : INonSharedRegionModule, IWorldMapModule public class WorldMapModule : INonSharedRegionModule, IWorldMapModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#pragma warning disable 414
private static string LogHeader = "[WORLD MAP]"; private static string LogHeader = "[WORLD MAP]";
#pragma warning restore 414
private static readonly string DEFAULT_WORLD_MAP_EXPORT_PATH = "exportmap.jpg"; private static readonly string DEFAULT_WORLD_MAP_EXPORT_PATH = "exportmap.jpg";
private static readonly UUID STOP_UUID = UUID.Random(); private static readonly UUID STOP_UUID = UUID.Random();
@ -1048,8 +1050,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, List<GridRegion> 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)(minX - 4)), (int)Util.RegionToWorldLoc((uint)(maxX + 4)),
(int)Util.RegionToWorldLoc((uint)(minY - 4)), (int)Util.RegionToWorldLoc((uint)(maxY + 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}", //m_log.DebugFormat("{0} GetAndSendBlocks. min=<{1},{2}>, max=<{3},{4}>, cntFound={5}",
LogHeader, minX, minY, maxX, maxY, regions.Count); // LogHeader, minX, minY, maxX, maxY, regions.Count);
foreach (GridRegion r in regions) foreach (GridRegion r in regions)
{ {
// Version 2 viewers can handle the larger regions // Version 2 viewers can handle the larger regions