OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a HG to local grid tp extra check

0.9.1.0-post-fixes
UbitUmarov 2019-09-07 01:25:32 +01:00
parent f835960d17
commit 304d72565d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Services/GridService/HypergridLinker.cs
View File

@ -274,7 +274,7 @@ namespace OpenSim.Services.GridService
regInfo.EstateOwner = ownerID; regInfo.EstateOwner = ownerID;
// Make sure we're not hyperlinking to regions on this grid! // Make sure we're not hyperlinking to regions on this grid!
if (String.IsNullOrWhiteSpace(m_ThisGateKeeperIP)) if (!String.IsNullOrWhiteSpace(m_ThisGateKeeperIP))
{ {
if (m_ThisGatekeeperHost.Equals(regInfo.ExternalHostName, StringComparison.InvariantCultureIgnoreCase) || m_ThisGateKeeperIP.Equals(regInfo.ExternalHostName)) if (m_ThisGatekeeperHost.Equals(regInfo.ExternalHostName, StringComparison.InvariantCultureIgnoreCase) || m_ThisGateKeeperIP.Equals(regInfo.ExternalHostName))
{ {
@ -283,8 +283,6 @@ namespace OpenSim.Services.GridService
return false; return false;
} }
} }
else
m_log.WarnFormat("[HYPERGRID LINKER]: Please set this grid's Gatekeeper's address in [GridService]!");
// Check for free coordinates // Check for free coordinates
GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY); GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY);