ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 00:15:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Guard against null AgentPrefs service in llGetAgentLanguage()

Browse Source 
Signed-off-by: Diva Canto <diva@metaverseink.com>
This commit is contained in:
Cinder
2015-06-21 08:09:41 -06:00
committed by Diva Canto
parent 7edaf1d851
commit a91f32e2c7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -6149,10 +6149,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
// This should only return a value if the avatar is in the same region, but eh. idc.
m_host.AddScriptLPS(1);
UUID key = new UUID();
if (UUID.TryParse(id, out key))
if (World.AgentPreferencesService == null)
{
return new LSL_String(World.AgentPreferencesService.GetLang(key));
Error("llGetAgentLanguage", "No AgentPreferencesService present");
}
else
{
UUID key = new UUID();
if (UUID.TryParse(id, out key))
{
return new LSL_String(World.AgentPreferencesService.GetLang(key));
}
}
return new LSL_String("en-us");
}