aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2010-01-27 08:00:29 -0800
committerDiva Canto2010-01-27 08:00:29 -0800
commit7c00469cd210cfdda3dd835867469159d4c8b9d9 (patch)
tree11dc9aa7d60ce0067c44d37ec3a0638753441cb7 /OpenSim/Server
parentAdded image for hyperlink map tiles. (diff)
downloadopensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.zip
opensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.gz
opensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.bz2
opensim-SC-7c00469cd210cfdda3dd835867469159d4c8b9d9.tar.xz
Added ExternalName config on Gatekeeper.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
index 846d1c2..7d31730 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
@@ -63,17 +63,19 @@ namespace OpenSim.Server.Handlers.Hypergrid
63 string name = (string)requestData["region_name"]; 63 string name = (string)requestData["region_name"];
64 64
65 UUID regionID = UUID.Zero; 65 UUID regionID = UUID.Zero;
66 string externalName = string.Empty;
66 string imageURL = string.Empty; 67 string imageURL = string.Empty;
67 ulong regionHandle = 0; 68 ulong regionHandle = 0;
68 string reason = string.Empty; 69 string reason = string.Empty;
69 70
70 bool success = m_GatekeeperService.LinkRegion(name, out regionID, out regionHandle, out imageURL, out reason); 71 bool success = m_GatekeeperService.LinkRegion(name, out regionID, out regionHandle, out externalName, out imageURL, out reason);
71 72
72 Hashtable hash = new Hashtable(); 73 Hashtable hash = new Hashtable();
73 hash["result"] = success.ToString(); 74 hash["result"] = success.ToString();
74 hash["uuid"] = regionID.ToString(); 75 hash["uuid"] = regionID.ToString();
75 hash["handle"] = regionHandle.ToString(); 76 hash["handle"] = regionHandle.ToString();
76 hash["region_image"] = imageURL; 77 hash["region_image"] = imageURL;
78 hash["external_name"] = externalName;
77 79
78 XmlRpcResponse response = new XmlRpcResponse(); 80 XmlRpcResponse response = new XmlRpcResponse();
79 response.Value = hash; 81 response.Value = hash;