From bdbbeaa494133e6b85cd0442fa9e0157986acdf6 Mon Sep 17 00:00:00 2001
From: Robert Adams <misterblue@misterblue.com>
Date: Sat, 15 Feb 2014 16:01:01 -0800
Subject: [PATCH] Non-functional changes of numbers into symbolic references
 and a few comments on what variables really mean.

---
 OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs      | 3 ++-
 .../Neighbour/LocalNeighbourServiceConnector.cs               | 4 ++--
 OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs  | 2 +-
 OpenSim/Region/RegionCombinerModule/RegionData.cs             | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 79a409dad5..5111deb957 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -126,7 +126,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
                     foreach (MapBlockData b in mapBlocks)
                     {
                         b.Name = string.Empty;
-                        b.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's
+                        // Set 'simulator is offline'. We need this because the viewer ignores SimAccess.Unknown (255)
+                        b.Access = (byte)SimAccess.Down;
                     }
 
                     m_log.DebugFormat("[HG MAP]: Resetting {0} blocks", mapBlocks.Count);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index 56d99372e1..bda354fd94 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -125,14 +125,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
         public OpenSim.Services.Interfaces.GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
         {
             uint x, y;
-            Utils.LongToUInts(regionHandle, out x, out y);
+            Util.RegionHandleToRegionLoc(regionHandle, out x, out y);
 
             foreach (Scene s in m_Scenes)
             {
                 if (s.RegionInfo.RegionHandle == regionHandle)
                 {
                     m_log.DebugFormat("[LOCAL NEIGHBOUR SERVICE CONNECTOR]: HelloNeighbour from region {0} to neighbour {1} at {2}-{3}",
-                        thisRegion.RegionName, s.Name, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y) );
+                                                thisRegion.RegionName, s.Name, x, y );
 
                     //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
                     return s.IncomingHelloNeighbour(thisRegion);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 1fb1aba7e2..c35f6b7535 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -214,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // final block, closing the search result
                 MapBlockData data = new MapBlockData();
                 data.Agents = 0;
-                data.Access = 255;
+                data.Access = (byte)SimAccess.NonExistent;
                 data.MapImageId = UUID.Zero;
                 data.Name = "";
                 data.RegionFlags = 0;
diff --git a/OpenSim/Region/RegionCombinerModule/RegionData.cs b/OpenSim/Region/RegionCombinerModule/RegionData.cs
index bd0e398acd..42fca9f4bc 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionData.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionData.cs
@@ -34,6 +34,7 @@ namespace OpenSim.Region.RegionCombinerModule
     {
         public UUID RegionId;
         public Scene RegionScene;
+        // Offset of this region from the base of the root region.
         public Vector3 Offset;
     }
 }
\ No newline at end of file