diff options
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 6 |
2 files changed, 7 insertions, 3 deletions
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 | |||
222 | if (region == null) | 222 | if (region == null) |
223 | { | 223 | { |
224 | region = m_GridService.GetRegionByPosition(scopeID, x, y); | 224 | region = m_GridService.GetRegionByPosition(scopeID, x, y); |
225 | /* | ||
225 | if (region == null) | 226 | if (region == null) |
226 | { | 227 | { |
227 | m_log.DebugFormat("{0} GetRegionByPosition. Region not found by grid service. Pos=<{1},{2}>", | 228 | m_log.DebugFormat("{0} GetRegionByPosition. Region not found by grid service. Pos=<{1},{2}>", |
@@ -232,6 +233,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
232 | m_log.DebugFormat("{0} GetRegionByPosition. Requested region {1} from grid service. Pos=<{2},{3}>", | 233 | m_log.DebugFormat("{0} GetRegionByPosition. Requested region {1} from grid service. Pos=<{2},{3}>", |
233 | LogHeader, region.RegionName, regionX, regionY); | 234 | LogHeader, region.RegionName, regionX, regionY); |
234 | } | 235 | } |
236 | */ | ||
235 | } | 237 | } |
236 | return region; | 238 | return region; |
237 | } | 239 | } |
@@ -296,4 +298,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
296 | MainConsole.Instance.Output(caps.ToString()); | 298 | MainConsole.Instance.Output(caps.ToString()); |
297 | } | 299 | } |
298 | } | 300 | } |
299 | } \ No newline at end of file | 301 | } |
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 | |||
60 | public class WorldMapModule : INonSharedRegionModule, IWorldMapModule | 60 | public class WorldMapModule : INonSharedRegionModule, IWorldMapModule |
61 | { | 61 | { |
62 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 62 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
63 | #pragma warning disable 414 | ||
63 | private static string LogHeader = "[WORLD MAP]"; | 64 | private static string LogHeader = "[WORLD MAP]"; |
65 | #pragma warning restore 414 | ||
64 | 66 | ||
65 | private static readonly string DEFAULT_WORLD_MAP_EXPORT_PATH = "exportmap.jpg"; | 67 | private static readonly string DEFAULT_WORLD_MAP_EXPORT_PATH = "exportmap.jpg"; |
66 | private static readonly UUID STOP_UUID = UUID.Random(); | 68 | private static readonly UUID STOP_UUID = UUID.Random(); |
@@ -1048,8 +1050,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1048 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 1050 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
1049 | (int)Util.RegionToWorldLoc((uint)(minX - 4)), (int)Util.RegionToWorldLoc((uint)(maxX + 4)), | 1051 | (int)Util.RegionToWorldLoc((uint)(minX - 4)), (int)Util.RegionToWorldLoc((uint)(maxX + 4)), |
1050 | (int)Util.RegionToWorldLoc((uint)(minY - 4)), (int)Util.RegionToWorldLoc((uint)(maxY + 4)) ); | 1052 | (int)Util.RegionToWorldLoc((uint)(minY - 4)), (int)Util.RegionToWorldLoc((uint)(maxY + 4)) ); |
1051 | m_log.DebugFormat("{0} GetAndSendBlocks. min=<{1},{2}>, max=<{3},{4}>, cntFound={5}", | 1053 | //m_log.DebugFormat("{0} GetAndSendBlocks. min=<{1},{2}>, max=<{3},{4}>, cntFound={5}", |
1052 | LogHeader, minX, minY, maxX, maxY, regions.Count); | 1054 | // LogHeader, minX, minY, maxX, maxY, regions.Count); |
1053 | foreach (GridRegion r in regions) | 1055 | foreach (GridRegion r in regions) |
1054 | { | 1056 | { |
1055 | // Version 2 viewers can handle the larger regions | 1057 | // Version 2 viewers can handle the larger regions |