From a24d9bff0394e98ef474430c39b3b4c917f102fb Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 22 Dec 2009 15:45:56 +0000 Subject: Revert "Remove an insterface member that was never used" It was used. By the API, which is dynamically loaded. So it didn't complain until it hit Bamboo This reverts commit 33d5018e94e52cb875bf43bced623bdc6aa41ef0. --- OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs | 1 + OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 15 +++++++++++++++ 2 files changed, 16 insertions(+) (limited to 'OpenSim') diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs index 25ec92d..02d1511 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs @@ -76,6 +76,7 @@ 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 4512e98..11b02e1 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -1182,6 +1182,21 @@ namespace OpenSim.Region.ScriptEngine.XEngine return UUID.Zero; } + 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); -- cgit v1.1 From c11f259e154eb7e42bbe522681a5561e626622a2 Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 22 Dec 2009 15:46:55 +0000 Subject: Remove GetState. It is really unused and was reinstated by the revert --- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 7 ------- 1 file changed, 7 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 11b02e1..95f7852 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -1189,13 +1189,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine 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) { -- cgit v1.1