From 2824bbc47b30ab6fb9a12bce3201bb5b79b20bd5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 24 Sep 2009 05:48:35 -0700
Subject: Changed name of the hyperlink XMLRPC method to linkk-region, so that
 it doesn't conflict with the existing one.

---
 OpenSim/Services/GridService/GridService.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/GridService/GridService.cs')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 1b297dc..01ffa1d 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -71,7 +71,9 @@ namespace OpenSim.Services.GridService
                 m_log.WarnFormat("[GRID SERVICE]: Region {0} already registered in scope {1}.", regionInfos.RegionID, scopeID);
                 return false;
             }
-            if (m_Database.Get((int)regionInfos.RegionLocX, (int)regionInfos.RegionLocY, scopeID) != null)
+            // This needs better sanity testing. What if regionInfo is registering in
+            // overlapping coords?
+            if (m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID) != null)
             {
                 m_log.WarnFormat("[GRID SERVICE]: Region {0} tried to register in coordinates {1}, {2} which are already in use in scope {3}.", 
                     regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
-- 
cgit v1.1