diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLManager.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLManager.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 4455c3b..f7baadc 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs | |||
@@ -302,7 +302,7 @@ namespace OpenSim.Data.MySQL | |||
302 | // Region Main gotta-have-or-we-return-null parts | 302 | // Region Main gotta-have-or-we-return-null parts |
303 | UInt64 tmp64; | 303 | UInt64 tmp64; |
304 | if (!UInt64.TryParse(reader["regionHandle"].ToString(), out tmp64)) | 304 | if (!UInt64.TryParse(reader["regionHandle"].ToString(), out tmp64)) |
305 | { | 305 | { |
306 | return null; | 306 | return null; |
307 | } | 307 | } |
308 | else | 308 | else |
@@ -310,7 +310,7 @@ namespace OpenSim.Data.MySQL | |||
310 | retval.regionHandle = tmp64; | 310 | retval.regionHandle = tmp64; |
311 | } | 311 | } |
312 | LLUUID tmp_uuid; | 312 | LLUUID tmp_uuid; |
313 | if (!LLUUID.TryParse((string)reader["uuid"], out tmp_uuid)) | 313 | if (!LLUUID.TryParse((string)reader["uuid"], out tmp_uuid)) |
314 | { | 314 | { |
315 | return null; | 315 | return null; |
316 | } | 316 | } |
@@ -321,7 +321,7 @@ namespace OpenSim.Data.MySQL | |||
321 | 321 | ||
322 | // non-critical parts | 322 | // non-critical parts |
323 | retval.regionName = (string)reader["regionName"]; | 323 | retval.regionName = (string)reader["regionName"]; |
324 | retval.originUUID = new LLUUID((string) reader["originUUID"]); | 324 | retval.originUUID = new LLUUID((string) reader["originUUID"]); |
325 | 325 | ||
326 | // Secrets | 326 | // Secrets |
327 | retval.regionRecvKey = (string) reader["regionRecvKey"]; | 327 | retval.regionRecvKey = (string) reader["regionRecvKey"]; |
@@ -360,8 +360,8 @@ namespace OpenSim.Data.MySQL | |||
360 | 360 | ||
361 | // World Map Addition | 361 | // World Map Addition |
362 | LLUUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); | 362 | LLUUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); |
363 | LLUUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); | 363 | LLUUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); |
364 | } | 364 | } |
365 | else | 365 | else |
366 | { | 366 | { |
367 | return null; | 367 | return null; |
@@ -418,7 +418,7 @@ namespace OpenSim.Data.MySQL | |||
418 | 418 | ||
419 | LLUUID.TryParse((string) reader["sessionID"], out tmp); | 419 | LLUUID.TryParse((string) reader["sessionID"], out tmp); |
420 | retval.SessionID = tmp; | 420 | retval.SessionID = tmp; |
421 | 421 | ||
422 | LLUUID.TryParse((string)reader["secureSessionID"], out tmp); | 422 | LLUUID.TryParse((string)reader["secureSessionID"], out tmp); |
423 | retval.SecureSessionID = tmp; | 423 | retval.SecureSessionID = tmp; |
424 | 424 | ||
@@ -488,7 +488,7 @@ namespace OpenSim.Data.MySQL | |||
488 | 488 | ||
489 | if (reader.IsDBNull(reader.GetOrdinal("profileAboutText"))) | 489 | if (reader.IsDBNull(reader.GetOrdinal("profileAboutText"))) |
490 | retval.AboutText = ""; | 490 | retval.AboutText = ""; |
491 | else | 491 | else |
492 | retval.AboutText = (string) reader["profileAboutText"]; | 492 | retval.AboutText = (string) reader["profileAboutText"]; |
493 | 493 | ||
494 | if (reader.IsDBNull(reader.GetOrdinal("profileFirstText"))) | 494 | if (reader.IsDBNull(reader.GetOrdinal("profileFirstText"))) |
@@ -511,7 +511,7 @@ namespace OpenSim.Data.MySQL | |||
511 | LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); | 511 | LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); |
512 | retval.FirstLifeImage = tmp; | 512 | retval.FirstLifeImage = tmp; |
513 | } | 513 | } |
514 | 514 | ||
515 | if (reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) | 515 | if (reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) |
516 | { | 516 | { |
517 | retval.WebLoginKey = LLUUID.Zero; | 517 | retval.WebLoginKey = LLUUID.Zero; |