diff options
author | UbitUmarov | 2016-12-15 23:48:25 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-15 23:48:25 +0000 |
commit | c0a23d36dfa28a3204b31883e1e7bc76b249c8fb (patch) | |
tree | 092a5900e8135e97dbc37ef0cfd0aed0e70f01d6 /OpenSim/Services/GridService/HypergridLinker.cs | |
parent | set pbs shape acording to mesh number of (material) faces (diff) | |
download | opensim-SC_OLD-c0a23d36dfa28a3204b31883e1e7bc76b249c8fb.zip opensim-SC_OLD-c0a23d36dfa28a3204b31883e1e7bc76b249c8fb.tar.gz opensim-SC_OLD-c0a23d36dfa28a3204b31883e1e7bc76b249c8fb.tar.bz2 opensim-SC_OLD-c0a23d36dfa28a3204b31883e1e7bc76b249c8fb.tar.xz |
GetRegionsByName and GetHypergridRegionByName: detect that provided url is for local grid, and make it a local by region name local search
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index ceb2c6e..185f2ff 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -137,6 +137,12 @@ namespace OpenSim.Services.GridService | |||
137 | m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper); | 137 | m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper); |
138 | } | 138 | } |
139 | 139 | ||
140 | m_ThisGatekeeper = m_ThisGatekeeperURI.AbsoluteUri; | ||
141 | if(m_ThisGatekeeperURI.Port == 80) | ||
142 | m_ThisGatekeeper = m_ThisGatekeeper.Trim(new char[] { '/', ' ' }) +":80/"; | ||
143 | else if(m_ThisGatekeeperURI.Port == 443) | ||
144 | m_ThisGatekeeper = m_ThisGatekeeper.Trim(new char[] { '/', ' ' }) +":443/"; | ||
145 | |||
140 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); | 146 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); |
141 | 147 | ||
142 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); | 148 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); |
@@ -302,6 +308,10 @@ namespace OpenSim.Services.GridService | |||
302 | serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/"; | 308 | serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/"; |
303 | else if(uri.Port == 443) | 309 | else if(uri.Port == 443) |
304 | serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/"; | 310 | serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/"; |
311 | |||
312 | if(serverURI == m_ThisGatekeeper) | ||
313 | serverURI = ""; // local grid, look for region name only | ||
314 | |||
305 | return true; | 315 | return true; |
306 | } | 316 | } |
307 | 317 | ||