OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few bug fixes for Agent Preferences to actually work. Also added missing config for standalone.

fsassets
Diva Canto 2015-06-13 08:36:06 -07:00
parent 0fa94f222d
commit bcb8a7d7f9
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
View File

@ -118,7 +118,7 @@ namespace OpenSim.Region.ClientStack.LindenCaps
public string UpdateAgentPreferences(string request, string path, string param, UUID agent) public string UpdateAgentPreferences(string request, string path, string param, UUID agent)
{ {
m_log.DebugFormat("[AgentPrefs] UpdateAgentPreferences for {0}", agent.ToString()); m_log.DebugFormat("[AgentPrefs]: UpdateAgentPreferences for {0}", agent.ToString());
OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
AgentPrefs data = m_scenes[0].AgentPreferencesService.GetAgentPreferences(agent); AgentPrefs data = m_scenes[0].AgentPreferencesService.GetAgentPreferences(agent);
if (data == null) if (data == null)

2
OpenSim/Services/Interfaces/IAgentPreferencesService.cs
View File

@ -35,7 +35,7 @@ namespace OpenSim.Services.Interfaces
{ {
public AgentPrefs(UUID principalID) public AgentPrefs(UUID principalID)
{ {
principalID = PrincipalID; PrincipalID = principalID;
} }
public AgentPrefs(Dictionary<string, string> kvp) public AgentPrefs(Dictionary<string, string> kvp)

4
OpenSim/Services/UserAccountService/AgentPreferencesService.cs
View File

@ -26,6 +26,7 @@
*/ */
using System; using System;
using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
@ -55,11 +56,12 @@ namespace OpenSim.Services.UserAccountService
public bool StoreAgentPreferences(AgentPrefs data) public bool StoreAgentPreferences(AgentPrefs data)
{ {
AgentPreferencesData d = new AgentPreferencesData(); AgentPreferencesData d = new AgentPreferencesData();
d.Data = new Dictionary<string, string>();
d.Data["PrincipalID"] = data.PrincipalID.ToString(); d.Data["PrincipalID"] = data.PrincipalID.ToString();
d.Data["AccessPrefs"] = data.AccessPrefs; d.Data["AccessPrefs"] = data.AccessPrefs;
d.Data["HoverHeight"] = data.HoverHeight.ToString(); d.Data["HoverHeight"] = data.HoverHeight.ToString();
d.Data["Language"] = data.Language; d.Data["Language"] = data.Language;
d.Data["LanguageIsPublic"] = data.LanguageIsPublic.ToString(); d.Data["LanguageIsPublic"] = (data.LanguageIsPublic ? "1" : "0");
d.Data["PermEveryone"] = data.PermEveryone.ToString(); d.Data["PermEveryone"] = data.PermEveryone.ToString();
d.Data["PermGroup"] = data.PermGroup.ToString(); d.Data["PermGroup"] = data.PermGroup.ToString();
d.Data["PermNextOwner"] = data.PermNextOwner.ToString(); d.Data["PermNextOwner"] = data.PermNextOwner.ToString();

3
bin/config-include/Standalone.ini
View File

@ -97,6 +97,9 @@
[Friends] [Friends]
Connector = "OpenSim.Services.FriendsService.dll" Connector = "OpenSim.Services.FriendsService.dll"
[AgentPreferencesService]
LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService"
[LoginService] [LoginService]
LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"

3
bin/config-include/StandaloneHypergrid.ini
View File

@ -124,6 +124,9 @@
[Friends] [Friends]
Connector = "OpenSim.Services.FriendsService.dll" Connector = "OpenSim.Services.FriendsService.dll"
[AgentPreferencesService]
LocalServiceModule = "OpenSim.Services.UserAccountService.dll:AgentPreferencesService"
[LoginService] [LoginService]
LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"