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

Revert "Adding dynamic ossl permission control"

Browse Source 
This reverts commit a3681f3052 until
further testing. Jenkins now fails ossl tests.
This commit is contained in:
BlueWall
2015-02-27 12:27:10 -05:00
parent a3681f3052
commit aeb8a4bf85
4 changed files with 0 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -264,9 +264,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// or a string explaining why this function can't be used.
private string CheckThreatLevelTest(ThreatLevel level, string function)
{
if(GetDynaPerms(m_item.CreatorID, m_item.OwnerID, m_item.GroupID, function))
return string.Empty;
if (!m_FunctionPerms.ContainsKey(function))
{
FunctionPerms perms = new FunctionPerms();
@@ -434,47 +431,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
System.Threading.Thread.Sleep(delay);
}
private bool GetDynaPerms(UUID owner, UUID creator, UUID group, string function)
{
if (World.GetOsslPerms(owner, function))
return true;
if (World.GetOsslPerms(creator, function))
return true;
if (World.GetOsslPerms(creator, function))
return true;
return false;
}
public void osGrantScriptPermissions(LSL_Key avatar, LSL_List osfunctions)
{
CheckThreatLevel(ThreatLevel.Severe, "osGrantScriptPermissions");
m_host.AddScriptLPS(1);
UUID key;
UUID.TryParse(avatar.m_string, out key);
for (int item = 0; item <= osfunctions.Length - 1; item++)
{
string function = osfunctions.GetLSLStringItem(item);
World.AddOsslPerm(key, function);
}
}
public void osRevokeScriptPermissions (LSL_Key avatar, LSL_List osfunctions)
{
CheckThreatLevel(ThreatLevel.Severe, "osRevokeScriptPermissions");
m_host.AddScriptLPS(1);
UUID key;
UUID.TryParse(avatar.m_string, out key);
for (int item = 0; item <= osfunctions.Length - 1; item++)
{
string function = osfunctions.GetLSLStringItem(item);
World.RemoveOsslPerm(key, function);
}
}
public LSL_Integer osSetTerrainHeight(int x, int y, double val)
{
CheckThreatLevel(ThreatLevel.High, "osSetTerrainHeight");