seems to compile ( tests comented out)

7 files changed, 42 insertions, 112 deletions

diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
index 0de7f68..a4a32a9 100644
--- a/OpenSim/Data/IProfilesData.cs
+++ b/OpenSim/Data/IProfilesData.cs
@@ -48,6 +48,8 @@ namespace OpenSim.Data
         bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result);
         bool UpdateAvatarInterests(UserProfileProperties up, ref string result);
         bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result);
+        bool UpdateUserPreferences(ref UserPreferences pref, ref string result);
+        bool GetUserPreferences(ref UserPreferences pref, ref string result);
         bool GetUserAppData(ref UserAppData props, ref string result);
         bool SetUserAppData(UserAppData props, ref string result);
         OSDArray GetUserImageAssets(UUID avatarId);
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index cb5a38e..76b1e38 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -202,52 +202,15 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
                             cmd.Parameters.AddWithValue("?data", asset.Data);
                             cmd.ExecuteNonQuery();
-                        }
-    
-                        string assetDescription = asset.Description;
-                        if (asset.Description.Length > 64)
-                        {
-                            assetDescription = asset.Description.Substring(0, 64);
-                            m_log.WarnFormat(
-                                "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
-                                asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
-                        }
-    
-                        try
-                        {
-                            using (cmd)
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?name", assetName);
-                                cmd.Parameters.AddWithValue("?description", assetDescription);
-                                cmd.Parameters.AddWithValue("?assetType", asset.Type);
-                                cmd.Parameters.AddWithValue("?local", asset.Local);
-                                cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
-                                cmd.Parameters.AddWithValue("?create_time", now);
-                                cmd.Parameters.AddWithValue("?access_time", now);
-                                cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                                cmd.Parameters.AddWithValue("?data", asset.Data);
-                                cmd.ExecuteNonQuery();
-                                return true;
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
-                            return false;
+                            return true;
                         }
                     }
+
                     catch (Exception e)
                     {
-                        m_log.Error(
-                            string.Format(
-                                "[ASSET DB]: MySQL failure creating asset {0} with name {1}.  Exception  ",
-                                asset.FullID, asset.Name)
-                            , e);
+                        m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
+                            asset.FullID, asset.Name, e.Message);
+                        return false;
                     }
                 }
             }
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 81b5ec4..549d129 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1105,7 +1105,7 @@ namespace OpenSim.Data.MySQL
                         "use_estate_sun, fixed_sun, sun_position, " +
                         "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
                         "sunvectorz, loaded_creation_datetime, " +
-                        "loaded_creation_id, map_tile_ID, " +
+                        "loaded_creation_id, map_tile_ID, block_search, casino, " +
                         "TelehubObject, parcel_tile_ID) " +
                          "values (?RegionUUID, ?BlockTerraform, " +
                         "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
@@ -1122,53 +1122,14 @@ namespace OpenSim.Data.MySQL
                         "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
                         "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                         "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                        "?TerrainImageID, " +
+                        "?TerrainImageID, ?block_search, ?casino, " +
                         "?TelehubObject, ?ParcelImageID)";
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "replace into regionsettings (regionUUID, " +
-                            "block_terraform, block_fly, allow_damage, " +
-                            "restrict_pushing, allow_land_resell, " +
-                            "allow_land_join_divide, block_show_in_search, " +
-                            "agent_limit, object_bonus, maturity, " +
-                            "disable_scripts, disable_collisions, " +
-                            "disable_physics, terrain_texture_1, " +
-                            "terrain_texture_2, terrain_texture_3, " +
-                            "terrain_texture_4, elevation_1_nw, " +
-                            "elevation_2_nw, elevation_1_ne, " +
-                            "elevation_2_ne, elevation_1_se, " +
-                            "elevation_2_se, elevation_1_sw, " +
-                            "elevation_2_sw, water_height, " +
-                            "terrain_raise_limit, terrain_lower_limit, " +
-                            "use_estate_sun, fixed_sun, sun_position, " +
-                            "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
-                            "sunvectorz, loaded_creation_datetime, " +
-                            "loaded_creation_id, map_tile_ID, block_search, casino, " +
-                            "TelehubObject, parcel_tile_ID) " +
-                             "values (?RegionUUID, ?BlockTerraform, " +
-                            "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
-                            "?AllowLandResell, ?AllowLandJoinDivide, " +
-                            "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
-                            "?Maturity, ?DisableScripts, ?DisableCollisions, " +
-                            "?DisablePhysics, ?TerrainTexture1, " +
-                            "?TerrainTexture2, ?TerrainTexture3, " +
-                            "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
-                            "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
-                            "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
-                            "?WaterHeight, ?TerrainRaiseLimit, " +
-                            "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
-                            "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
-                            "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
-                            "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                            "?TerrainImageID, ?block_search, ?casino, " +
-                            "?TelehubObject, ?ParcelImageID)";
-
                     ExecuteNonQuery(cmd);
                 }
-            }
 
-            SaveSpawnPoints(rs);
+                SaveSpawnPoints(rs);
+            }
         }
 
         public virtual List<LandData> LoadLandObjects(UUID regionUUID)
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index c213dd1..c241e90 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -896,16 +896,16 @@ namespace OpenSim.Data.MySQL
         }
         
         #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 += "usersettings WHERE ";
             query += "useruuid = ?Id";
-            
+
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -913,33 +913,30 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+                        cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
+
                         using (MySqlDataReader 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
                             {
                                 dbcon.Close();
                                 dbcon.Open();
-                                
+
                                 query = "INSERT INTO usersettings VALUES ";
                                 query += "(?uuid,'false','false', ?Email)";
 
                                 using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
-                                    
-//                                    put.Parameters.AddWithValue("?Email", pref.EMail);
-//                                    put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
+
+                                    put.Parameters.AddWithValue("?Email", pref.EMail);
+                                    put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
 
                                     put.ExecuteNonQuery();
                                 }
@@ -952,20 +949,22 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
+                result = e.Message;
+                return false;
             }
-            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 += "email=?EMail ";
             query += "WHERE useruuid=?uuid";
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -986,6 +985,7 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.ErrorFormat("[PROFILES_DATA]" +
                     ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
+                result = e.Message;
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index 77d87d4..a006c58 100644
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -2227,6 +2227,11 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 9a47e37..70267de 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2013,7 +2013,7 @@ namespace OpenSim.Data.SQLite
             return entry;
         }
 
-        /*
+ 
         /// <summary>
         ///
         /// </summary>
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 70579af..2dfdba3 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -741,7 +741,7 @@ namespace OpenSim.Data.SQLite
             return true;
         }
 
-        /*
+ 
         public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
         {           
             string query = string.Empty;
@@ -826,7 +826,6 @@ namespace OpenSim.Data.SQLite
             }
             return true;
         }
-        */
 
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {