Merge branch 'master' into careminster

2 files changed, 0 insertions, 17 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index 02d1511..25ec92d 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -76,7 +76,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
 
         void SetScriptState(UUID itemID, bool state);
         bool GetScriptState(UUID itemID);
-        void SetState(UUID itemID, string newState);
         void ApiResetScript(UUID itemID);
         void ResetScript(UUID itemID);
         IConfig Config { get; }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index fd12741..ac3dc13 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1264,22 +1264,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             return UUID.Zero;
         }
 
-        [DebuggerNonUserCode]
-        public void SetState(UUID itemID, string newState)
-        {
-            IScriptInstance instance = GetInstance(itemID);
-            if (instance == null)
-                return;
-            instance.SetState(newState);
-        }
-        public string GetState(UUID itemID)
-        {
-            IScriptInstance instance = GetInstance(itemID);
-            if (instance == null)
-                return "default";
-            return instance.State;
-        }
-
         public int GetStartParameter(UUID itemID)
         {
             IScriptInstance instance = GetInstance(itemID);