Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.

Also fixed the notification of the message server in standalone -- that server doesn't usually exist.

OpenSim/Framework/NetworkServersInfo.cs

@@ -102,8 +102,7 @@ namespace OpenSim.Framework
                                                                ConfigSettings.DefaultInventoryServerHttpPort.ToString());
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
 
-            MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
+            MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty);
-                                                               "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort);
         }
     }
 }

OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs

@@ -330,6 +330,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void NotifyMessageServerOfStartup(Scene scene)
         {
+            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+                return;
+
             Hashtable xmlrpcdata = new Hashtable();
             xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
             ArrayList SendParams = new ArrayList();
@@ -353,6 +356,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void NotifyMessageServerOfShutdown(Scene scene)
         {
+            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+                return;
+            
             Hashtable xmlrpcdata = new Hashtable();
             xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
             ArrayList SendParams = new ArrayList();
@@ -376,6 +382,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle)
         {
+            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+                return;
+
             Hashtable xmlrpcdata = new Hashtable();
             xmlrpcdata["AgentID"] = agentID.ToString();
             xmlrpcdata["RegionUUID"] = region.ToString();
@@ -401,6 +410,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle)
         {
+            if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
+                return;
+
             Hashtable xmlrpcdata = new Hashtable();
             xmlrpcdata["AgentID"] = agentID.ToString();
             xmlrpcdata["RegionUUID"] = region.ToString();

OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs

@@ -62,8 +62,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
         {
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                (minX - 4) * (int)Constants.RegionSize, (minY - 4) * (int)Constants.RegionSize,
+                (minX - 4) * (int)Constants.RegionSize, (maxX + 4) * (int)Constants.RegionSize, 
-                (maxX + 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize);
+                (minY - 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize);
 
             foreach (GridRegion r in regions)
             {

OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

@@ -371,15 +371,10 @@ namespace OpenSim.Region.Framework.Scenes
             string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort
                   + "/CAPS/" + a.CapsPath + "0000/";
 
-            m_log.DebugFormat("[XXX] CAPS = {0}", capsPath);
-            m_log.DebugFormat("[XXX] ExternalEndPoint = {0}", endPoint.ToString());
-
             string reason = String.Empty;
 
-            //bool regionAccepted = m_commsProvider.InterRegion.InformRegionOfChildAgent(reg.RegionHandle, a);
            
             bool regionAccepted = m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, out reason);
-            m_log.DebugFormat("[XXX] Here 1 {0}", regionAccepted);
 
             if (regionAccepted && newAgent)
             {
@@ -394,7 +389,6 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     #endregion
 
-                    m_log.DebugFormat("[XXX] HERE 2");
                     eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
                     eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
                     m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}",

bin/OpenSim.ini.example

@@ -326,7 +326,7 @@
 
     ; The MessagingServer is a companion of the UserServer. It uses
     ; user_send_key and user_recv_key, too
-    messaging_server_url = "http://127.0.0.1:8006"
+    ;messaging_server_url = "http://127.0.0.1:8006"
 
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set