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

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>
fsassets
Cinder 2015-06-14 08:45:22 -06:00 committed by Diva Canto
parent 54c1659934
commit 3853904b80
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
View File

@ -52,9 +52,9 @@ namespace OpenSim.Data.MySQL
return ret[0]; return ret[0];
} }
public void Store(AgentPreferencesData data) public override bool Store(AgentPreferencesData data)
{ {
base.Store(data); return base.Store(data);
} }
} }
} }

4
OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
View File

@ -52,9 +52,9 @@ namespace OpenSim.Data.PGSQL
return ret[0]; return ret[0];
} }
public void Store(AgentPreferencesData data) public override bool Store(AgentPreferencesData data)
{ {
base.Store(data); return base.Store(data);
} }
} }
} }

4
OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs
View File

@ -56,9 +56,9 @@ namespace OpenSim.Data.SQLite
return ret[0]; return ret[0];
} }
public void Store(AgentPreferencesData data) public override bool Store(AgentPreferencesData data)
{ {
base.Store(data); return base.Store(data);
} }
} }
} }

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

@ -118,12 +118,13 @@ 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)
{ {
OSDMap resp = new OSDMap();
// The viewer doesn't do much with the return value, so for now, if there is no preference service, // 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 // we'll return a null llsd block for debugging purposes. This may change if someone knows what the
// correct server response would be here. // correct server response would be here.
if (m_scenes[0].AgentPreferencesService == null) if (m_scenes[0].AgentPreferencesService == null)
{ {
return "<llsd><undef /></llsd>"; return OSDParser.SerializeLLSDXmlString(resp);
} }
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);
@ -158,7 +159,6 @@ namespace OpenSim.Region.ClientStack.LindenCaps
data.LanguageIsPublic = req["language_is_public"].AsBoolean(); data.LanguageIsPublic = req["language_is_public"].AsBoolean();
} }
m_scenes[0].AgentPreferencesService.StoreAgentPreferences(data); m_scenes[0].AgentPreferencesService.StoreAgentPreferences(data);
OSDMap resp = new OSDMap();
OSDMap respAccessPrefs = new OSDMap(); OSDMap respAccessPrefs = new OSDMap();
respAccessPrefs["max"] = data.AccessPrefs; respAccessPrefs["max"] = data.AccessPrefs;
resp["access_prefs"] = respAccessPrefs; resp["access_prefs"] = respAccessPrefs;