2 files changed, 4 insertions, 26 deletions

diff --git a/OpenSim/Data/IAgentPreferencesData.cs b/OpenSim/Data/IAgentPreferencesData.cs
index f8261e2..8763299 100644
--- a/OpenSim/Data/IAgentPreferencesData.cs
+++ b/OpenSim/Data/IAgentPreferencesData.cs
@@ -34,22 +34,13 @@ namespace OpenSim.Data
 {
     public class AgentPreferencesData
     {
-        public UUID PrincipalID = UUID.Zero;
-        public string AccessPrefs = "M";
-        //public int GodLevel;
-        public double HoverHeight = 0.0;
-        public string Language = "en-us";
-        public bool LanguageIsPublic = true;
-        // DefaultObjectPermMasks
-        public int PermEveryone = 0;
-        public int PermGroup = 0;
-        public int PermNextOwner = 532480;
+        public Dictionary<string, string> Data;
     }
 
     public interface IAgentPreferencesData
     {
+        bool Store(AgentPreferencesData data);
         AgentPreferencesData GetPrefs(UUID agentID);
-        void StorePrefs(AgentPreferencesData data);
     }
 }
 
diff --git a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
index cd9004a..bf188ee 100644
--- a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
+++ b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
@@ -52,22 +52,9 @@ namespace OpenSim.Data.MySQL
             return ret[0];
         }
 
-        public void StorePrefs(AgentPreferencesData data)
+        public void Store(AgentPreferencesData data)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("replace into `{0}` (`PrincipalID`, `AccessPrefs`, `HoverHeight`, `Language`, `LanguageIsPublic`, `PermEveryone`, `PermGroup`, `PermNextOwner`) VALUES (?Principal, ?AP, ?HH, ?Lang, ?LIP, ?PE, ?PG, ?PNO)", m_Realm);
-                cmd.Parameters.AddWithValue("?Principal", data.PrincipalID.ToString());
-                cmd.Parameters.AddWithValue("?AP", data.AccessPrefs);
-                cmd.Parameters.AddWithValue("?HH", data.HoverHeight);
-                cmd.Parameters.AddWithValue("?Lang", data.Language);
-                cmd.Parameters.AddWithValue("?LIP", data.LanguageIsPublic);
-                cmd.Parameters.AddWithValue("?PE", data.PermEveryone);
-                cmd.Parameters.AddWithValue("?PG", data.PermGroup);
-                cmd.Parameters.AddWithValue("?PNO", data.PermNextOwner);
-
-                ExecuteNonQuery(cmd);
-            }
+            base.Store(data);
         }
     }
 }