aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-09-07 01:25:32 +0100
committerUbitUmarov2019-09-07 01:25:32 +0100
commit304d72565dc30525c4ec4b184ba181cef07d09b3 (patch)
tree182a2f5fda330557cc9a7afc9029c6d21b627a4d
parentgo back to protocol 0.7, until 0.8 changes are ready (diff)
downloadopensim-SC-304d72565dc30525c4ec4b184ba181cef07d09b3.zip
opensim-SC-304d72565dc30525c4ec4b184ba181cef07d09b3.tar.gz
opensim-SC-304d72565dc30525c4ec4b184ba181cef07d09b3.tar.bz2
opensim-SC-304d72565dc30525c4ec4b184ba181cef07d09b3.tar.xz
fix a HG to local grid tp extra check
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index c428d95..74d5abd 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Services.GridService
274 regInfo.EstateOwner = ownerID; 274 regInfo.EstateOwner = ownerID;
275 275
276 // Make sure we're not hyperlinking to regions on this grid! 276 // Make sure we're not hyperlinking to regions on this grid!
277 if (String.IsNullOrWhiteSpace(m_ThisGateKeeperIP)) 277 if (!String.IsNullOrWhiteSpace(m_ThisGateKeeperIP))
278 { 278 {
279 if (m_ThisGatekeeperHost.Equals(regInfo.ExternalHostName, StringComparison.InvariantCultureIgnoreCase) || m_ThisGateKeeperIP.Equals(regInfo.ExternalHostName)) 279 if (m_ThisGatekeeperHost.Equals(regInfo.ExternalHostName, StringComparison.InvariantCultureIgnoreCase) || m_ThisGateKeeperIP.Equals(regInfo.ExternalHostName))
280 { 280 {
@@ -283,8 +283,6 @@ namespace OpenSim.Services.GridService
283 return false; 283 return false;
284 } 284 }
285 } 285 }
286 else
287 m_log.WarnFormat("[HYPERGRID LINKER]: Please set this grid's Gatekeeper's address in [GridService]!");
288 286
289 // Check for free coordinates 287 // Check for free coordinates
290 GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY); 288 GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY);