aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2009-12-22 15:48:41 +0000
committerMelanie2009-12-22 15:48:41 +0000
commit30f59370d371ea5f5bb83ad3f7cd7a90fb7298c2 (patch)
tree385d3239d6012190121fe9e16070f6108fc25f8b /OpenSim/Region/ScriptEngine
parentMerge branch 'master' into careminster (diff)
parentRemove GetState. It is really unused and was reinstated by the revert (diff)
downloadopensim-SC-30f59370d371ea5f5bb83ad3f7cd7a90fb7298c2.zip
opensim-SC-30f59370d371ea5f5bb83ad3f7cd7a90fb7298c2.tar.gz
opensim-SC-30f59370d371ea5f5bb83ad3f7cd7a90fb7298c2.tar.bz2
opensim-SC-30f59370d371ea5f5bb83ad3f7cd7a90fb7298c2.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs8
2 files changed, 9 insertions, 0 deletions
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
76 76
77 void SetScriptState(UUID itemID, bool state); 77 void SetScriptState(UUID itemID, bool state);
78 bool GetScriptState(UUID itemID); 78 bool GetScriptState(UUID itemID);
79 void SetState(UUID itemID, string newState);
79 void ApiResetScript(UUID itemID); 80 void ApiResetScript(UUID itemID);
80 void ResetScript(UUID itemID); 81 void ResetScript(UUID itemID);
81 IConfig Config { get; } 82 IConfig Config { get; }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index ac3dc13..8376846 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1264,6 +1264,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1264 return UUID.Zero; 1264 return UUID.Zero;
1265 } 1265 }
1266 1266
1267 public void SetState(UUID itemID, string newState)
1268 {
1269 IScriptInstance instance = GetInstance(itemID);
1270 if (instance == null)
1271 return;
1272 instance.SetState(newState);
1273 }
1274
1267 public int GetStartParameter(UUID itemID) 1275 public int GetStartParameter(UUID itemID)
1268 { 1276 {
1269 IScriptInstance instance = GetInstance(itemID); 1277 IScriptInstance instance = GetInstance(itemID);