Merge branch 'avination' into ubitwork

13 files changed, 150 insertions, 136 deletions

diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index a19b599..6b93cd9 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -321,8 +321,7 @@ namespace OpenSim.Server.Handlers.Authentication
         private byte[] ResultToBytes(Dictionary<string, object> result)
         {
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
     }
 }
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index dfed761..18cef15 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -191,6 +191,8 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
 
         #endregion HTML
 
+        public string Name { get { return "OpenId"; } }
+        public string Description { get { return null; } }
         public string ContentType { get { return m_contentType; } }
         public string HttpMethod { get { return m_httpMethod; } }
         public string Path { get { return m_path; } }
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
index 3ee405c..393584e 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -121,8 +121,7 @@ namespace OpenSim.Server.Handlers.Avatar
 
                 string xmlString = ServerUtils.BuildXmlResponse(result);
 
-                UTF8Encoding encoding = new UTF8Encoding();
-                return encoding.GetBytes(xmlString);
+                return Util.UTF8NoBomEncoding.GetBytes(xmlString);
             }
 
             return FailureResult();
diff --git a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
index 59420f5..47a8558 100644
--- a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
@@ -95,7 +95,8 @@ namespace OpenSim.Server.Handlers.Friends
                         return DeleteFriendString(request);
 
                 }
-                m_log.DebugFormat("[FRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method);
+
+                m_log.DebugFormat("[FRIENDS HANDLER]: unknown method request {0}", method);
             }
             catch (Exception e)
             {
@@ -103,7 +104,6 @@ namespace OpenSim.Server.Handlers.Friends
             }
 
             return FailureResult();
-
         }
 
         #region Method-specific handlers
@@ -152,10 +152,9 @@ namespace OpenSim.Server.Handlers.Friends
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            //m_log.DebugFormat("[FRIENDS HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
 
+            //m_log.DebugFormat("[FRIENDS HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] StoreFriend(Dictionary<string, object> request)
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index bebf482..ef5f33e 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Server.Handlers.Grid
                         return GetRegionFlags(request);
                 }
                 
-                m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method);
+                m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method);
             }
             catch (Exception e)
             {
@@ -226,10 +226,9 @@ namespace OpenSim.Server.Handlers.Grid
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
 
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetRegionByUUID(Dictionary<string, object> request)
@@ -256,9 +255,9 @@ namespace OpenSim.Server.Handlers.Grid
                 result["result"] = rinfo.ToKeyValuePairs();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetRegionByPosition(Dictionary<string, object> request)
@@ -289,9 +288,9 @@ namespace OpenSim.Server.Handlers.Grid
                 result["result"] = rinfo.ToKeyValuePairs();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetRegionByName(Dictionary<string, object> request)
@@ -318,9 +317,9 @@ namespace OpenSim.Server.Handlers.Grid
                 result["result"] = rinfo.ToKeyValuePairs();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetRegionsByName(Dictionary<string, object> request)
@@ -361,9 +360,9 @@ namespace OpenSim.Server.Handlers.Grid
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetRegionRange(Dictionary<string, object> request)
@@ -410,9 +409,9 @@ namespace OpenSim.Server.Handlers.Grid
                 }
             }
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetDefaultRegions(Dictionary<string, object> request)
@@ -440,9 +439,9 @@ namespace OpenSim.Server.Handlers.Grid
                 }
             }
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetFallbackRegions(Dictionary<string, object> request)
@@ -481,9 +480,9 @@ namespace OpenSim.Server.Handlers.Grid
                 }
             }
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetHyperlinks(Dictionary<string, object> request)
@@ -511,9 +510,9 @@ namespace OpenSim.Server.Handlers.Grid
                 }
             }
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetRegionFlags(Dictionary<string, object> request)
@@ -537,12 +536,11 @@ namespace OpenSim.Server.Handlers.Grid
             result["result"] = flags.ToString();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+            
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
-
         #endregion
 
         #region Misc
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index bf21255..687cf8d 100644
--- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
@@ -117,10 +117,9 @@ namespace OpenSim.Server.Handlers.GridUser
             result["result"] = guinfo.ToKeyValuePairs();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
 
+            //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] LoggedOut(Dictionary<string, object> request)
@@ -189,10 +188,9 @@ namespace OpenSim.Server.Handlers.GridUser
             result["result"] = guinfo.ToKeyValuePairs();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
 
+            //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetGridUserInfos(Dictionary<string, object> request)
@@ -231,8 +229,7 @@ namespace OpenSim.Server.Handlers.GridUser
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         private bool UnpackArgs(Dictionary<string, object> request, out string user, out UUID region, out Vector3 position, out Vector3 lookAt)
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index 8ef03e7..0aa2729 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -122,7 +122,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
                         return GrantRights(request);
                         */
                 }
-                m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method);
+                
+                m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method);
             }
             catch (Exception e)
             {
@@ -278,13 +279,11 @@ namespace OpenSim.Server.Handlers.Hypergrid
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
 
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
-
         #endregion
 
         #region Misc
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index cb9b65d..64127c2 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -217,9 +217,9 @@ namespace OpenSim.Server.Handlers.Asset
                 result["RESULT"] = "False";
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetInventorySkeleton(Dictionary<string,object> request)
@@ -245,9 +245,9 @@ namespace OpenSim.Server.Handlers.Asset
             result["FOLDERS"] = sfolders;
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetUserInventory(Dictionary<string, object> request)
@@ -284,9 +284,9 @@ namespace OpenSim.Server.Handlers.Asset
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetRootFolder(Dictionary<string,object> request)
@@ -300,9 +300,9 @@ namespace OpenSim.Server.Handlers.Asset
                 result["folder"] = EncodeFolder(rfolder);
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetFolderForType(Dictionary<string,object> request)
@@ -317,9 +317,9 @@ namespace OpenSim.Server.Handlers.Asset
                 result["folder"] = EncodeFolder(folder);
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetFolderContent(Dictionary<string,object> request)
@@ -358,9 +358,9 @@ namespace OpenSim.Server.Handlers.Asset
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetFolderItems(Dictionary<string,object> request)
@@ -386,9 +386,9 @@ namespace OpenSim.Server.Handlers.Asset
             result["ITEMS"] = sitems;
             
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleAddFolder(Dictionary<string,object> request)
@@ -550,9 +550,9 @@ namespace OpenSim.Server.Handlers.Asset
                 result["item"] = EncodeItem(item);
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetFolder(Dictionary<string,object> request)
@@ -567,9 +567,9 @@ namespace OpenSim.Server.Handlers.Asset
                 result["folder"] = EncodeFolder(folder);
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetActiveGestures(Dictionary<string,object> request)
@@ -592,9 +592,9 @@ namespace OpenSim.Server.Handlers.Asset
             result["ITEMS"] = items;
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetAssetPermissions(Dictionary<string,object> request)
@@ -609,12 +609,11 @@ namespace OpenSim.Server.Handlers.Asset
 
             result["RESULT"] = perms.ToString();
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
-
         private Dictionary<string, object> EncodeFolder(InventoryFolderBase f)
         {
             Dictionary<string, object> ret = new Dictionary<string, object>();
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index 75dd711..4a61969 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -33,17 +33,24 @@ using System.Xml;
 
 using Nini.Config;
 using log4net;
+using OpenMetaverse;
 
+using OpenSim.Framework;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
 namespace OpenSim.Server.Handlers.MapImage
 {
     public class MapAddServiceConnector : ServiceConnector
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private IMapImageService m_MapService;
+        private IGridService m_GridService;
         private string m_ConfigName = "MapImageService";
 
         public MapAddServiceConnector(IConfigSource config, IHttpServer server, string configName) :
@@ -53,16 +60,27 @@ namespace OpenSim.Server.Handlers.MapImage
             if (serverConfig == null)
                 throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
-            string gridService = serverConfig.GetString("LocalServiceModule",
+            string mapService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
-            if (gridService == String.Empty)
+            if (mapService == String.Empty)
                 throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
-            m_MapService = ServerUtils.LoadPlugin<IMapImageService>(gridService, args);
+            m_MapService = ServerUtils.LoadPlugin<IMapImageService>(mapService, args);
+
+            string gridService = serverConfig.GetString("GridService", String.Empty);
+            if (gridService != string.Empty)
+                m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
+
+            if (m_GridService != null)
+                m_log.InfoFormat("[MAP IMAGE HANDLER]: GridService check is ON");
+            else
+                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));
 
-            server.AddStreamHandler(new MapServerPostHandler(m_MapService));
         }
     }
 
@@ -70,11 +88,15 @@ namespace OpenSim.Server.Handlers.MapImage
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private IMapImageService m_MapService;
+        private IGridService m_GridService;
+        bool m_Proxy;
 
-        public MapServerPostHandler(IMapImageService service) :
+        public MapServerPostHandler(IMapImageService service, IGridService grid, bool proxy) :
             base("POST", "/map")
         {
             m_MapService = service;
+            m_GridService = grid;
+            m_Proxy = proxy;
         }
 
         public override byte[] Handle(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
@@ -105,6 +127,27 @@ namespace OpenSim.Server.Handlers.MapImage
 //                if (request.ContainsKey("TYPE"))
 //                    type = request["TYPE"].ToString();
 
+                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);
+                    if (r != null)
+                    {
+                        if (r.ExternalEndPoint.Address.ToString() != ipAddr.ToString())
+                        {
+                            m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be trying to impersonate region in IP {1}", ipAddr, r.ExternalEndPoint.Address);
+                            return FailureResult("IP address of caller does not match IP address of registered region");
+                        }
+
+                    }
+                    else
+                    {
+                        m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", 
+                            ipAddr, x, y);
+                        return FailureResult("Region not found at given coordinates");
+                    }
+                }
+
                 byte[] data = Convert.FromBase64String(request["DATA"].ToString());
 
                 string reason = string.Empty;
@@ -183,5 +226,31 @@ namespace OpenSim.Server.Handlers.MapImage
 
             return ms.ToArray();
         }
+
+        private System.Net.IPAddress GetCallerIP(IOSHttpRequest request)
+        {
+            if (!m_Proxy)
+                return request.RemoteIPEndPoint.Address;
+
+            // We're behind a proxy
+            string xff = "X-Forwarded-For";
+            string xffValue = request.Headers[xff.ToLower()];
+            if (xffValue == null || (xffValue != null && xffValue == string.Empty))
+                xffValue = request.Headers[xff];
+
+            if (xffValue == null || (xffValue != null && xffValue == string.Empty))
+            {
+                m_log.WarnFormat("[MAP IMAGE HANDLER]: No XFF header");
+                return request.RemoteIPEndPoint.Address;
+            }
+
+            System.Net.IPEndPoint ep = Util.GetClientIPFromXFF(xffValue);
+            if (ep != null)
+                return ep.Address;
+
+            // Oops
+            return request.RemoteIPEndPoint.Address;
+        }
+
     }
 }
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 6b6a552..2d67c6d 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -199,9 +199,9 @@ namespace OpenSim.Server.Handlers.Presence
                 result["result"] = pinfo.ToKeyValuePairs();
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] GetAgents(Dictionary<string, object> request)
@@ -240,12 +240,11 @@ namespace OpenSim.Server.Handlers.Presence
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+            
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
-        
         private byte[] SuccessResult()
         {
             XmlDocument doc = new XmlDocument();
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 8f6fa52..d772c39 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -149,13 +149,16 @@ namespace OpenSim.Server.Handlers.Simulation
 
             responsedata["int_response_code"] = HttpStatusCode.OK;
 
-            OSDMap resp = new OSDMap(2);
+            OSDMap resp = new OSDMap(3);
 
             resp["success"] = OSD.FromBoolean(result);
             resp["reason"] = OSD.FromString(reason);
             resp["version"] = OSD.FromString(version);
 
-            responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp);
+            // We must preserve defaults here, otherwise a false "success" will not be put into the JSON map!
+            responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true);
+
+//            Console.WriteLine("str_response_string [{0}]", responsedata["str_response_string"]);
         }
 
         protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID)
@@ -569,7 +572,7 @@ namespace OpenSim.Server.Handlers.Simulation
                 AgentData agent = new AgentData();
                 try
                 {
-                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionHandle));
+                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
                 }
                 catch (Exception ex)
                 {
@@ -589,7 +592,7 @@ namespace OpenSim.Server.Handlers.Simulation
                 AgentPosition agent = new AgentPosition();
                 try
                 {
-                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionHandle));
+                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
                 }
                 catch (Exception ex)
                 {
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index f0d8f69..dbb1a15 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -93,11 +93,6 @@ namespace OpenSim.Server.Handlers.Simulation
                     DoObjectPost(request, responsedata, regionID);
                     return responsedata;
                 }
-                else if (method.Equals("PUT"))
-                {
-                    DoObjectPut(request, responsedata, regionID);
-                    return responsedata;
-                }
                 //else if (method.Equals("DELETE"))
                 //{
                 //    DoObjectDelete(request, responsedata, agentID, action, regionHandle);
@@ -161,7 +156,7 @@ namespace OpenSim.Server.Handlers.Simulation
             if (args.ContainsKey("extra") && args["extra"] != null)
                 extraStr = args["extra"].AsString();
 
-            IScene s = m_SimulationService.GetScene(destination.RegionHandle);
+            IScene s = m_SimulationService.GetScene(destination.RegionID);
             ISceneObject sog = null;
             try
             {
@@ -219,48 +214,5 @@ namespace OpenSim.Server.Handlers.Simulation
         {
             return m_SimulationService.CreateObject(destination, newPosition, sog, false);
         }
-
-        protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, UUID regionID)
-        {
-            OSDMap args = Utils.GetOSDMap((string)request["body"]);
-            if (args == null)
-            {
-                responsedata["int_response_code"] = 400;
-                responsedata["str_response_string"] = "false";
-                return;
-            }
-
-            // retrieve the input arguments
-            int x = 0, y = 0;
-            UUID uuid = UUID.Zero;
-            string regionname = string.Empty;
-            if (args.ContainsKey("destination_x") && args["destination_x"] != null)
-                Int32.TryParse(args["destination_x"].AsString(), out x);
-            if (args.ContainsKey("destination_y") && args["destination_y"] != null)
-                Int32.TryParse(args["destination_y"].AsString(), out y);
-            if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
-                UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
-            if (args.ContainsKey("destination_name") && args["destination_name"] != null)
-                regionname = args["destination_name"].ToString();
-
-            GridRegion destination = new GridRegion();
-            destination.RegionID = uuid;
-            destination.RegionLocX = x;
-            destination.RegionLocY = y;
-            destination.RegionName = regionname;
-
-            UUID userID = UUID.Zero, itemID = UUID.Zero;
-            if (args.ContainsKey("userid") && args["userid"] != null)
-                userID = args["userid"].AsUUID();
-            if (args.ContainsKey("itemid") && args["itemid"] != null)
-                itemID = args["itemid"].AsUUID();
-
-            // This is the meaning of PUT object
-            bool result = m_SimulationService.CreateObject(destination, userID, itemID);
-
-            responsedata["int_response_code"] = 200;
-            responsedata["str_response_string"] = result.ToString();
-        }
-
     }
 }
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index 3fd69ae..72551ef 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -195,9 +195,9 @@ namespace OpenSim.Server.Handlers.UserAccounts
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
+
             //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
         byte[] StoreAccount(Dictionary<string, object> request)
@@ -353,8 +353,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
         private byte[] ResultToBytes(Dictionary<string, object> result)
         {
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
     }
-}
+}
\ No newline at end of file