ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +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

61
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -170,9 +170,6 @@ namespace OpenSim.Region.Framework.Scenes
}
private bool m_scripts_enabled;
// Dynamic ossl function permissions
private Dictionary<string, List<UUID>> m_DynaPerms = new Dictionary<string, List<UUID>>();
public SynchronizeSceneHandler SynchronizeScene;
/// <summary>
@@ -5896,63 +5893,5 @@ namespace OpenSim.Region.Framework.Scenes
m_eventManager.TriggerExtraSettingChanged(this, name, String.Empty);
}
public bool AddOsslPerm (UUID key, string function)
{
StackTrace calls = new StackTrace ();
string caller = calls.GetFrame (1).GetMethod ().Name;
if (caller != "osGrantScriptPermissions")
{
m_log.ErrorFormat("[SCENE]: {0} cannot adjust script perms!",caller);
return false;
}
if (string.IsNullOrEmpty(function))
return false;
if (!m_DynaPerms.ContainsKey(function))
{
List<UUID> keys = new List<UUID> ();
keys.Add (key);
m_DynaPerms[function] = keys;
return true;
}
if (!m_DynaPerms[function].Contains(key))
m_DynaPerms[function].Add(key);
return true;
}
public bool GetOsslPerms(UUID avatar, string function)
{
if (m_DynaPerms.ContainsKey(function))
if(m_DynaPerms[function].Contains(avatar))
return true;
return false;
}
public bool RemoveOsslPerm(UUID key, string function)
{
StackTrace calls = new StackTrace ();
string caller = calls.GetFrame (1).GetMethod ().Name;
if (caller != "osRevokeScriptPermissions")
{
m_log.ErrorFormat("[SCENE]: {0} cannot adjust script perms!",caller);
return false;
}
if (m_DynaPerms.ContainsKey (function))
{
if (m_DynaPerms [function].Contains (key))
{
m_DynaPerms [function].Remove (key);
if (m_DynaPerms [function].Count == 0)
m_DynaPerms.Remove (function);
}
}
return true;
}
}
}