diff options
| author | Diva Canto | 2010-01-17 07:54:03 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-17 07:54:03 -0800 |
| commit | bd4d94a4f5490708773db7e211c0c96999bb84c2 (patch) | |
| tree | e7f461bff31f943675a6bc3e6dcb7d25bab86d45 /OpenSim/Services | |
| parent | These 2 were moved to corresponding Hypergrid folders. The server connector w... (diff) | |
| download | opensim-SC-bd4d94a4f5490708773db7e211c0c96999bb84c2.zip opensim-SC-bd4d94a4f5490708773db7e211c0c96999bb84c2.tar.gz opensim-SC-bd4d94a4f5490708773db7e211c0c96999bb84c2.tar.bz2 opensim-SC-bd4d94a4f5490708773db7e211c0c96999bb84c2.tar.xz | |
Hyperlinking minimally tested and working.
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 17 | ||||
| -rw-r--r-- | OpenSim/Services/HypergridService/HGCommands.cs | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 174174c..6305f37 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -77,15 +77,24 @@ namespace OpenSim.Services.HypergridService | |||
| 77 | 77 | ||
| 78 | public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason) | 78 | public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason) |
| 79 | { | 79 | { |
| 80 | regionID = m_DefaultGatewayRegion.RegionID; | 80 | regionID = UUID.Zero; |
| 81 | regionHandle = m_DefaultGatewayRegion.RegionHandle; | 81 | regionHandle = 0; |
| 82 | imageURL = string.Empty; | 82 | imageURL = string.Empty; |
| 83 | reason = string.Empty; | 83 | reason = string.Empty; |
| 84 | 84 | ||
| 85 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", regionName); | ||
| 85 | if (!m_AllowTeleportsToAnyRegion) | 86 | if (!m_AllowTeleportsToAnyRegion) |
| 86 | { | 87 | { |
| 87 | regionID = m_DefaultGatewayRegion.RegionID; | 88 | try |
| 88 | regionHandle = m_DefaultGatewayRegion.RegionHandle; | 89 | { |
| 90 | regionID = m_DefaultGatewayRegion.RegionID; | ||
| 91 | regionHandle = m_DefaultGatewayRegion.RegionHandle; | ||
| 92 | } | ||
| 93 | catch | ||
| 94 | { | ||
| 95 | reason = "Grid setup problem"; | ||
| 96 | return false; | ||
| 97 | } | ||
| 89 | if (regionName != string.Empty) | 98 | if (regionName != string.Empty) |
| 90 | { | 99 | { |
| 91 | reason = "Direct links to regions not allowed"; | 100 | reason = "Direct links to regions not allowed"; |
diff --git a/OpenSim/Services/HypergridService/HGCommands.cs b/OpenSim/Services/HypergridService/HGCommands.cs index 10d04ff..f48fd70 100644 --- a/OpenSim/Services/HypergridService/HGCommands.cs +++ b/OpenSim/Services/HypergridService/HGCommands.cs | |||
| @@ -69,7 +69,7 @@ namespace OpenSim.Services.HypergridService | |||
| 69 | 69 | ||
| 70 | MainConsole.Instance.Output("Region Name Region UUID"); | 70 | MainConsole.Instance.Output("Region Name Region UUID"); |
| 71 | MainConsole.Instance.Output("Location URI"); | 71 | MainConsole.Instance.Output("Location URI"); |
| 72 | MainConsole.Instance.Output("Owner ID Flags"); | 72 | MainConsole.Instance.Output("Owner ID "); |
| 73 | MainConsole.Instance.Output("-------------------------------------------------------------------------------"); | 73 | MainConsole.Instance.Output("-------------------------------------------------------------------------------"); |
| 74 | foreach (GridRegion r in regions) | 74 | foreach (GridRegion r in regions) |
| 75 | { | 75 | { |