diff options
author | Diva Canto | 2011-12-29 12:17:58 -0800 |
---|---|---|
committer | Diva Canto | 2011-12-29 12:17:58 -0800 |
commit | 70e36ee2b41da03e41b4f61ab348bc85bd872801 (patch) | |
tree | 73cffef414185d1935a9995330b0ae0beae90c0b /OpenSim/Services/Connectors | |
parent | Add Copy task to Prebuild.exe (vsxxxx targets) (diff) | |
download | opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.zip opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.tar.gz opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.tar.bz2 opensim-SC_OLD-70e36ee2b41da03e41b4f61ab348bc85bd872801.tar.xz |
HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 3 |
2 files changed, 4 insertions, 1 deletions
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 | |||
62 | else | 62 | else |
63 | { | 63 | { |
64 | serverURI = serverURI + "xxx"; | 64 | serverURI = serverURI + "xxx"; |
65 | m_ServerURI = serverURI.Replace("?" + uri.Query, ""); | 65 | m_ServerURI = serverURI.Replace(uri.Query, ""); |
66 | m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/"; | 66 | m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/"; |
67 | } | 67 | } |
68 | } | 68 | } |
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 | |||
334 | UInt32.TryParse((string)hash["http_port"], out p); | 334 | UInt32.TryParse((string)hash["http_port"], out p); |
335 | region.HttpPort = p; | 335 | region.HttpPort = p; |
336 | } | 336 | } |
337 | if (hash.ContainsKey("server_uri") && hash["server_uri"] != null) | ||
338 | region.ServerURI = (string)hash["server_uri"]; | ||
339 | |||
337 | if (hash["internal_port"] != null) | 340 | if (hash["internal_port"] != null) |
338 | { | 341 | { |
339 | int p = 0; | 342 | int p = 0; |