From 6653a30487d76760451467a22849aba725f1e7cf Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Sep 2009 20:58:21 -0700
Subject: Fixed bug in HG that was causing secondlife:// refs to bomb the
 client. Also fiddled a bit more with the initial CAP in the user server.

---
 OpenSim/Grid/UserServer.Modules/UserLoginService.cs          |  5 ++---
 .../Services/Connectors/Grid/HypergridServiceConnector.cs    | 12 +++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 47bbeca..c95e054 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -279,9 +279,8 @@ namespace OpenSim.Grid.UserServer.Modules
                 //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
 
                 // Take off trailing / so that the caps path isn't //CAPS/someUUID
-                if (regionInfo.httpServerURI.EndsWith("/"))
-                    regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1);
-                response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
+                string uri = regionInfo.httpServerURI.Trim(new char[] { '/' });
+                response.SeedCapability = uri + CapsUtil.GetCapsSeedPath(capsPath);
 
 
                 // Notify the target of an incoming user
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
index dd19b01..3d7f112 100644
--- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
@@ -69,7 +69,17 @@ namespace OpenSim.Services.Connectors.Grid
             XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
             string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
             m_log.Debug("[HGrid]: Linking to " + uri);
-            XmlRpcResponse response = request.Send(uri, 10000);
+            XmlRpcResponse response = null;
+            try
+            {
+                response = request.Send(uri, 10000);
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[HGrid]: Exception " + e.Message);
+                return uuid;
+            }
+
             if (response.IsFault)
             {
                 m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString);
-- 
cgit v1.1