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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

mb-throttle-test
Diva Canto 2014-11-22 20:14:31 -08:00
parent 0997ce8629 5bc389ff71
commit 7813780eba
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -206,14 +206,19 @@ namespace OpenSim.Services.HypergridService
public GridRegion GetHyperlinkRegion(UUID regionID, UUID agentID, string agentHomeURI, out string message)
{
m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to get hyperlink region {0} for user {1}{2}",
regionID, agentID, (agentHomeURI == null) ? "" : " @ " + agentHomeURI);
message = null;
if (!m_AllowTeleportsToAnyRegion)
{
// Don't even check the given regionID
m_log.DebugFormat(
"[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.",
m_DefaultGatewayRegion.RegionName,
m_DefaultGatewayRegion.RegionID,
m_DefaultGatewayRegion.ServerURI,
agentID,
agentHomeURI == null ? "" : " @ " + agentHomeURI);
message = "Teleporting to the default region.";
return m_DefaultGatewayRegion;
}
@ -222,10 +227,22 @@ namespace OpenSim.Services.HypergridService
if (region == null)
{
m_log.DebugFormat(
"[GATEKEEPER SERVICE]: Could not find region with ID {0} as requested by user {1}{2}. Returning null.",
regionID, agentID, (agentHomeURI == null) ? "" : " @ " + agentHomeURI);
message = "The teleport destination could not be found.";
return null;
}
m_log.DebugFormat(
"[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.",
region.RegionName,
region.RegionID,
region.ServerURI,
agentID,
agentHomeURI == null ? "" : " @ " + agentHomeURI);
return region;
}