diff options
author | Diva Canto | 2015-06-13 08:36:06 -0700 |
---|---|---|
committer | Diva Canto | 2015-06-13 08:36:06 -0700 |
commit | bcb8a7d7f935c37d6d83aac6a9ba4988e59814c7 (patch) | |
tree | 31243717e91897923c2c5580a96554bb8602bf9b /OpenSim/Services | |
parent | Refactor AgentPreferences so that database operations happen centrally. the o... (diff) | |
download | opensim-SC-bcb8a7d7f935c37d6d83aac6a9ba4988e59814c7.zip opensim-SC-bcb8a7d7f935c37d6d83aac6a9ba4988e59814c7.tar.gz opensim-SC-bcb8a7d7f935c37d6d83aac6a9ba4988e59814c7.tar.bz2 opensim-SC-bcb8a7d7f935c37d6d83aac6a9ba4988e59814c7.tar.xz |
A few bug fixes for Agent Preferences to actually work. Also added missing config for standalone.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Interfaces/IAgentPreferencesService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/UserAccountService/AgentPreferencesService.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs index b74b580..3b4fda2 100644 --- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs +++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim.Services.Interfaces | |||
35 | { | 35 | { |
36 | public AgentPrefs(UUID principalID) | 36 | public AgentPrefs(UUID principalID) |
37 | { | 37 | { |
38 | principalID = PrincipalID; | 38 | PrincipalID = principalID; |
39 | } | 39 | } |
40 | 40 | ||
41 | public AgentPrefs(Dictionary<string, string> kvp) | 41 | public AgentPrefs(Dictionary<string, string> kvp) |
diff --git a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs index f8d2e29..1808ee5 100644 --- a/OpenSim/Services/UserAccountService/AgentPreferencesService.cs +++ b/OpenSim/Services/UserAccountService/AgentPreferencesService.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.Reflection; | 30 | using System.Reflection; |
30 | using log4net; | 31 | using log4net; |
31 | using Nini.Config; | 32 | using Nini.Config; |
@@ -55,11 +56,12 @@ namespace OpenSim.Services.UserAccountService | |||
55 | public bool StoreAgentPreferences(AgentPrefs data) | 56 | public bool StoreAgentPreferences(AgentPrefs data) |
56 | { | 57 | { |
57 | AgentPreferencesData d = new AgentPreferencesData(); | 58 | AgentPreferencesData d = new AgentPreferencesData(); |
59 | d.Data = new Dictionary<string, string>(); | ||
58 | d.Data["PrincipalID"] = data.PrincipalID.ToString(); | 60 | d.Data["PrincipalID"] = data.PrincipalID.ToString(); |
59 | d.Data["AccessPrefs"] = data.AccessPrefs; | 61 | d.Data["AccessPrefs"] = data.AccessPrefs; |
60 | d.Data["HoverHeight"] = data.HoverHeight.ToString(); | 62 | d.Data["HoverHeight"] = data.HoverHeight.ToString(); |
61 | d.Data["Language"] = data.Language; | 63 | d.Data["Language"] = data.Language; |
62 | d.Data["LanguageIsPublic"] = data.LanguageIsPublic.ToString(); | 64 | d.Data["LanguageIsPublic"] = (data.LanguageIsPublic ? "1" : "0"); |
63 | d.Data["PermEveryone"] = data.PermEveryone.ToString(); | 65 | d.Data["PermEveryone"] = data.PermEveryone.ToString(); |
64 | d.Data["PermGroup"] = data.PermGroup.ToString(); | 66 | d.Data["PermGroup"] = data.PermGroup.ToString(); |
65 | d.Data["PermNextOwner"] = data.PermNextOwner.ToString(); | 67 | d.Data["PermNextOwner"] = data.PermNextOwner.ToString(); |