aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorCinder2015-06-14 08:45:22 -0600
committerDiva Canto2015-06-14 07:59:25 -0700
commit3853904b80c659ae94db780f4de713d639200e50 (patch)
tree04434a4586bf7de629ed8eebd1f26d7b6f770c9d /OpenSim/Region/ClientStack
parentAgentPreferences SQLLite Migration update Mantis #7157 (diff)
downloadopensim-SC_OLD-3853904b80c659ae94db780f4de713d639200e50.zip
opensim-SC_OLD-3853904b80c659ae94db780f4de713d639200e50.tar.gz
opensim-SC_OLD-3853904b80c659ae94db780f4de713d639200e50.tar.bz2
opensim-SC_OLD-3853904b80c659ae94db780f4de713d639200e50.tar.xz
Quell three new warnings I introduced with AgentPrefsData, return an empty llsd map instead of an empty llsd block when no AgentPrefs service is available to try and appease Firestorm
Signed-off-by: Diva Canto <diva@metaverseink.com>
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
index fcc260f..aabdb51 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs
@@ -118,12 +118,13 @@ 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 OSDMap resp = new OSDMap();
121 // The viewer doesn't do much with the return value, so for now, if there is no preference service, 122 // The viewer doesn't do much with the return value, so for now, if there is no preference service,
122 // we'll return a null llsd block for debugging purposes. This may change if someone knows what the 123 // we'll return a null llsd block for debugging purposes. This may change if someone knows what the
123 // correct server response would be here. 124 // correct server response would be here.
124 if (m_scenes[0].AgentPreferencesService == null) 125 if (m_scenes[0].AgentPreferencesService == null)
125 { 126 {
126 return "<llsd><undef /></llsd>"; 127 return OSDParser.SerializeLLSDXmlString(resp);
127 } 128 }
128 m_log.DebugFormat("[AgentPrefs]: UpdateAgentPreferences for {0}", agent.ToString()); 129 m_log.DebugFormat("[AgentPrefs]: UpdateAgentPreferences for {0}", agent.ToString());
129 OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); 130 OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
@@ -158,7 +159,6 @@ namespace OpenSim.Region.ClientStack.LindenCaps
158 data.LanguageIsPublic = req["language_is_public"].AsBoolean(); 159 data.LanguageIsPublic = req["language_is_public"].AsBoolean();
159 } 160 }
160 m_scenes[0].AgentPreferencesService.StoreAgentPreferences(data); 161 m_scenes[0].AgentPreferencesService.StoreAgentPreferences(data);
161 OSDMap resp = new OSDMap();
162 OSDMap respAccessPrefs = new OSDMap(); 162 OSDMap respAccessPrefs = new OSDMap();
163 respAccessPrefs["max"] = data.AccessPrefs; 163 respAccessPrefs["max"] = data.AccessPrefs;
164 resp["access_prefs"] = respAccessPrefs; 164 resp["access_prefs"] = respAccessPrefs;