Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 81 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 57924b7..6a61da6 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -28,17 +28,18 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
 using System.Net;
 using System.Reflection;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
-using OpenSim.Server.Base;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
@@ -62,7 +63,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         #region ISharedRegionModule
 
         public Type ReplaceableInterface { get { return null; } }
-        public void RegionLoaded(Scene scene) { }
+        public void RegionLoaded(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { UploadMapTile(scene); } }
         public void PostInitialise() { }
         public void Close() { }
 
@@ -358,6 +359,83 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         #endregion IGridService
 
+        private void UploadMapTile(IScene scene)
+        {
+            string errorMessage = null;
+
+            // Create a PNG map tile and upload it to the AddMapTile API
+            byte[] pngData = Utils.EmptyBytes;
+            IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>();
+            if (tileGenerator == null)
+            {
+                m_log.Warn("[SIMIAN GRID CONNECTOR]: Cannot upload PNG map tile without an IMapImageGenerator");
+                return;
+            }
+
+            using (Image mapTile = tileGenerator.CreateMapTile("defaultstripe.png"))
+            {
+                using (MemoryStream stream = new MemoryStream())
+                {
+                    mapTile.Save(stream, ImageFormat.Png);
+                    pngData = stream.ToArray();
+                }
+            }
+
+            List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
+            {
+                new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()),
+                new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()),
+                new MultipartForm.File("Tile", "tile.png", "image/png", pngData)
+            };
+
+            // Make the remote storage request
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
+
+                HttpWebResponse response = MultipartForm.Post(request, postParameters);
+                using (Stream responseStream = response.GetResponseStream())
+                {
+                    string responseStr = null;
+
+                    try
+                    {
+                        responseStr = responseStream.GetStreamString();
+                        OSD responseOSD = OSDParser.Deserialize(responseStr);
+                        if (responseOSD.Type == OSDType.Map)
+                        {
+                            OSDMap responseMap = (OSDMap)responseOSD;
+                            if (responseMap["Success"].AsBoolean())
+                                m_log.Info("[SIMIAN GRID CONNECTOR]: Uploaded " + pngData.Length + " byte PNG map tile to AddMapTile");
+                            else
+                                errorMessage = "Upload failed: " + responseMap["Message"].AsString();
+                        }
+                        else
+                        {
+                            errorMessage = "Response format was invalid:\n" + responseStr;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        if (!String.IsNullOrEmpty(responseStr))
+                            errorMessage = "Failed to parse the response:\n" + responseStr;
+                        else
+                            errorMessage = "Failed to retrieve the response: " + ex.Message;
+                    }
+                }
+            }
+            catch (WebException ex)
+            {
+                errorMessage = ex.Message;
+            }
+
+            if (!String.IsNullOrEmpty(errorMessage))
+            {
+                m_log.WarnFormat("[SIMIAN GRID CONNECTOR]: Failed to store {0} byte PNG map tile for {1}: {2}",
+                    pngData.Length, scene.RegionInfo.RegionName, errorMessage);
+            }
+        }
+
         private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled)
         {
             NameValueCollection requestArgs = new NameValueCollection