1 files changed, 378 insertions, 387 deletions

diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index f4e41b4..f166976 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -37,47 +37,46 @@ using Npgsql;
 
 namespace OpenSim.Data.PGSQL
 {
-    public class UserProfilesData: IProfilesData
+    public class UserProfilesData : IProfilesData
     {
         static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
+        protected PGSQLManager m_database;
+
         #region Properites
         string ConnectionString
         {
-            get; set;
+            get;
+            set;
         }
 
-        protected object Lock
-        {
-            get; set;
-        }
-        
         protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
         }
-        
+
         #endregion Properties
-        
+
         #region class Member Functions
         public UserProfilesData(string connectionString)
         {
             ConnectionString = connectionString;
             Init();
         }
-        
+
         void Init()
         {
             using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
             {
                 dbcon.Open();
-                
+
                 Migration m = new Migration(dbcon, Assembly, "UserProfiles");
                 m.Update();
+                m_database = new PGSQLManager(ConnectionString);
             }
         }
         #endregion Member Functions
-        
+
         #region Classifieds Queries
         /// <summary>
         /// Gets the classified records.
@@ -91,34 +90,34 @@ namespace OpenSim.Data.PGSQL
         public OSDArray GetClassifiedRecords(UUID creatorId)
         {
             OSDArray data = new OSDArray();
-            
+
             using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
             {
-                string query = @"SELECT ""classifieduuid"", ""name"" FROM classifieds WHERE ""creatoruuid"" = :Id";
+                string query = @"SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = :Id";
                 dbcon.Open();
                 using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                 {
-                    cmd.Parameters.AddWithValue("Id", creatorId);
-                    using( NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
+                    cmd.Parameters.Add(m_database.CreateParameter("Id", creatorId));
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
                     {
-                        if(reader.HasRows)
+                        if (reader.HasRows)
                         {
                             while (reader.Read())
                             {
                                 OSDMap n = new OSDMap();
                                 UUID Id = UUID.Zero;
-                                
+
                                 string Name = null;
                                 try
                                 {
-                                    UUID.TryParse(Convert.ToString( reader["classifieduuid"]), out Id);
+                                    Id = DBGuid.FromDB(reader["classifieduuid"]);
                                     Name = Convert.ToString(reader["name"]);
                                 }
                                 catch (Exception e)
                                 {
-                                    m_log.DebugFormat("[PROFILES_DATA]" +
-                                                     ": UserAccount exception {0}", e.Message);
+                                    m_log.Error("[PROFILES_DATA]: UserAccount exception ", e);
                                 }
+
                                 n.Add("classifieduuid", OSD.FromUUID(Id));
                                 n.Add("name", OSD.FromString(Name));
                                 data.Add(n);
@@ -129,60 +128,57 @@ namespace OpenSim.Data.PGSQL
             }
             return data;
         }
-        
+
         public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
         {
-            string query = @"INSERT INTO classifieds ( ""classifieduuid"",""creatoruuid"", ""creationdate"", ""expirationdate"", ""category"",
-                                    ""name"", ""description"", ""parceluuid"", ""parentestate"", ""snapshotuuid"", ""simname"",
-                                    ""posglobal"", ""parcelname"", ""classifiedflags"", ""priceforlisting"")
-                              Select :ClassifiedId, :CreatorId, :CreatedDate, :ExpirationDate, :Category,
-                                     :Name, :Description, :ParcelId, :ParentEstate, :SnapshotId, :SimName 
-                                     :GlobalPos, :ParcelName, :Flags, :ListingPrice 
-                                Where not exists( Select ""classifieduuid"" from classifieds where ""classifieduuid"" = :ClassifiedId );
-
-                           update classifieds
-                              set category =:Category, 
-                                  expirationdate = :ExpirationDate, 
-                                  name = :Name, 
-                                  description  = :Description, 
-                                  parentestate = :ParentEstate, 
-                                  posglobal       = :GlobalPos, 
-                                  parcelname      = :ParcelName,
-                                  classifiedflags = :Flags, 
-                                  priceforlisting = :ListingPrice, 
-                                  snapshotuuid    = :SnapshotId
-                            where classifieduuid = :ClassifiedId ;
-                                ";
-            
-            if(string.IsNullOrEmpty(ad.ParcelName))
+            string query = string.Empty;
+
+            query = @"WITH upsert AS (
+                        UPDATE classifieds SET
+                            classifieduuid = :ClassifiedId, creatoruuid = :CreatorId, creationdate = :CreatedDate,
+                            expirationdate = :ExpirationDate,category =:Category, name = :Name, description = :Description,
+                            parceluuid = :ParcelId, parentestate = :ParentEstate, snapshotuuid = :SnapshotId,
+                            simname = :SimName, posglobal = :GlobalPos, parcelname = :ParcelName, classifiedflags = :Flags,
+                            priceforlisting = :ListingPrice
+                        RETURNING * )
+                      INSERT INTO classifieds (classifieduuid,creatoruuid,creationdate,expirationdate,category,name,
+                            description,parceluuid,parentestate,snapshotuuid,simname,posglobal,parcelname,classifiedflags,
+                            priceforlisting)
+                      SELECT
+                            :ClassifiedId,:CreatorId,:CreatedDate,:ExpirationDate,:Category,:Name,:Description,
+                            :ParcelId,:ParentEstate,:SnapshotId,:SimName,:GlobalPos,:ParcelName,:Flags,:ListingPrice
+                      WHERE NOT EXISTS (
+                        SELECT * FROM upsert )";
+
+            if (string.IsNullOrEmpty(ad.ParcelName))
                 ad.ParcelName = "Unknown";
-            if(ad.ParcelId == null)
+            if (ad.ParcelId == null)
                 ad.ParcelId = UUID.Zero;
-            if(string.IsNullOrEmpty(ad.Description))
+            if (string.IsNullOrEmpty(ad.Description))
                 ad.Description = "No Description";
-            
+
             DateTime epoch = new DateTime(1970, 1, 1);
             DateTime now = DateTime.Now;
             TimeSpan epochnow = now - epoch;
             TimeSpan duration;
             DateTime expiration;
             TimeSpan epochexp;
-            
-            if(ad.Flags == 2)
+
+            if (ad.Flags == 2)
             {
-                duration = new TimeSpan(7,0,0,0);
+                duration = new TimeSpan(7, 0, 0, 0);
                 expiration = now.Add(duration);
                 epochexp = expiration - epoch;
             }
             else
             {
-                duration = new TimeSpan(365,0,0,0);
+                duration = new TimeSpan(365, 0, 0, 0);
                 expiration = now.Add(duration);
                 epochexp = expiration - epoch;
             }
             ad.CreationDate = (int)epochnow.TotalSeconds;
             ad.ExpirationDate = (int)epochexp.TotalSeconds;
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -190,76 +186,71 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ClassifiedId", ad.ClassifiedId.ToString());
-                        cmd.Parameters.AddWithValue("CreatorId", ad.CreatorId.ToString());
-                        cmd.Parameters.AddWithValue("CreatedDate", ad.CreationDate.ToString());
-                        cmd.Parameters.AddWithValue("ExpirationDate", ad.ExpirationDate.ToString());
-                        cmd.Parameters.AddWithValue("Category", ad.Category.ToString());
-                        cmd.Parameters.AddWithValue("Name", ad.Name.ToString());
-                        cmd.Parameters.AddWithValue("Description", ad.Description.ToString());
-                        cmd.Parameters.AddWithValue("ParcelId", ad.ParcelId.ToString());
-                        cmd.Parameters.AddWithValue("ParentEstate", ad.ParentEstate.ToString());
-                        cmd.Parameters.AddWithValue("SnapshotId", ad.SnapshotId.ToString ());
-                        cmd.Parameters.AddWithValue("SimName", ad.SimName.ToString());
-                        cmd.Parameters.AddWithValue("GlobalPos", ad.GlobalPos.ToString());
-                        cmd.Parameters.AddWithValue("ParcelName", ad.ParcelName.ToString());
-                        cmd.Parameters.AddWithValue("Flags", ad.Flags.ToString());
-                        cmd.Parameters.AddWithValue("ListingPrice", ad.Price.ToString ());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", ad.ClassifiedId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", ad.CreatorId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatedDate", (int)ad.CreationDate));
+                        cmd.Parameters.Add(m_database.CreateParameter("ExpirationDate", (int)ad.ExpirationDate));
+                        cmd.Parameters.Add(m_database.CreateParameter("Category", ad.Category.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Name", ad.Name.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Description", ad.Description.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelId", ad.ParcelId));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParentEstate", (int)ad.ParentEstate));
+                        cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", ad.SnapshotId));
+                        cmd.Parameters.Add(m_database.CreateParameter("SimName", ad.SimName.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", ad.GlobalPos.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelName", ad.ParcelName.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Flags", (int)Convert.ToInt32(ad.Flags)));
+                        cmd.Parameters.Add(m_database.CreateParameter("ListingPrice", (int)Convert.ToInt32(ad.Price)));
+
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": ClassifiedesUpdate exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: ClassifiedsUpdate exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
-        
-       
+
         public bool DeleteClassifiedRecord(UUID recordId)
         {
             string query = string.Empty;
-            
-            query = @"DELETE FROM classifieds WHERE classifieduuid = :ClasifiedId ;";
-            
+
+            query = @"DELETE FROM classifieds WHERE classifieduuid = :ClassifiedId ;";
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
                 {
                     dbcon.Open();
-                    
+
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ClassifiedId", recordId.ToString());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId));
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": DeleteClassifiedRecord exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: DeleteClassifiedRecord exception ", e);
                 return false;
             }
+
             return true;
         }
-        
+
         public bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result)
         {
             string query = string.Empty;
-            
+
             query += "SELECT * FROM classifieds WHERE ";
             query += "classifieduuid = :AdId";
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -267,15 +258,15 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("AdId", ad.ClassifiedId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("AdId", ad.ClassifiedId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
-                            if(reader.Read ())
+                            if (reader.Read())
                             {
-                                ad.CreatorId = GetUUID(reader["creatoruuid"]);
-                                ad.ParcelId = GetUUID(reader["parceluuid"]);
-                                ad.SnapshotId = GetUUID(reader["snapshotuuid"]);
+                                ad.CreatorId = DBGuid.FromDB(reader["creatoruuid"]);
+                                ad.ParcelId = DBGuid.FromDB(reader["parceluuid"]);
+                                ad.SnapshotId = DBGuid.FromDB(reader["snapshotuuid"]);
                                 ad.CreationDate = Convert.ToInt32(reader["creationdate"]);
                                 ad.ExpirationDate = Convert.ToInt32(reader["expirationdate"]);
                                 ad.ParentEstate = Convert.ToInt32(reader["parentestate"]);
@@ -287,7 +278,6 @@ namespace OpenSim.Data.PGSQL
                                 ad.SimName = reader["simname"].ToString();
                                 ad.GlobalPos = reader["posglobal"].ToString();
                                 ad.ParcelName = reader["parcelname"].ToString();
-                                
                             }
                         }
                     }
@@ -296,13 +286,14 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetPickInfo exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetClassifiedInfo exception ", e);
             }
+
             return true;
         }
 
-        public static UUID GetUUID( object uuidValue ) {
+        public static UUID GetUUID(object uuidValue)
+        {
 
             UUID ret = UUID.Zero;
 
@@ -311,18 +302,17 @@ namespace OpenSim.Data.PGSQL
             return ret;
         }
 
-
         #endregion Classifieds Queries
 
         #region Picks Queries
         public OSDArray GetAvatarPicks(UUID avatarId)
         {
             string query = string.Empty;
-            
-            query += "SELECT \"pickuuid\",\"name\" FROM userpicks WHERE ";
+
+            query += "SELECT pickuuid, name FROM userpicks WHERE ";
             query += "creatoruuid = :Id";
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -330,18 +320,18 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 while (reader.Read())
                                 {
                                     OSDMap record = new OSDMap();
-                                    
-                                    record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
-                                    record.Add("name",OSD.FromString((string)reader["name"]));
+
+                                    record.Add("pickuuid", OSD.FromUUID(DBGuid.FromDB(reader["pickuuid"])));
+                                    record.Add("name", OSD.FromString((string)reader["name"]));
                                     data.Add(record);
                                 }
                             }
@@ -351,21 +341,21 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetAvatarPicks exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetAvatarPicks exception ", e);
             }
+
             return data;
         }
-        
+
         public UserProfilePick GetPickInfo(UUID avatarId, UUID pickId)
         {
             string query = string.Empty;
             UserProfilePick pick = new UserProfilePick();
-            
+
             query += "SELECT * FROM userpicks WHERE ";
             query += "creatoruuid = :CreatorId AND ";
             query += "pickuuid =  :PickId";
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -373,32 +363,32 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("CreatorId", avatarId.ToString());
-                        cmd.Parameters.AddWithValue("PickId", pickId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", avatarId));
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pickId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 reader.Read();
-                                
+
                                 string description = (string)reader["description"];
-                                
+
                                 if (string.IsNullOrEmpty(description))
                                     description = "No description given.";
-                                
-                                UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
-                                UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
-                                UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
-                                UUID.TryParse((string)reader["snapshotuuid"], out pick.SnapshotId);
-                                pick.GlobalPos = (string)reader["posglobal"];
-                                bool.TryParse((string)reader["toppick"], out pick.TopPick);
-                                bool.TryParse((string)reader["enabled"], out pick.Enabled);
-                                pick.Name = (string)reader["name"];
-                                pick.Desc = description;
-                                pick.User = (string)reader["user"];
-                                pick.OriginalName = (string)reader["originalname"];
-                                pick.SimName = (string)reader["simname"];
+
+                                pick.PickId = DBGuid.FromDB(reader["pickuuid"]);
+                                pick.CreatorId = DBGuid.FromDB(reader["creatoruuid"]);
+                                pick.ParcelId = DBGuid.FromDB(reader["parceluuid"]);
+                                pick.SnapshotId = DBGuid.FromDB(reader["snapshotuuid"]);
+                                pick.GlobalPos = (string)reader["posglobal"].ToString();
+                                pick.TopPick = Convert.ToBoolean(reader["toppick"]);
+                                pick.Enabled = Convert.ToBoolean(reader["enabled"]);
+                                pick.Name = reader["name"].ToString();
+                                pick.Desc = reader["description"].ToString();
+                                pick.ParcelName = reader["user"].ToString();
+                                pick.OriginalName = reader["originalname"].ToString();
+                                pick.SimName = reader["simname"].ToString();
                                 pick.SortOrder = (int)reader["sortorder"];
                             }
                         }
@@ -408,30 +398,32 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetPickInfo exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetPickInfo exception ", e);
             }
+
             return pick;
         }
-        
+
         public bool UpdatePicksRecord(UserProfilePick pick)
-        {       
+        {
             string query = string.Empty;
 
-            query = @"INSERT INTO userpicks VALUES ( :PickId, :CreatorId, :TopPick, :ParcelId,:Name, :Desc, :SnapshotId,:User,
-                          :Original, :SimName, :GlobalPos, :SortOrder, :Enabled) 
-                      where not exists ( select pickid from userpicks where pickid = :pickid);
-
-                     Update userpicks
-                        set parceluuid = :ParcelId,
-                            name = :Name,
-                            description  = :Desc,
-                            snapshotuuid = :SnapshotId,
-                            pickuuid     = :PickId,
-                            posglobal    = :GlobalPos
-                       where pickid = :PickId;
-                    ";
-            
+
+            query = @"WITH upsert AS (
+                        UPDATE userpicks SET
+                            pickuuid = :PickId, creatoruuid = :CreatorId, toppick = :TopPick, parceluuid = :ParcelId,
+                            name = :Name, description = :Desc, snapshotuuid = :SnapshotId, ""user"" = :User, 
+                            originalname = :Original, simname = :SimName, posglobal = :GlobalPos, 
+                            sortorder = :SortOrder, enabled = :Enabled 
+                        RETURNING * ) 
+                      INSERT INTO userpicks (pickuuid,creatoruuid,toppick,parceluuid,name,description,
+                            snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled) 
+                      SELECT
+                            :PickId,:CreatorId,:TopPick,:ParcelId,:Name,:Desc,:SnapshotId,:User,
+                            :Original,:SimName,:GlobalPos,:SortOrder,:Enabled 
+                      WHERE NOT EXISTS (
+                        SELECT * FROM upsert )";
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -439,74 +431,76 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("PickId", pick.PickId.ToString());
-                        cmd.Parameters.AddWithValue("CreatorId", pick.CreatorId.ToString());
-                        cmd.Parameters.AddWithValue("TopPick", pick.TopPick.ToString());
-                        cmd.Parameters.AddWithValue("ParcelId", pick.ParcelId.ToString());
-                        cmd.Parameters.AddWithValue("Name", pick.Name.ToString());
-                        cmd.Parameters.AddWithValue("Desc", pick.Desc.ToString());
-                        cmd.Parameters.AddWithValue("SnapshotId", pick.SnapshotId.ToString());
-                        cmd.Parameters.AddWithValue("User", pick.User.ToString());
-                        cmd.Parameters.AddWithValue("Original", pick.OriginalName.ToString());
-                        cmd.Parameters.AddWithValue("SimName",pick.SimName.ToString());
-                        cmd.Parameters.AddWithValue("GlobalPos", pick.GlobalPos);
-                        cmd.Parameters.AddWithValue("SortOrder", pick.SortOrder.ToString ());
-                        cmd.Parameters.AddWithValue("Enabled", pick.Enabled.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pick.PickId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", pick.CreatorId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TopPick", pick.TopPick));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelId", pick.ParcelId));
+                        cmd.Parameters.Add(m_database.CreateParameter("Name", pick.Name));
+                        cmd.Parameters.Add(m_database.CreateParameter("Desc", pick.Desc));
+                        cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", pick.SnapshotId));
+                        cmd.Parameters.Add(m_database.CreateParameter("User", pick.ParcelName));
+                        cmd.Parameters.Add(m_database.CreateParameter("Original", pick.OriginalName));
+                        cmd.Parameters.Add(m_database.CreateParameter("SimName", pick.SimName));
+                        cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", pick.GlobalPos));
+                        cmd.Parameters.Add(m_database.CreateParameter("SortOrder", pick.SortOrder));
+                        cmd.Parameters.Add(m_database.CreateParameter("Enabled", pick.Enabled));
+
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarNotes exception ", e);
                 return false;
             }
+
             return true;
         }
-        
+
         public bool DeletePicksRecord(UUID pickId)
         {
             string query = string.Empty;
-            
+
             query += "DELETE FROM userpicks WHERE ";
             query += "pickuuid = :PickId";
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
                 {
                     dbcon.Open();
-                    
+
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("PickId", pickId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pickId));
+
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": DeleteUserPickRecord exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: DeleteUserPickRecord exception ", e);
                 return false;
             }
+
             return true;
         }
+
         #endregion Picks Queries
-        
+
         #region Avatar Notes Queries
+
         public bool GetAvatarNotes(ref UserProfileNotes notes)
         {  // WIP
             string query = string.Empty;
-            
-            query += "SELECT \"notes\" FROM usernotes WHERE ";
+
+            query += "SELECT notes FROM usernotes WHERE ";
             query += "useruuid = :Id AND ";
             query += "targetuuid = :TargetId";
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -514,12 +508,12 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", notes.UserId.ToString());
-                        cmd.Parameters.AddWithValue("TargetId", notes.TargetId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", notes.UserId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TargetId", notes.TargetId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 reader.Read();
                                 notes.Notes = OSD.FromString((string)reader["notes"]);
@@ -530,18 +524,18 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetAvatarNotes exception ", e);
             }
+
             return true;
         }
-        
+
         public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
-        {          
+        {
             string query = string.Empty;
             bool remove;
-            
-            if(string.IsNullOrEmpty(note.Notes))
+
+            if (string.IsNullOrEmpty(note.Notes))
             {
                 remove = true;
                 query += "DELETE FROM usernotes WHERE ";
@@ -551,16 +545,16 @@ namespace OpenSim.Data.PGSQL
             else
             {
                 remove = false;
-                query = @"INSERT INTO usernotes VALUES ( :UserId, :TargetId, :Notes )
-                            where not exists ( Select useruuid from usernotes where useruuid = :UserId and targetuuid = :TargetId );
-
-                           update usernotes
-                              set notes = :Notes
-                            where useruuid = :UserId 
-                              and targetuuid = :TargetId;
-                        ";
+
+                query = @"WITH upsert AS (
+                          UPDATE usernotes SET notes = :Notes, useruuid = :UserId, targetuuid = :TargetId RETURNING * )
+                          INSERT INTO usernotes (notes,useruuid,targetuuid)
+                          SELECT :Notes,:UserId,:TargetId
+                            WHERE NOT EXISTS (
+                              SELECT * FROM upsert
+                            )";
             }
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -568,34 +562,36 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        if(!remove)
-                            cmd.Parameters.AddWithValue("Notes", note.Notes);
-                        cmd.Parameters.AddWithValue("TargetId", note.TargetId.ToString ());
-                        cmd.Parameters.AddWithValue("UserId", note.UserId.ToString());
-                        
+                        if (!remove)
+                            cmd.Parameters.Add(m_database.CreateParameter("Notes", note.Notes));
+
+                        cmd.Parameters.Add(m_database.CreateParameter("TargetId", note.TargetId));
+                        cmd.Parameters.Add(m_database.CreateParameter("UserId", note.UserId));
+
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarNotes exception ", e);
                 return false;
             }
+
             return true;
-            
         }
+
         #endregion Avatar Notes Queries
-        
+
         #region Avatar Properties
+
         public bool GetAvatarProperties(ref UserProfileProperties props, ref string result)
         {
             string query = string.Empty;
-            
+
             query += "SELECT * FROM userprofile WHERE ";
             query += "useruuid = :Id";
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -603,21 +599,21 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", props.UserId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", props.UserId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
-                                m_log.DebugFormat("[PROFILES_DATA]" +
-                                                  ": Getting data for {0}.", props.UserId);
+                                // m_log.DebugFormat("[PROFILES_DATA]" +
+                                //                  ": Getting data for {0}.", props.UserId);
                                 reader.Read();
-                                props.WebUrl = (string)reader["profileURL"];
-                                UUID.TryParse((string)reader["profileImage"], out props.ImageId);
+                                props.WebUrl = (string)reader["profileURL"].ToString();
+                                props.ImageId = DBGuid.FromDB(reader["profileImage"]);
                                 props.AboutText = (string)reader["profileAboutText"];
-                                UUID.TryParse((string)reader["profileFirstImage"], out props.FirstLifeImageId);
+                                props.FirstLifeImageId = DBGuid.FromDB(reader["profileFirstImage"]);
                                 props.FirstLifeText = (string)reader["profileFirstText"];
-                                UUID.TryParse((string)reader["profilePartner"], out props.PartnerId);
+                                props.PartnerId = DBGuid.FromDB(reader["profilePartner"]);
                                 props.WantToMask = (int)reader["profileWantToMask"];
                                 props.WantToText = (string)reader["profileWantToText"];
                                 props.SkillsMask = (int)reader["profileSkillsMask"];
@@ -626,9 +622,9 @@ namespace OpenSim.Data.PGSQL
                             }
                             else
                             {
-                                m_log.DebugFormat("[PROFILES_DATA]" +
-                                                 ": No data for {0}", props.UserId);
-                               
+                                //m_log.DebugFormat("[PROFILES_DATA]" +
+                                //                 ": No data for {0}", props.UserId);
+
                                 props.WebUrl = string.Empty;
                                 props.ImageId = UUID.Zero;
                                 props.AboutText = string.Empty;
@@ -645,19 +641,19 @@ namespace OpenSim.Data.PGSQL
 
                                 query = "INSERT INTO userprofile (";
                                 query += "useruuid, ";
-                                query += "profilePartner, ";
-                                query += "profileAllowPublish, ";
-                                query += "profileMaturePublish, ";
-                                query += "profileURL, ";
-                                query += "profileWantToMask, ";
-                                query += "profileWantToText, ";
-                                query += "profileSkillsMask, ";
-                                query += "profileSkillsText, ";
-                                query += "profileLanguages, ";
-                                query += "profileImage, ";
-                                query += "profileAboutText, ";
-                                query += "profileFirstImage, ";
-                                query += "profileFirstText) VALUES (";
+                                query += "\"profilePartner\", ";
+                                query += "\"profileAllowPublish\", ";
+                                query += "\"profileMaturePublish\", ";
+                                query += "\"profileURL\", ";
+                                query += "\"profileWantToMask\", ";
+                                query += "\"profileWantToText\", ";
+                                query += "\"profileSkillsMask\", ";
+                                query += "\"profileSkillsText\", ";
+                                query += "\"profileLanguages\", ";
+                                query += "\"profileImage\", ";
+                                query += "\"profileAboutText\", ";
+                                query += "\"profileFirstImage\", ";
+                                query += "\"profileFirstText\") VALUES (";
                                 query += ":userId, ";
                                 query += ":profilePartner, ";
                                 query += ":profileAllowPublish, ";
@@ -678,20 +674,23 @@ namespace OpenSim.Data.PGSQL
 
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
-                                    put.Parameters.AddWithValue("userId", props.UserId.ToString());
-                                    put.Parameters.AddWithValue("profilePartner", props.PartnerId.ToString());
-                                    put.Parameters.AddWithValue("profileAllowPublish", props.PublishProfile);
-                                    put.Parameters.AddWithValue("profileMaturePublish", props.PublishMature);
-                                    put.Parameters.AddWithValue("profileURL", props.WebUrl);
-                                    put.Parameters.AddWithValue("profileWantToMask", props.WantToMask);
-                                    put.Parameters.AddWithValue("profileWantToText", props.WantToText);
-                                    put.Parameters.AddWithValue("profileSkillsMask", props.SkillsMask);
-                                    put.Parameters.AddWithValue("profileSkillsText", props.SkillsText);
-                                    put.Parameters.AddWithValue("profileLanguages", props.Language);
-                                    put.Parameters.AddWithValue("profileImage", props.ImageId.ToString());
-                                    put.Parameters.AddWithValue("profileAboutText", props.AboutText);
-                                    put.Parameters.AddWithValue("profileFirstImage", props.FirstLifeImageId.ToString());
-                                    put.Parameters.AddWithValue("profileFirstText", props.FirstLifeText);
+                                    //m_log.DebugFormat("[PROFILES_DATA]" +
+                                    //                  ": Adding new data for {0}", props.UserId);
+
+                                    put.Parameters.Add(m_database.CreateParameter("userId", props.UserId));
+                                    put.Parameters.Add(m_database.CreateParameter("profilePartner", props.PartnerId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileAllowPublish", props.PublishProfile));
+                                    put.Parameters.Add(m_database.CreateParameter("profileMaturePublish", props.PublishMature));
+                                    put.Parameters.Add(m_database.CreateParameter("profileURL", props.WebUrl));
+                                    put.Parameters.Add(m_database.CreateParameter("profileWantToMask", props.WantToMask));
+                                    put.Parameters.Add(m_database.CreateParameter("profileWantToText", props.WantToText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileSkillsMask", props.SkillsMask));
+                                    put.Parameters.Add(m_database.CreateParameter("profileSkillsText", props.SkillsText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileLanguages", props.Language));
+                                    put.Parameters.Add(m_database.CreateParameter("profileImage", props.ImageId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileAboutText", props.AboutText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileFirstImage", props.FirstLifeImageId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileFirstText", props.FirstLifeText));
 
                                     put.ExecuteNonQuery();
                                 }
@@ -702,26 +701,26 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": Requst properties exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetAvatarProperties exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
-        
+
         public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
-        {            
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
-            query += "profileURL=:profileURL, ";
-            query += "profileImage=:image, ";
-            query += "profileAboutText=:abouttext,";
-            query += "profileFirstImage=:firstlifeimage,";
-            query += "profileFirstText=:firstlifetext ";
-            query += "WHERE useruuid=:uuid";
-            
+            query += "\"profileURL\"=:profileURL, ";
+            query += "\"profileImage\"=:image, ";
+            query += "\"profileAboutText\"=:abouttext,";
+            query += "\"profileFirstImage\"=:firstlifeimage,";
+            query += "\"profileFirstText\"=:firstlifetext ";
+            query += "WHERE \"useruuid\"=:uuid";
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -729,41 +728,42 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("profileURL", props.WebUrl);
-                        cmd.Parameters.AddWithValue("image", props.ImageId.ToString());
-                        cmd.Parameters.AddWithValue("abouttext", props.AboutText);
-                        cmd.Parameters.AddWithValue("firstlifeimage", props.FirstLifeImageId.ToString());
-                        cmd.Parameters.AddWithValue("firstlifetext", props.FirstLifeText);
-                        cmd.Parameters.AddWithValue("uuid", props.UserId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("profileURL", props.WebUrl));
+                        cmd.Parameters.Add(m_database.CreateParameter("image", props.ImageId));
+                        cmd.Parameters.Add(m_database.CreateParameter("abouttext", props.AboutText));
+                        cmd.Parameters.Add(m_database.CreateParameter("firstlifeimage", props.FirstLifeImageId));
+                        cmd.Parameters.Add(m_database.CreateParameter("firstlifetext", props.FirstLifeText));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", props.UserId));
+
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": AgentPropertiesUpdate exception {0}", e.Message);
-                
+                m_log.Error("[PROFILES_DATA]: AgentPropertiesUpdate exception ", e);
                 return false;
             }
+
             return true;
         }
+
         #endregion Avatar Properties
-        
+
         #region Avatar Interests
+
         public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
-        {           
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
-            query += "profileWantToMask=:WantMask, ";
-            query += "profileWantToText=:WantText,";
-            query += "profileSkillsMask=:SkillsMask,";
-            query += "profileSkillsText=:SkillsText, ";
-            query += "profileLanguages=:Languages ";
-            query += "WHERE useruuid=:uuid";
-            
+            query += "\"profileWantToMask\"=:WantMask, ";
+            query += "\"profileWantToText\"=:WantText,";
+            query += "\"profileSkillsMask\"=:SkillsMask,";
+            query += "\"profileSkillsText\"=:SkillsText, ";
+            query += "\"profileLanguages\"=:Languages ";
+            query += "WHERE \"useruuid\"=:uuid";
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -771,26 +771,27 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("WantMask", up.WantToMask);
-                        cmd.Parameters.AddWithValue("WantText", up.WantToText);
-                        cmd.Parameters.AddWithValue("SkillsMask", up.SkillsMask);
-                        cmd.Parameters.AddWithValue("SkillsText", up.SkillsText);
-                        cmd.Parameters.AddWithValue("Languages", up.Language);
-                        cmd.Parameters.AddWithValue("uuid", up.UserId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("WantMask", up.WantToMask));
+                        cmd.Parameters.Add(m_database.CreateParameter("WantText", up.WantToText));
+                        cmd.Parameters.Add(m_database.CreateParameter("SkillsMask", up.SkillsMask));
+                        cmd.Parameters.Add(m_database.CreateParameter("SkillsText", up.SkillsText));
+                        cmd.Parameters.Add(m_database.CreateParameter("Languages", up.Language));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", up.UserId));
+
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarInterests exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
+
         #endregion Avatar Interests
 
         public OSDArray GetUserImageAssets(UUID avatarId)
@@ -798,26 +799,23 @@ namespace OpenSim.Data.PGSQL
             OSDArray data = new OSDArray();
             string query = "SELECT \"snapshotuuid\" FROM {0} WHERE \"creatoruuid\" = :Id";
 
-            // Get classified image assets
-            
-            
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
                 {
                     dbcon.Open();
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"classifieds\""), dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format(query, "\"classifieds\""), dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -826,39 +824,39 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Close();
                     dbcon.Open();
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format(query, "\"userpicks\""), dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
                     }
-                    
+
                     dbcon.Close();
                     dbcon.Open();
 
                     query = "SELECT \"profileImage\", \"profileFirstImage\" FROM \"userprofile\" WHERE \"useruuid\" = :Id";
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format(query, "\"userpicks\""), dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["profileImage"].ToString ()));
-                                    data.Add(new OSDString((string)reader["profileFirstImage"].ToString ()));
+                                    data.Add(new OSDString(reader["profileImage"].ToString()));
+                                    data.Add(new OSDString(reader["profileFirstImage"].ToString()));
                                 }
                             }
                         }
@@ -867,23 +865,24 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                  ": GetAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetUserImageAssets exception ", e);
             }
+
             return data;
         }
-        
+
         #region User Preferences
-        public OSDArray GetUserPreferences(UUID avatarId)
+
+        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
         {
             string query = string.Empty;
-            
-            query += "SELECT imviaemail,visible,email FROM ";
+
+            query += "SELECT imviaemail::VARCHAR,visible::VARCHAR,email FROM ";
             query += "usersettings WHERE ";
             query += "useruuid = :Id";
-            
+
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -891,31 +890,26 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", pref.UserId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 reader.Read();
-                                OSDMap record = new OSDMap();
-                                
-                                record.Add("imviaemail",OSD.FromString((string)reader["imviaemail"]));
-                                record.Add("visible",OSD.FromString((string)reader["visible"]));
-                                record.Add("email",OSD.FromString((string)reader["email"]));
-                                data.Add(record);
+                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
+                                bool.TryParse((string)reader["visible"], out pref.Visible);
+                                pref.EMail = (string)reader["email"];
                             }
                             else
                             {
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
+                                    put.Parameters.Add(m_database.CreateParameter("Id", pref.UserId));
                                     query = "INSERT INTO usersettings VALUES ";
                                     query += "(:Id,'false','false', '')";
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -924,21 +918,23 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": Get preferences exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetUserPreferences exception ", e);
+                result = e.Message;
             }
-            return data;
+
+            return true;
         }
-        
-        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
-        {           
+
+        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
+        {
             string query = string.Empty;
-            
-            query += "UPDATE userpsettings SET ";
+
+            query += "UPDATE usersettings SET ";
             query += "imviaemail=:ImViaEmail, ";
-            query += "visible=:Visible,";
+            query += "visible=:Visible, ";
+            query += "email=:Email ";
             query += "WHERE useruuid=:uuid";
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -946,36 +942,37 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ImViaEmail", emailIm.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("WantText", visible.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("uuid", avatarId.ToString());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail));
+                        cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible));
+                        cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower()));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId));
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateUserPreferences exception ", e);
+                result = e.Message;
                 return false;
             }
+
             return true;
         }
+
         #endregion User Preferences
-        
+
         #region Integration
+
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
             string query = string.Empty;
-            
+
             query += "SELECT * FROM userdata WHERE ";
             query += "\"UserId\" = :Id AND ";
             query += "\"TagId\" = :TagId";
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -983,12 +980,12 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", props.UserId.ToString());
-                        cmd.Parameters.AddWithValue (":TagId", props.TagId.ToString());
-                        
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", props.UserId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
+
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 reader.Read();
                                 props.DataKey = (string)reader["DataKey"];
@@ -1000,19 +997,16 @@ namespace OpenSim.Data.PGSQL
                                 query += ":UserId,";
                                 query += ":TagId,";
                                 query += ":DataKey,";
-                                query +=  ":DataVal) ";
-                                
+                                query += ":DataVal) ";
+
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
-                                    put.Parameters.AddWithValue("Id", props.UserId.ToString());
-                                    put.Parameters.AddWithValue("TagId", props.TagId.ToString());
-                                    put.Parameters.AddWithValue("DataKey", props.DataKey.ToString());
-                                    put.Parameters.AddWithValue("DataVal", props.DataVal.ToString());
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+                                    put.Parameters.Add(m_database.CreateParameter("UserId", props.UserId));
+                                    put.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
+                                    put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
+                                    put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -1021,25 +1015,25 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": Requst application data exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetUserAppData exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
 
         public bool SetUserAppData(UserAppData props, ref string result)
-        {         
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userdata SET ";
             query += "\"TagId\" = :TagId, ";
             query += "\"DataKey\" = :DataKey, ";
             query += "\"DataVal\" = :DataVal WHERE ";
             query += "\"UserId\" = :UserId AND ";
             query += "\"TagId\" = :TagId";
-            
+
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -1047,27 +1041,24 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("UserId", props.UserId.ToString());
-                        cmd.Parameters.AddWithValue("TagId", props.TagId.ToString ());
-                        cmd.Parameters.AddWithValue("DataKey", props.DataKey.ToString ());
-                        cmd.Parameters.AddWithValue("DataVal", props.DataKey.ToString ());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.Add(m_database.CreateParameter("UserId", props.UserId.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString()));
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": SetUserData exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: SetUserData exception ", e);
                 return false;
             }
+
             return true;
         }
+
         #endregion Integration
     }
-}
-
+}
\ No newline at end of file