diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 479a80e..89a8f7a 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -108,8 +108,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
108 | } | 108 | } |
109 | 109 | ||
110 | hash = (Hashtable)response.Value; | 110 | hash = (Hashtable)response.Value; |
111 | //foreach (Object o in hash) | 111 | foreach (Object o in hash) |
112 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 112 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
113 | try | 113 | try |
114 | { | 114 | { |
115 | bool success = false; | 115 | bool success = false; |
@@ -117,16 +117,20 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
117 | if (success) | 117 | if (success) |
118 | { | 118 | { |
119 | UUID.TryParse((string)hash["uuid"], out regionID); | 119 | UUID.TryParse((string)hash["uuid"], out regionID); |
120 | //m_log.Debug(">> HERE, uuid: " + uuid); | 120 | m_log.Debug(">> HERE, uuid: " + regionID); |
121 | if ((string)hash["handle"] != null) | 121 | if ((string)hash["handle"] != null) |
122 | { | 122 | { |
123 | realHandle = Convert.ToUInt64((string)hash["handle"]); | 123 | realHandle = Convert.ToUInt64((string)hash["handle"]); |
124 | //m_log.Debug(">> HERE, realHandle: " + realHandle); | 124 | m_log.Debug(">> HERE, realHandle: " + realHandle); |
125 | } | 125 | } |
126 | if (hash["region_image"] != null) | 126 | if (hash["region_image"] != null) { |
127 | imageURL = (string)hash["region_image"]; | 127 | imageURL = (string)hash["region_image"]; |
128 | if (hash["external_name"] != null) | 128 | m_log.Debug(">> HERE, imageURL: " + imageURL); |
129 | } | ||
130 | if (hash["external_name"] != null) { | ||
129 | externalName = (string)hash["external_name"]; | 131 | externalName = (string)hash["external_name"]; |
132 | m_log.Debug(">> HERE, externalName: " + externalName); | ||
133 | } | ||
130 | } | 134 | } |
131 | 135 | ||
132 | } | 136 | } |
@@ -208,8 +212,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
208 | } | 212 | } |
209 | 213 | ||
210 | hash = (Hashtable)response.Value; | 214 | hash = (Hashtable)response.Value; |
211 | //foreach (Object o in hash) | 215 | foreach (Object o in hash) |
212 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 216 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
213 | try | 217 | try |
214 | { | 218 | { |
215 | bool success = false; | 219 | bool success = false; |
@@ -219,38 +223,41 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
219 | GridRegion region = new GridRegion(); | 223 | GridRegion region = new GridRegion(); |
220 | 224 | ||
221 | UUID.TryParse((string)hash["uuid"], out region.RegionID); | 225 | UUID.TryParse((string)hash["uuid"], out region.RegionID); |
222 | //m_log.Debug(">> HERE, uuid: " + region.RegionID); | 226 | m_log.Debug(">> HERE, uuid: " + region.RegionID); |
223 | int n = 0; | 227 | int n = 0; |
224 | if (hash["x"] != null) | 228 | if (hash["x"] != null) |
225 | { | 229 | { |
226 | Int32.TryParse((string)hash["x"], out n); | 230 | Int32.TryParse((string)hash["x"], out n); |
227 | region.RegionLocX = n; | 231 | region.RegionLocX = n; |
228 | //m_log.Debug(">> HERE, x: " + region.RegionLocX); | 232 | m_log.Debug(">> HERE, x: " + region.RegionLocX); |
229 | } | 233 | } |
230 | if (hash["y"] != null) | 234 | if (hash["y"] != null) |
231 | { | 235 | { |
232 | Int32.TryParse((string)hash["y"], out n); | 236 | Int32.TryParse((string)hash["y"], out n); |
233 | region.RegionLocY = n; | 237 | region.RegionLocY = n; |
234 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); | 238 | m_log.Debug(">> HERE, y: " + region.RegionLocY); |
235 | } | 239 | } |
236 | if (hash["region_name"] != null) | 240 | if (hash["region_name"] != null) |
237 | { | 241 | { |
238 | region.RegionName = (string)hash["region_name"]; | 242 | region.RegionName = (string)hash["region_name"]; |
239 | //m_log.Debug(">> HERE, name: " + region.RegionName); | 243 | m_log.Debug(">> HERE, region_name: " + region.RegionName); |
240 | } | 244 | } |
241 | if (hash["hostname"] != null) | 245 | if (hash["hostname"] != null) |
242 | region.ExternalHostName = (string)hash["hostname"]; | 246 | region.ExternalHostName = (string)hash["hostname"]; |
247 | m_log.Debug(">> HERE, hostname: " + region.ExternalHostName); | ||
243 | if (hash["http_port"] != null) | 248 | if (hash["http_port"] != null) |
244 | { | 249 | { |
245 | uint p = 0; | 250 | uint p = 0; |
246 | UInt32.TryParse((string)hash["http_port"], out p); | 251 | UInt32.TryParse((string)hash["http_port"], out p); |
247 | region.HttpPort = p; | 252 | region.HttpPort = p; |
253 | m_log.Debug(">> HERE, http_port: " + region.HttpPort); | ||
248 | } | 254 | } |
249 | if (hash["internal_port"] != null) | 255 | if (hash["internal_port"] != null) |
250 | { | 256 | { |
251 | int p = 0; | 257 | int p = 0; |
252 | Int32.TryParse((string)hash["internal_port"], out p); | 258 | Int32.TryParse((string)hash["internal_port"], out p); |
253 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); | 259 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); |
260 | m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); | ||
254 | } | 261 | } |
255 | 262 | ||
256 | // Successful return | 263 | // Successful return |