diff options
author | Diva Canto | 2010-01-27 08:00:29 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-27 08:00:29 -0800 |
commit | 7c00469cd210cfdda3dd835867469159d4c8b9d9 (patch) | |
tree | 11dc9aa7d60ce0067c44d37ec3a0638753441cb7 /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |
parent | Added image for hyperlink map tiles. (diff) | |
download | opensim-SC_OLD-7c00469cd210cfdda3dd835867469159d4c8b9d9.zip opensim-SC_OLD-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.gz opensim-SC_OLD-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.bz2 opensim-SC_OLD-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.xz |
Added ExternalName config on Gatekeeper.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index ae0a0b6..5ad1af2 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -45,11 +45,12 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
45 | return "/foreignobject/"; | 45 | return "/foreignobject/"; |
46 | } | 46 | } |
47 | 47 | ||
48 | public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string imageURL, out string reason) | 48 | public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string externalName, out string imageURL, out string reason) |
49 | { | 49 | { |
50 | regionID = UUID.Zero; | 50 | regionID = UUID.Zero; |
51 | imageURL = string.Empty; | 51 | imageURL = string.Empty; |
52 | realHandle = 0; | 52 | realHandle = 0; |
53 | externalName = string.Empty; | ||
53 | reason = string.Empty; | 54 | reason = string.Empty; |
54 | 55 | ||
55 | Hashtable hash = new Hashtable(); | 56 | Hashtable hash = new Hashtable(); |
@@ -97,9 +98,9 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
97 | //m_log.Debug(">> HERE, realHandle: " + realHandle); | 98 | //m_log.Debug(">> HERE, realHandle: " + realHandle); |
98 | } | 99 | } |
99 | if (hash["region_image"] != null) | 100 | if (hash["region_image"] != null) |
100 | { | ||
101 | imageURL = (string)hash["region_image"]; | 101 | imageURL = (string)hash["region_image"]; |
102 | } | 102 | if (hash["external_name"] != null) |
103 | externalName = (string)hash["external_name"]; | ||
103 | } | 104 | } |
104 | 105 | ||
105 | } | 106 | } |