diff options
Diffstat (limited to '')
5 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs index 509004d..cdb233d 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs | |||
@@ -118,7 +118,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps | |||
118 | 118 | ||
119 | public string UpdateAgentPreferences(string request, string path, string param, UUID agent) | 119 | public string UpdateAgentPreferences(string request, string path, string param, UUID agent) |
120 | { | 120 | { |
121 | m_log.DebugFormat("[AgentPrefs] UpdateAgentPreferences for {0}", agent.ToString()); | 121 | m_log.DebugFormat("[AgentPrefs]: UpdateAgentPreferences for {0}", agent.ToString()); |
122 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 122 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
123 | AgentPrefs data = m_scenes[0].AgentPreferencesService.GetAgentPreferences(agent); | 123 | AgentPrefs data = m_scenes[0].AgentPreferencesService.GetAgentPreferences(agent); |
124 | if (data == null) | 124 | if (data == null) |
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(); |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 93a5437..1fbd171 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -97,6 +97,9 @@ | |||
97 | [Friends] | 97 | [Friends] |
98 | Connector = "OpenSim.Services.FriendsService.dll" | 98 | Connector = "OpenSim.Services.FriendsService.dll" |
99 | 99 | ||
100 | [AgentPreferencesService] | ||
101 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService" | ||
102 | |||
100 | [LoginService] | 103 | [LoginService] |
101 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" | 104 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" |
102 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 105 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 43cb145..51f7fd0 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -124,6 +124,9 @@ | |||
124 | [Friends] | 124 | [Friends] |
125 | Connector = "OpenSim.Services.FriendsService.dll" | 125 | Connector = "OpenSim.Services.FriendsService.dll" |
126 | 126 | ||
127 | [AgentPreferencesService] | ||
128 | LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService" | ||
129 | |||
127 | [LoginService] | 130 | [LoginService] |
128 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" | 131 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" |
129 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 132 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |