From aeb8a4bf85816595c9c2ba82413e309e7aa69062 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 27 Feb 2015 12:27:10 -0500
Subject: Revert "Adding dynamic ossl permission control"

This reverts commit a3681f3052fb5e98e31e7051329a5b748a8bdd8d until
further testing. Jenkins now fails ossl tests.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 61 --------------------------------
 1 file changed, 61 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 018e837..21d47aa 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -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;
-        }
     }
 }
-- 
cgit v1.1