diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 4231be1..2b19b87 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -116,19 +116,19 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
116 | if (success) | 116 | if (success) |
117 | { | 117 | { |
118 | UUID.TryParse((string)hash["uuid"], out regionID); | 118 | UUID.TryParse((string)hash["uuid"], out regionID); |
119 | //m_log.Debug(">> HERE, uuid: " + regionID); | 119 | m_log.Debug(">> HERE, uuid: " + regionID); |
120 | if ((string)hash["handle"] != null) | 120 | if ((string)hash["handle"] != null) |
121 | { | 121 | { |
122 | realHandle = Convert.ToUInt64((string)hash["handle"]); | 122 | realHandle = Convert.ToUInt64((string)hash["handle"]); |
123 | //m_log.Debug(">> HERE, realHandle: " + realHandle); | 123 | m_log.Debug(">> HERE, realHandle: " + realHandle); |
124 | } | 124 | } |
125 | if (hash["region_image"] != null) { | 125 | if (hash["region_image"] != null) { |
126 | imageURL = (string)hash["region_image"]; | 126 | imageURL = (string)hash["region_image"]; |
127 | //m_log.Debug(">> HERE, imageURL: " + imageURL); | 127 | m_log.Debug(">> HERE, imageURL: " + imageURL); |
128 | } | 128 | } |
129 | if (hash["external_name"] != null) { | 129 | if (hash["external_name"] != null) { |
130 | externalName = (string)hash["external_name"]; | 130 | externalName = (string)hash["external_name"]; |
131 | //m_log.Debug(">> HERE, externalName: " + externalName); | 131 | m_log.Debug(">> HERE, externalName: " + externalName); |
132 | } | 132 | } |
133 | } | 133 | } |
134 | 134 | ||
@@ -191,7 +191,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
191 | paramList.Add(hash); | 191 | paramList.Add(hash); |
192 | 192 | ||
193 | XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); | 193 | XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); |
194 | //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + gatekeeper.ServerURI); | 194 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + gatekeeper.ServerURI); |
195 | XmlRpcResponse response = null; | 195 | XmlRpcResponse response = null; |
196 | try | 196 | try |
197 | { | 197 | { |
@@ -199,7 +199,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
199 | } | 199 | } |
200 | catch (Exception e) | 200 | catch (Exception e) |
201 | { | 201 | { |
202 | //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Exception " + e.Message); | 202 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Exception " + e.Message); |
203 | return null; | 203 | return null; |
204 | } | 204 | } |
205 | 205 | ||
@@ -210,8 +210,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
210 | } | 210 | } |
211 | 211 | ||
212 | hash = (Hashtable)response.Value; | 212 | hash = (Hashtable)response.Value; |
213 | //foreach (Object o in hash) | 213 | foreach (Object o in hash) |
214 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 214 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
215 | try | 215 | try |
216 | { | 216 | { |
217 | bool success = false; | 217 | bool success = false; |
@@ -221,41 +221,41 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
221 | GridRegion region = new GridRegion(); | 221 | GridRegion region = new GridRegion(); |
222 | 222 | ||
223 | UUID.TryParse((string)hash["uuid"], out region.RegionID); | 223 | UUID.TryParse((string)hash["uuid"], out region.RegionID); |
224 | //m_log.Debug(">> HERE, uuid: " + region.RegionID); | 224 | m_log.Debug(">> HERE, uuid: " + region.RegionID); |
225 | int n = 0; | 225 | int n = 0; |
226 | if (hash["x"] != null) | 226 | if (hash["x"] != null) |
227 | { | 227 | { |
228 | Int32.TryParse((string)hash["x"], out n); | 228 | Int32.TryParse((string)hash["x"], out n); |
229 | region.RegionLocX = n; | 229 | region.RegionLocX = n; |
230 | //m_log.Debug(">> HERE, x: " + region.RegionLocX); | 230 | m_log.Debug(">> HERE, x: " + region.RegionLocX); |
231 | } | 231 | } |
232 | if (hash["y"] != null) | 232 | if (hash["y"] != null) |
233 | { | 233 | { |
234 | Int32.TryParse((string)hash["y"], out n); | 234 | Int32.TryParse((string)hash["y"], out n); |
235 | region.RegionLocY = n; | 235 | region.RegionLocY = n; |
236 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); | 236 | m_log.Debug(">> HERE, y: " + region.RegionLocY); |
237 | } | 237 | } |
238 | if (hash["region_name"] != null) | 238 | if (hash["region_name"] != null) |
239 | { | 239 | { |
240 | region.RegionName = (string)hash["region_name"]; | 240 | region.RegionName = (string)hash["region_name"]; |
241 | //m_log.Debug(">> HERE, region_name: " + region.RegionName); | 241 | m_log.Debug(">> HERE, region_name: " + region.RegionName); |
242 | } | 242 | } |
243 | if (hash["hostname"] != null) | 243 | if (hash["hostname"] != null) |
244 | region.ExternalHostName = (string)hash["hostname"]; | 244 | region.ExternalHostName = (string)hash["hostname"]; |
245 | //m_log.Debug(">> HERE, hostname: " + region.ExternalHostName); | 245 | m_log.Debug(">> HERE, hostname: " + region.ExternalHostName); |
246 | if (hash["http_port"] != null) | 246 | if (hash["http_port"] != null) |
247 | { | 247 | { |
248 | uint p = 0; | 248 | uint p = 0; |
249 | UInt32.TryParse((string)hash["http_port"], out p); | 249 | UInt32.TryParse((string)hash["http_port"], out p); |
250 | region.HttpPort = p; | 250 | region.HttpPort = p; |
251 | //m_log.Debug(">> HERE, http_port: " + region.HttpPort); | 251 | m_log.Debug(">> HERE, http_port: " + region.HttpPort); |
252 | } | 252 | } |
253 | if (hash["internal_port"] != null) | 253 | if (hash["internal_port"] != null) |
254 | { | 254 | { |
255 | int p = 0; | 255 | int p = 0; |
256 | Int32.TryParse((string)hash["internal_port"], out p); | 256 | Int32.TryParse((string)hash["internal_port"], out p); |
257 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); | 257 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); |
258 | //m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); | 258 | m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); |
259 | } | 259 | } |
260 | 260 | ||
261 | // Successful return | 261 | // Successful return |