diff options
author | Diva Canto | 2010-12-05 19:43:24 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-05 19:43:24 -0800 |
commit | 72748746d53df1c033207452a4315d93bc780158 (patch) | |
tree | e50bf963b16737946c0717ee42779b2aa5e3ff8d /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
download | opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.zip opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.gz opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.bz2 opensim-SC_OLD-72748746d53df1c033207452a4315d93bc780158.tar.xz |
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 70bafda..85c1380 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -107,8 +107,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
107 | } | 107 | } |
108 | 108 | ||
109 | hash = (Hashtable)response.Value; | 109 | hash = (Hashtable)response.Value; |
110 | foreach (Object o in hash) | 110 | //foreach (Object o in hash) |
111 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 111 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
112 | try | 112 | try |
113 | { | 113 | { |
114 | bool success = false; | 114 | bool success = false; |
@@ -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 | ||
@@ -221,48 +221,48 @@ 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 | } | 246 | } |
247 | if (hash["http_port"] != null) | 247 | if (hash["http_port"] != null) |
248 | { | 248 | { |
249 | uint p = 0; | 249 | uint p = 0; |
250 | UInt32.TryParse((string)hash["http_port"], out p); | 250 | UInt32.TryParse((string)hash["http_port"], out p); |
251 | region.HttpPort = p; | 251 | region.HttpPort = p; |
252 | m_log.Debug(">> HERE, http_port: " + region.HttpPort); | 252 | //m_log.Debug(">> HERE, http_port: " + region.HttpPort); |
253 | } | 253 | } |
254 | if (hash["internal_port"] != null) | 254 | if (hash["internal_port"] != null) |
255 | { | 255 | { |
256 | int p = 0; | 256 | int p = 0; |
257 | Int32.TryParse((string)hash["internal_port"], out p); | 257 | Int32.TryParse((string)hash["internal_port"], out p); |
258 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); | 258 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); |
259 | m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); | 259 | //m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); |
260 | } | 260 | } |
261 | 261 | ||
262 | if (hash["server_uri"] != null) | 262 | if (hash["server_uri"] != null) |
263 | { | 263 | { |
264 | region.ServerURI = (string) hash["server_uri"]; | 264 | region.ServerURI = (string) hash["server_uri"]; |
265 | m_log.Debug(">> HERE, server_uri: " + region.ServerURI); | 265 | //m_log.Debug(">> HERE, server_uri: " + region.ServerURI); |
266 | } | 266 | } |
267 | 267 | ||
268 | // Successful return | 268 | // Successful return |