Removed the pgsql table for AgentPrefs, because it is not working. For now the Agent Preferences feature will not work with PGSQL installations -- someone who uses PGSQL needs to send a table that works.

2 files changed, 12 insertions, 22 deletions

diff --git a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
index 7f3cbee..20612fe 100644
--- a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
@@ -44,12 +44,20 @@ namespace OpenSim.Data.PGSQL
 
         public AgentPreferencesData GetPrefs(UUID agentID)
         {
-            AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString());
+            // Until someone sends in a table that works
+            return null;
+            //AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString());
 
-            if (ret.Length == 0)
-                return null;
+            //if (ret.Length == 0)
+            //    return null;
 
-            return ret[0];
+            //return ret[0];
+        }
+
+        public override bool Store(AgentPreferencesData row)
+        {
+            // Until someone sends in a table that works
+            return false;
         }
 
     }
diff --git a/OpenSim/Data/PGSQL/Resources/AgentPrefs.migrations b/OpenSim/Data/PGSQL/Resources/AgentPrefs.migrations
deleted file mode 100644
index 6154719..0000000
--- a/OpenSim/Data/PGSQL/Resources/AgentPrefs.migrations
+++ /dev/null
@@ -1,18 +0,0 @@
-:VERSION 2
-
-BEGIN TRANSACTION;
-
-DROP TABLE IF EXISTS "AgentPrefs";
-CREATE TABLE "AgentPrefs" (
-    "PrincipalID" uuid NOT NULL,
-    "AccessPrefs" CHAR(2) NOT NULL DEFAULT 'M',
-    "HoverHeight" DOUBLE PRECISION NOT NULL DEFAULT 0,
-    "Language" CHAR(5) NOT NULL DEFAULT 'en-us',
-    "LanguageIsPublic" BOOLEAN NOT NULL DEFAULT true,
-    "PermEveryone" INT4 NOT NULL DEFAULT 0,
-    "PermGroup" INT4 NOT NULL DEFAULT 0,
-    "PermNextOwner" INT4 NOT NULL DEFAULT 532480
-    );
-    ALTER TABLE "AgentPrefs" ADD PRIMARY KEY("PrincipalID");    
-
-COMMIT;
\ No newline at end of file