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

Hyperlinking minimally tested and working.

slimupdates
Diva Canto 2010-01-17 07:54:03 -08:00
parent 6dceb8b4a9
commit bd4d94a4f5
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
View File

@ -40,7 +40,6 @@ using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion; using GridRegion = OpenSim.Services.Interfaces.GridRegion;
using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
using OpenSim.Server.Base; using OpenSim.Server.Base;
using OpenSim.Services.Connectors.Grid;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenMetaverse; using OpenMetaverse;

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

@ -77,15 +77,24 @@ namespace OpenSim.Services.HypergridService
public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason) public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason)
{ {
regionID = m_DefaultGatewayRegion.RegionID; regionID = UUID.Zero;
regionHandle = m_DefaultGatewayRegion.RegionHandle; regionHandle = 0;
imageURL = string.Empty; imageURL = string.Empty;
reason = string.Empty; reason = string.Empty;
m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", regionName);
if (!m_AllowTeleportsToAnyRegion) if (!m_AllowTeleportsToAnyRegion)
{ {
regionID = m_DefaultGatewayRegion.RegionID; try
regionHandle = m_DefaultGatewayRegion.RegionHandle; {
regionID = m_DefaultGatewayRegion.RegionID;
regionHandle = m_DefaultGatewayRegion.RegionHandle;
}
catch
{
reason = "Grid setup problem";
return false;
}
if (regionName != string.Empty) if (regionName != string.Empty)
{ {
reason = "Direct links to regions not allowed"; reason = "Direct links to regions not allowed";

2
OpenSim/Services/HypergridService/HGCommands.cs
View File

@ -69,7 +69,7 @@ namespace OpenSim.Services.HypergridService
MainConsole.Instance.Output("Region Name Region UUID"); MainConsole.Instance.Output("Region Name Region UUID");
MainConsole.Instance.Output("Location URI"); MainConsole.Instance.Output("Location URI");
MainConsole.Instance.Output("Owner ID Flags"); MainConsole.Instance.Output("Owner ID ");
MainConsole.Instance.Output("-------------------------------------------------------------------------------"); MainConsole.Instance.Output("-------------------------------------------------------------------------------");
foreach (GridRegion r in regions) foreach (GridRegion r in regions)
{ {