From e2b580e56906f76e74abfdac5a11a1c1bbc31252 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 20 Nov 2016 03:51:38 +0000
Subject: HG LinkRegion sends region size also

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 8 +++++++-
 OpenSim/Services/Interfaces/IHypergridServices.cs      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 9643a8b..41e2b40 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -162,10 +162,12 @@ namespace OpenSim.Services.HypergridService
                 exceptions.Add(s.Trim());
         }
 
-        public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason)
+        public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY)
         {
             regionID = UUID.Zero;
             regionHandle = 0;
+            sizeX = (int)Constants.RegionSize;
+            sizeY = (int)Constants.RegionSize;
             externalName = m_ExternalName + ((regionName != string.Empty) ? " " + regionName : "");
             imageURL = string.Empty;
             reason = string.Empty;
@@ -199,6 +201,8 @@ namespace OpenSim.Services.HypergridService
 
             regionID = region.RegionID;
             regionHandle = region.RegionHandle;
+            sizeX = region.RegionSizeX;
+            sizeY = region.RegionSizeY;
 
             string regionimage = "regionImage" + regionID.ToString();
             regionimage = regionimage.Replace("-", "");
@@ -275,6 +279,7 @@ namespace OpenSim.Services.HypergridService
 
                 if (!am.Success)
                 {
+                    reason = "Login failed: client " + curViewer + " is not allowed";
                     m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client {0} is not allowed", curViewer);
                     return false;
                 }
@@ -287,6 +292,7 @@ namespace OpenSim.Services.HypergridService
 
                 if (dm.Success)
                 {
+                    reason = "Login failed: client " + curViewer + " is denied";
                     m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client {0} is denied", curViewer);
                     return false;
                 }
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index 5e012fb..1815e6c 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Services.Interfaces
 {
     public interface IGatekeeperService
     {
-        bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason);
+        bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY);
         
         /// <summary>
         /// Returns the region a Hypergrid visitor should enter.
-- 
cgit v1.1