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

remove country from avatars DetectParams, since it is only used on a cm function that can get it directly

Browse Source
This commit is contained in:
UbitUmarov
2016-08-05 17:08:34 +01:00
parent e9660d5d05
commit 60b08b51b6
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
View File

@@ -94,14 +94,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public string cmDetectedCountry(int number)
{
m_host.AddScriptLPS(1);
if(!m_CMFunctionsEnabled)
return String.Empty;
if(World.UserAccountService == null)
return String.Empty;
DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
if (detectedParams == null)
return String.Empty;
return detectedParams.Country;
UUID key = detectedParams.Key;
if(key == UUID.Zero)
return String.Empty;
UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, key);
return account.UserCountry;
}
public string cmGetAgentCountry(LSL_Key key)
{
if(! m_CMFunctionsEnabled)
return "";
if(World.UserAccountService == null)
return String.Empty;
if (!World.Permissions.IsGod(m_host.OwnerID))
return String.Empty;