From 3853904b80c659ae94db780f4de713d639200e50 Mon Sep 17 00:00:00 2001 From: Cinder Date: Sun, 14 Jun 2015 08:45:22 -0600 Subject: [PATCH] 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 --- OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs | 4 ++-- OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs | 4 ++-- OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs | 4 ++-- .../Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs index bf188ee6b6..6be205ed10 100644 --- a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs +++ b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs @@ -52,9 +52,9 @@ namespace OpenSim.Data.MySQL return ret[0]; } - public void Store(AgentPreferencesData data) + public override bool Store(AgentPreferencesData data) { - base.Store(data); + return base.Store(data); } } } diff --git a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs index c27087da9c..4c8472435f 100644 --- a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs +++ b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs @@ -52,9 +52,9 @@ namespace OpenSim.Data.PGSQL return ret[0]; } - public void Store(AgentPreferencesData data) + public override bool Store(AgentPreferencesData data) { - base.Store(data); + return base.Store(data); } } } diff --git a/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs b/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs index ea267ac1f9..5bfcedb848 100644 --- a/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs +++ b/OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs @@ -56,9 +56,9 @@ namespace OpenSim.Data.SQLite return ret[0]; } - public void Store(AgentPreferencesData data) + public override bool Store(AgentPreferencesData data) { - base.Store(data); + return base.Store(data); } } } diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AgentPreferencesModule.cs index fcc260fe17..aabdb510df 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 public string UpdateAgentPreferences(string request, string path, string param, UUID agent) { + OSDMap resp = new OSDMap(); // The viewer doesn't do much with the return value, so for now, if there is no preference service, // we'll return a null llsd block for debugging purposes. This may change if someone knows what the // correct server response would be here. if (m_scenes[0].AgentPreferencesService == null) { - return ""; + return OSDParser.SerializeLLSDXmlString(resp); } m_log.DebugFormat("[AgentPrefs]: UpdateAgentPreferences for {0}", agent.ToString()); OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); @@ -158,7 +159,6 @@ namespace OpenSim.Region.ClientStack.LindenCaps data.LanguageIsPublic = req["language_is_public"].AsBoolean(); } m_scenes[0].AgentPreferencesService.StoreAgentPreferences(data); - OSDMap resp = new OSDMap(); OSDMap respAccessPrefs = new OSDMap(); respAccessPrefs["max"] = data.AccessPrefs; resp["access_prefs"] = respAccessPrefs;