diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Data/MSSQL/MSSQLUserData.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLUserData.cs')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index 6efb89d..3ef1053 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
| @@ -1146,7 +1146,7 @@ ELSE | |||
| 1146 | if (reader.IsDBNull(reader.GetOrdinal("homeRegionID"))) | 1146 | if (reader.IsDBNull(reader.GetOrdinal("homeRegionID"))) |
| 1147 | retval.HomeRegionID = UUID.Zero; | 1147 | retval.HomeRegionID = UUID.Zero; |
| 1148 | else | 1148 | else |
| 1149 | retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]); | 1149 | retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]); |
| 1150 | 1150 | ||
| 1151 | retval.Created = Convert.ToInt32(reader["created"].ToString()); | 1151 | retval.Created = Convert.ToInt32(reader["created"].ToString()); |
| 1152 | retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); | 1152 | retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); |
| @@ -1200,7 +1200,7 @@ ELSE | |||
| 1200 | if (reader.IsDBNull(reader.GetOrdinal("partner"))) | 1200 | if (reader.IsDBNull(reader.GetOrdinal("partner"))) |
| 1201 | retval.Partner = UUID.Zero; | 1201 | retval.Partner = UUID.Zero; |
| 1202 | else | 1202 | else |
| 1203 | retval.Partner = new UUID((Guid)reader["partner"]); | 1203 | retval.Partner = new UUID((Guid)reader["partner"]); |
| 1204 | } | 1204 | } |
| 1205 | else | 1205 | else |
| 1206 | { | 1206 | { |