aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-04-19 21:28:30 +0100
committerJustin Clark-Casey (justincc)2010-04-19 21:28:30 +0100
commit6b963e73d954b9ae8a6d283b5c83460d6a192ba6 (patch)
treef7c3db7ccb54a27cdb4ed5d38645275792c56266 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
parentMake the "notecard saved" text appear in the saver rather than the notecard o... (diff)
parentAvoid duplicate script resumes. Move resume calls to more logical places (diff)
downloadopensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.zip
opensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.gz
opensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.bz2
opensim-SC_OLD-6b963e73d954b9ae8a6d283b5c83460d6a192ba6.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 98e77c0..54074ed 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1488,5 +1488,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1488 return new ArrayList(); 1488 return new ArrayList();
1489 } 1489 }
1490 } 1490 }
1491
1492 public void SuspendScript(UUID itemID)
1493 {
1494 IScriptInstance instance = GetInstance(itemID);
1495 if (instance == null)
1496 return;
1497
1498 instance.Suspend();
1499 }
1500
1501 public void ResumeScript(UUID itemID)
1502 {
1503 IScriptInstance instance = GetInstance(itemID);
1504 if (instance == null)
1505 return;
1506
1507 instance.Resume();
1508 }
1491 } 1509 }
1492} 1510}