diff options
author | Melanie Thielker | 2009-06-14 21:44:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-06-14 21:44:34 +0000 |
commit | 664dd58cd9a8318c14fc3e3a3950c3e29cf97ba8 (patch) | |
tree | 41db60d59a2f0b46388e1e598679265dafc9d247 /OpenSim/Data/MSSQL/MSSQLUserData.cs | |
parent | Update svn properties. (diff) | |
download | opensim-SC-664dd58cd9a8318c14fc3e3a3950c3e29cf97ba8.zip opensim-SC-664dd58cd9a8318c14fc3e3a3950c3e29cf97ba8.tar.gz opensim-SC-664dd58cd9a8318c14fc3e3a3950c3e29cf97ba8.tar.bz2 opensim-SC-664dd58cd9a8318c14fc3e3a3950c3e29cf97ba8.tar.xz |
Fixes Mantis #3793 . Committing thomax/Snoopy's patch to allow deeding of objects, with changes:
- Set OwnerID = GroupID for deeded objects.
- Close a security loophole that would have allowed a user with deed rights in a group to deed ANY object to that group, even if it's not owned by them and/or not set to that group
- Set LastOwnerID correctly. Handle objects vs. prims correctly.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index c04dbda..6efb89d 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -1125,6 +1125,10 @@ ELSE | |||
1125 | retval.ID = new UUID((Guid)reader["UUID"]); | 1125 | retval.ID = new UUID((Guid)reader["UUID"]); |
1126 | retval.FirstName = (string)reader["username"]; | 1126 | retval.FirstName = (string)reader["username"]; |
1127 | retval.SurName = (string)reader["lastname"]; | 1127 | retval.SurName = (string)reader["lastname"]; |
1128 | if (reader.IsDBNull(reader.GetOrdinal("email"))) | ||
1129 | retval.Email = ""; | ||
1130 | else | ||
1131 | retval.Email = (string)reader["email"]; | ||
1128 | 1132 | ||
1129 | retval.PasswordHash = (string)reader["passwordHash"]; | 1133 | retval.PasswordHash = (string)reader["passwordHash"]; |
1130 | retval.PasswordSalt = (string)reader["passwordSalt"]; | 1134 | retval.PasswordSalt = (string)reader["passwordSalt"]; |