From 9bc94c502a8e30b0d727f15d0e4b4bb22d163d6c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 27 Apr 2012 11:05:40 -0700
Subject: MapImageService: changed the event at which the map tiles are
 uploaded, because they were being uploaded before the region was registered
 with the grid

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

(limited to 'OpenSim/Server/Handlers')

diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index 8ba188d..4a61969 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -129,10 +129,10 @@ 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);
                     if (r != null)
                     {
-                        System.Net.IPAddress ipAddr = GetCallerIP(httpRequest);
                         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);
@@ -143,7 +143,7 @@ namespace OpenSim.Server.Handlers.MapImage
                     else
                     {
                         m_log.WarnFormat("[MAP IMAGE HANDLER]: IP address {0} may be rogue. Region not found at coordinates {1}-{2}", 
-                            httpRequest.RemoteIPEndPoint.Address, x, y);
+                            ipAddr, x, y);
                         return FailureResult("Region not found at given coordinates");
                     }
                 }
-- 
cgit v1.1