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

Conflicts:

	OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
---
 OpenSim/Services/Interfaces/IMapImageService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services/Interfaces')

diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs
index 78daa5f..b8d45dd 100644
--- a/OpenSim/Services/Interfaces/IMapImageService.cs
+++ b/OpenSim/Services/Interfaces/IMapImageService.cs
@@ -34,8 +34,8 @@ namespace OpenSim.Services.Interfaces
     public interface IMapImageService
     {
         //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
-        bool AddMapTile(int x, int y, byte[] imageData, out string reason);
-        bool RemoveMapTile(int x, int y, out string reason);
-        byte[] GetMapTile(string fileName, out string format);
+        bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
+        bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
+        byte[] GetMapTile(string fileName, UUID scopeID, out string format);
     }
 }
-- 
cgit v1.1


From 39e052982baebb60801984965d8865886f20931d Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 23 Aug 2014 19:10:15 +0200
Subject: Fix a null ref that will cause an exception if a grid region doesnt'
 specify a URI.

---
 OpenSim/Services/Interfaces/IGridService.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Services/Interfaces')

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 3f4c958..a3d237f 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -141,6 +141,12 @@ namespace OpenSim.Services.Interfaces
                 }
             }
             set { 
+                if ( value == null)
+                {
+                    m_serverURI = String.Empty;
+                    return;
+                }
+
                 if ( value.EndsWith("/") ) {
                     m_serverURI = value;
                 } else {
-- 
cgit v1.1