From cbd7c7b9ecbe7bbe19d5c675322206bc8a977c5f Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 23 Aug 2014 17:27:01 +0200
Subject: Change the map tile system to be multi-grid hosting compatible

---
 OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Server/Handlers/Map/MapAddServerConnector.cs')

diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index d438fc7..7ee347c 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -117,8 +117,11 @@ namespace OpenSim.Server.Handlers.MapImage
                     return FailureResult("Bad request.");
                 }
                 int x = 0, y = 0;
+                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
                 Int32.TryParse(request["X"].ToString(), out x);
                 Int32.TryParse(request["Y"].ToString(), out y);
+                if (request.ContainsKey("SCOPE"))
+                    UUID.TryParse(request["SCOPE"].ToString(), out scopeID);
 
                 m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y);
 
@@ -151,7 +154,7 @@ namespace OpenSim.Server.Handlers.MapImage
                 byte[] data = Convert.FromBase64String(request["DATA"].ToString());
 
                 string reason = string.Empty;
-                bool result = m_MapService.AddMapTile(x, y, data, out reason);
+                bool result = m_MapService.AddMapTile(x, y, data, scopeID, out reason);
 
                 if (result)
                     return SuccessResult();
-- 
cgit v1.1


From 07dead7dcb8b0f2a27a50748e4a460d9669903fc Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 29 Mar 2015 14:25:12 -0700
Subject: varregion: any conversions of use of Constants.RegionSize converted
 into Util.cs routines to convert region coords to and from world coords or
 handles.

---
 OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Server/Handlers/Map/MapAddServerConnector.cs')

diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index 7ee347c..d2fbfa6 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Server.Handlers.MapImage
                 if (m_GridService != null)
                 {
                     System.Net.IPAddress ipAddr = GetCallerIP(httpRequest);
-                    GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, x * (int)Constants.RegionSize, y * (int)Constants.RegionSize);
+                    GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, (int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y));
                     if (r != null)
                     {
                         if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString())
-- 
cgit v1.1


From f31f9002de555d8277a6d4cc008bba4069e7cadc Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 29 Aug 2015 00:32:36 +0100
Subject:  change default scopeID to UUID.Zero

---
 OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Server/Handlers/Map/MapAddServerConnector.cs')

diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index d2fbfa6..ea68114 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -117,7 +117,8 @@ namespace OpenSim.Server.Handlers.MapImage
                     return FailureResult("Bad request.");
                 }
                 int x = 0, y = 0;
-                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+//                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
+                UUID scopeID = UUID.Zero;
                 Int32.TryParse(request["X"].ToString(), out x);
                 Int32.TryParse(request["Y"].ToString(), out y);
                 if (request.ContainsKey("SCOPE"))
-- 
cgit v1.1