diff options
| author | Sean Dague | 2008-11-04 19:26:17 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-11-04 19:26:17 +0000 |
| commit | 7d6dc3b0999d5d4dbe0ec560db43a1de047408b7 (patch) | |
| tree | f43f7310cfbbd35788bc473401915710208353b0 /OpenSim/Data/MySQL | |
| parent | - Added stronger persistence tests for BasicUserTests (diff) | |
| download | opensim-SC_OLD-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.zip opensim-SC_OLD-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.tar.gz opensim-SC_OLD-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.tar.bz2 opensim-SC_OLD-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.tar.xz | |
add some null protection on email
From: Sean Dague <sdague@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 7096efa..c584eb9 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs | |||
| @@ -540,7 +540,7 @@ namespace OpenSim.Data.MySQL | |||
| 540 | retval.ID = id; | 540 | retval.ID = id; |
| 541 | retval.FirstName = (string) reader["username"]; | 541 | retval.FirstName = (string) reader["username"]; |
| 542 | retval.SurName = (string) reader["lastname"]; | 542 | retval.SurName = (string) reader["lastname"]; |
| 543 | retval.Email = (string) reader["email"]; | 543 | retval.Email = (reader.IsDBNull(reader.GetOrdinal("email"))) ? "" : (string) reader["email"]; |
| 544 | 544 | ||
| 545 | retval.PasswordHash = (string) reader["passwordHash"]; | 545 | retval.PasswordHash = (string) reader["passwordHash"]; |
| 546 | retval.PasswordSalt = (string) reader["passwordSalt"]; | 546 | retval.PasswordSalt = (string) reader["passwordSalt"]; |