From 70e36ee2b41da03e41b4f61ab348bc85bd872801 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 29 Dec 2011 12:17:58 -0800
Subject: HG: more adjustments for making HG Simian work. Added server_uri as
 new key on get_agent_home in UAS.

---
 OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs      | 2 +-
 OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
index 8ac89cc..c030bca 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Services.Connectors
                     else
                     {
                         serverURI = serverURI + "xxx";
-                        m_ServerURI = serverURI.Replace("?" + uri.Query, "");
+                        m_ServerURI = serverURI.Replace(uri.Query, "");
                         m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/";
                     }
                 }
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 0c55c2e..57b6d16 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -334,6 +334,9 @@ namespace OpenSim.Services.Connectors.Hypergrid
                         UInt32.TryParse((string)hash["http_port"], out p);
                         region.HttpPort = p;
                     }
+                    if (hash.ContainsKey("server_uri") && hash["server_uri"] != null)
+                        region.ServerURI = (string)hash["server_uri"];
+
                     if (hash["internal_port"] != null)
                     {
                         int p = 0;
-- 
cgit v1.1