aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-12-22 15:45:56 +0000
committerMelanie2009-12-22 15:45:56 +0000
commita24d9bff0394e98ef474430c39b3b4c917f102fb (patch)
tree2929090816713fac73d3567314ba8727498d02c4 /OpenSim
parentRemove an insterface member that was never used (diff)
downloadopensim-SC_OLD-a24d9bff0394e98ef474430c39b3b4c917f102fb.zip
opensim-SC_OLD-a24d9bff0394e98ef474430c39b3b4c917f102fb.tar.gz
opensim-SC_OLD-a24d9bff0394e98ef474430c39b3b4c917f102fb.tar.bz2
opensim-SC_OLD-a24d9bff0394e98ef474430c39b3b4c917f102fb.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs15
2 files changed, 16 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 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
1182 return UUID.Zero; 1182 return UUID.Zero;
1183 } 1183 }
1184 1184
1185 public void SetState(UUID itemID, string newState)
1186 {
1187 IScriptInstance instance = GetInstance(itemID);
1188 if (instance == null)
1189 return;
1190 instance.SetState(newState);
1191 }
1192 public string GetState(UUID itemID)
1193 {
1194 IScriptInstance instance = GetInstance(itemID);
1195 if (instance == null)
1196 return "default";
1197 return instance.State;
1198 }
1199
1185 public int GetStartParameter(UUID itemID) 1200 public int GetStartParameter(UUID itemID)
1186 { 1201 {
1187 IScriptInstance instance = GetInstance(itemID); 1202 IScriptInstance instance = GetInstance(itemID);