diff options
author | Diva Canto | 2015-06-14 14:49:20 -0700 |
---|---|---|
committer | Diva Canto | 2015-06-14 14:49:20 -0700 |
commit | 4a516fa1569e814aee672e38996e31bc749d43b5 (patch) | |
tree | b36dbc7197b38d874412921f7f934ffdfe8d8ec2 /OpenSim | |
parent | Mantis #7610. Changed AgentPrefs table in PGSQL to use uuid instead of varcha... (diff) | |
download | opensim-SC-4a516fa1569e814aee672e38996e31bc749d43b5.zip opensim-SC-4a516fa1569e814aee672e38996e31bc749d43b5.tar.gz opensim-SC-4a516fa1569e814aee672e38996e31bc749d43b5.tar.bz2 opensim-SC-4a516fa1569e814aee672e38996e31bc749d43b5.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs | 16 | ||||
-rw-r--r-- | OpenSim/Data/PGSQL/Resources/AgentPrefs.migrations | 18 |
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 | |||
44 | 44 | ||
45 | public AgentPreferencesData GetPrefs(UUID agentID) | 45 | public AgentPreferencesData GetPrefs(UUID agentID) |
46 | { | 46 | { |
47 | AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString()); | 47 | // Until someone sends in a table that works |
48 | return null; | ||
49 | //AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString()); | ||
48 | 50 | ||
49 | if (ret.Length == 0) | 51 | //if (ret.Length == 0) |
50 | return null; | 52 | // return null; |
51 | 53 | ||
52 | return ret[0]; | 54 | //return ret[0]; |
55 | } | ||
56 | |||
57 | public override bool Store(AgentPreferencesData row) | ||
58 | { | ||
59 | // Until someone sends in a table that works | ||
60 | return false; | ||
53 | } | 61 | } |
54 | 62 | ||
55 | } | 63 | } |
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 @@ | |||
1 | :VERSION 2 | ||
2 | |||
3 | BEGIN TRANSACTION; | ||
4 | |||
5 | DROP TABLE IF EXISTS "AgentPrefs"; | ||
6 | CREATE TABLE "AgentPrefs" ( | ||
7 | "PrincipalID" uuid NOT NULL, | ||
8 | "AccessPrefs" CHAR(2) NOT NULL DEFAULT 'M', | ||
9 | "HoverHeight" DOUBLE PRECISION NOT NULL DEFAULT 0, | ||
10 | "Language" CHAR(5) NOT NULL DEFAULT 'en-us', | ||
11 | "LanguageIsPublic" BOOLEAN NOT NULL DEFAULT true, | ||
12 | "PermEveryone" INT4 NOT NULL DEFAULT 0, | ||
13 | "PermGroup" INT4 NOT NULL DEFAULT 0, | ||
14 | "PermNextOwner" INT4 NOT NULL DEFAULT 532480 | ||
15 | ); | ||
16 | ALTER TABLE "AgentPrefs" ADD PRIMARY KEY("PrincipalID"); | ||
17 | |||
18 | COMMIT; \ No newline at end of file | ||