diff options
author | Oren Hurvitz | 2014-04-03 12:47:20 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-03 14:13:03 +0100 |
commit | 6d2893be67fd725090b69f5f31c0985c3d211135 (patch) | |
tree | 6dd6ff48ed74f751730930635638b3a54fce4b7f /OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | |
parent | BulletSim: make avatar physical shape to be a rectangle rather than (diff) | |
download | opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.zip opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.tar.gz opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.tar.bz2 opensim-SC_OLD-6d2893be67fd725090b69f5f31c0985c3d211135.tar.xz |
When teleporting using Hypergrid, show more informative error messages in case of error
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs index f25e6e0..a89d7f7 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | |||
@@ -94,11 +94,14 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
94 | UUID regionID = UUID.Zero; | 94 | UUID regionID = UUID.Zero; |
95 | UUID.TryParse(regionID_str, out regionID); | 95 | UUID.TryParse(regionID_str, out regionID); |
96 | 96 | ||
97 | GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID); | 97 | string message; |
98 | GridRegion regInfo = m_GatekeeperService.GetHyperlinkRegion(regionID, out message); | ||
98 | 99 | ||
99 | Hashtable hash = new Hashtable(); | 100 | Hashtable hash = new Hashtable(); |
100 | if (regInfo == null) | 101 | if (regInfo == null) |
102 | { | ||
101 | hash["result"] = "false"; | 103 | hash["result"] = "false"; |
104 | } | ||
102 | else | 105 | else |
103 | { | 106 | { |
104 | hash["result"] = "true"; | 107 | hash["result"] = "true"; |
@@ -112,6 +115,10 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
112 | hash["http_port"] = regInfo.HttpPort.ToString(); | 115 | hash["http_port"] = regInfo.HttpPort.ToString(); |
113 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); | 116 | hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); |
114 | } | 117 | } |
118 | |||
119 | if (message != null) | ||
120 | hash["message"] = message; | ||
121 | |||
115 | XmlRpcResponse response = new XmlRpcResponse(); | 122 | XmlRpcResponse response = new XmlRpcResponse(); |
116 | response.Value = hash; | 123 | response.Value = hash; |
117 | return response; | 124 | return response; |