From 6d2893be67fd725090b69f5f31c0985c3d211135 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 3 Apr 2014 12:47:20 +0300
Subject: When teleporting using Hypergrid, show more informative error
 messages in case of error

---
 OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Server/Handlers/Hypergrid')

diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
index f25e6e0..a89d7f7 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
@@ -94,11 +94,14 @@ namespace OpenSim.Server.Handlers.Hypergrid
             UUID regionID = UUID.Zero;
             UUID.TryParse(regionID_str, out regionID);
 
-            GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID);
+            string message;
+            GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID, out message);
 
             Hashtable hash = new Hashtable();
             if (regInfo == null)
+            {
                 hash["result"] = "false";
+            }
             else
             {
                 hash["result"] = "true";
@@ -112,6 +115,10 @@ namespace OpenSim.Server.Handlers.Hypergrid
                 hash["http_port"] = regInfo.HttpPort.ToString();
                 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
             }
+
+            if (message != null)
+                hash["message"] = message;
+
             XmlRpcResponse response = new XmlRpcResponse();
             response.Value = hash;
             return response;
-- 
cgit v1.1