1 files changed, 21 insertions, 16 deletions

diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index ea68114..083a628 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -38,6 +38,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 
@@ -79,7 +80,8 @@ namespace OpenSim.Server.Handlers.MapImage
                 m_log.InfoFormat("[MAP IMAGE HANDLER]: GridService check is OFF");
 
             bool proxy = serverConfig.GetBoolean("HasProxy", false);
-            server.AddStreamHandler(new MapServerPostHandler(m_MapService, m_GridService, proxy));
+            IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName);
+            server.AddStreamHandler(new MapServerPostHandler(m_MapService, m_GridService, proxy, auth));
 
         }
     }
@@ -91,8 +93,8 @@ namespace OpenSim.Server.Handlers.MapImage
         private IGridService m_GridService;
         bool m_Proxy;
 
-        public MapServerPostHandler(IMapImageService service, IGridService grid, bool proxy) :
-            base("POST", "/map")
+        public MapServerPostHandler(IMapImageService service, IGridService grid, bool proxy, IServiceAuth auth) :
+            base("POST", "/map", auth)
         {
             m_MapService = service;
             m_GridService = grid;
@@ -116,6 +118,11 @@ namespace OpenSim.Server.Handlers.MapImage
                     httpResponse.StatusCode = (int)OSHttpStatusCode.ClientErrorBadRequest;
                     return FailureResult("Bad request.");
                 }
+<<<<<<< HEAD
+                uint x = 0, y = 0;
+                UInt32.TryParse(request["X"].ToString(), out x);
+                UInt32.TryParse(request["Y"].ToString(), out y);
+=======
                 int x = 0, y = 0;
 //                UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
                 UUID scopeID = UUID.Zero;
@@ -123,6 +130,7 @@ namespace OpenSim.Server.Handlers.MapImage
                 Int32.TryParse(request["Y"].ToString(), out y);
                 if (request.ContainsKey("SCOPE"))
                     UUID.TryParse(request["SCOPE"].ToString(), out scopeID);
+>>>>>>> avn/ubitvar
 
                 m_log.DebugFormat("[MAP ADD SERVER CONNECTOR]: Received map data for region at {0}-{1}", x, y);
 
@@ -134,7 +142,11 @@ namespace OpenSim.Server.Handlers.MapImage
                 if (m_GridService != null)
                 {
                     System.Net.IPAddress ipAddr = GetCallerIP(httpRequest);
+<<<<<<< HEAD
+                    GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, (int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y));
+=======
                     GridRegion r = m_GridService.GetRegionByPosition(UUID.Zero, (int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y));
+>>>>>>> avn/ubitvar
                     if (r != null)
                     {
                         if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString())
@@ -155,7 +167,11 @@ namespace OpenSim.Server.Handlers.MapImage
                 byte[] data = Convert.FromBase64String(request["DATA"].ToString());
 
                 string reason = string.Empty;
+<<<<<<< HEAD
+                bool result = m_MapService.AddMapTile((int)x, (int)y, data, out reason);
+=======
                 bool result = m_MapService.AddMapTile(x, y, data, scopeID, out reason);
+>>>>>>> avn/ubitvar
 
                 if (result)
                     return SuccessResult();
@@ -190,7 +206,7 @@ namespace OpenSim.Server.Handlers.MapImage
 
             rootElement.AppendChild(result);
 
-            return DocToBytes(doc);
+            return Util.DocToBytes(doc);
         }
 
         private byte[] FailureResult(string msg)
@@ -217,18 +233,7 @@ namespace OpenSim.Server.Handlers.MapImage
 
             rootElement.AppendChild(message);
 
-            return DocToBytes(doc);
-        }
-
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
-
-            return ms.ToArray();
+            return Util.DocToBytes(doc);
         }
 
         private System.Net.IPAddress GetCallerIP(IOSHttpRequest request)