From 664dd58cd9a8318c14fc3e3a3950c3e29cf97ba8 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 14 Jun 2009 21:44:34 +0000
Subject: 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.

---
 OpenSim/Data/MSSQL/MSSQLUserData.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Data/MSSQL/MSSQLUserData.cs')

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
                 retval.ID = new UUID((Guid)reader["UUID"]);
                 retval.FirstName = (string)reader["username"];
                 retval.SurName = (string)reader["lastname"];
+                if (reader.IsDBNull(reader.GetOrdinal("email")))
+                    retval.Email = "";
+                else
+                    retval.Email = (string)reader["email"];
 
                 retval.PasswordHash = (string)reader["passwordHash"];
                 retval.PasswordSalt = (string)reader["passwordSalt"];
-- 
cgit v1.1