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