diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs index 1d711a8..846d1c2 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | |||
@@ -44,12 +44,10 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private IGatekeeperService m_GatekeeperService; | 46 | private IGatekeeperService m_GatekeeperService; |
47 | private IHypergridService m_HypergridService; | ||
48 | 47 | ||
49 | public HypergridHandlers(IGatekeeperService gatekeeper, IHypergridService hyper) | 48 | public HypergridHandlers(IGatekeeperService gatekeeper) |
50 | { | 49 | { |
51 | m_GatekeeperService = gatekeeper; | 50 | m_GatekeeperService = gatekeeper; |
52 | m_HypergridService = hyper; | ||
53 | } | 51 | } |
54 | 52 | ||
55 | /// <summary> | 53 | /// <summary> |
@@ -82,36 +80,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
82 | return response; | 80 | return response; |
83 | } | 81 | } |
84 | 82 | ||
85 | /// <summary> | ||
86 | /// A local region wants to establish a grid-wide hyperlink to another region | ||
87 | /// </summary> | ||
88 | /// <param name="request"></param> | ||
89 | /// <returns></returns> | ||
90 | public XmlRpcResponse LinkRegionByDescRequest(XmlRpcRequest request, IPEndPoint remoteClient) | ||
91 | { | ||
92 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
93 | //string host = (string)requestData["host"]; | ||
94 | //string portstr = (string)requestData["port"]; | ||
95 | string descriptor = (string)requestData["region_desc"]; | ||
96 | |||
97 | UUID regionID = UUID.Zero; | ||
98 | string imageURL = string.Empty; | ||
99 | ulong regionHandle = 0; | ||
100 | string reason = string.Empty; | ||
101 | |||
102 | bool success = m_HypergridService.LinkRegion(descriptor, out regionID, out regionHandle, out imageURL, out reason); | ||
103 | |||
104 | Hashtable hash = new Hashtable(); | ||
105 | hash["result"] = success.ToString(); | ||
106 | hash["uuid"] = regionID.ToString(); | ||
107 | hash["handle"] = regionHandle.ToString(); | ||
108 | hash["region_image"] = imageURL; | ||
109 | |||
110 | XmlRpcResponse response = new XmlRpcResponse(); | ||
111 | response.Value = hash; | ||
112 | return response; | ||
113 | } | ||
114 | |||
115 | public XmlRpcResponse GetRegion(XmlRpcRequest request, IPEndPoint remoteClient) | 83 | public XmlRpcResponse GetRegion(XmlRpcRequest request, IPEndPoint remoteClient) |
116 | { | 84 | { |
117 | Hashtable requestData = (Hashtable)request.Params[0]; | 85 | Hashtable requestData = (Hashtable)request.Params[0]; |