aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-19 20:53:24 +0100
committerJustin Clark-Casey (justincc)2011-10-19 20:53:24 +0100
commit3cf7fb4eca2ad57835311e8098868f2571709392 (patch)
tree383c0ce40cbd6c2635e8c74c105a9b4a94e4217a /OpenSim/Region/ScriptEngine/Shared/Instance
parenton log and "show scripts" messages, show script item UUID rather than asset UUID (diff)
downloadopensim-SC_OLD-3cf7fb4eca2ad57835311e8098868f2571709392.zip
opensim-SC_OLD-3cf7fb4eca2ad57835311e8098868f2571709392.tar.gz
opensim-SC_OLD-3cf7fb4eca2ad57835311e8098868f2571709392.tar.bz2
opensim-SC_OLD-3cf7fb4eca2ad57835311e8098868f2571709392.tar.xz
Add "scripts suspend" and "scripts resume" commands.
These aim currently to suspend and resume all scripts. However, resume isn't currently working due to what looks like a bug in resume functionality itself.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 9d48e94..893f3ef 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
55{ 55{
56 public class ScriptInstance : MarshalByRefObject, IScriptInstance 56 public class ScriptInstance : MarshalByRefObject, IScriptInstance
57 { 57 {
58 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 58// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
59 59
60 private IScriptEngine m_Engine; 60 private IScriptEngine m_Engine;
61 private IScriptWorkItem m_CurrentResult = null; 61 private IScriptWorkItem m_CurrentResult = null;
@@ -645,6 +645,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
645 /// <returns></returns> 645 /// <returns></returns>
646 public object EventProcessor() 646 public object EventProcessor()
647 { 647 {
648// m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
649
648 if (Suspended) 650 if (Suspended)
649 return 0; 651 return 0;
650 652
@@ -679,7 +681,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
679 m_CollisionInQueue = false; 681 m_CollisionInQueue = false;
680 } 682 }
681 683
682 //m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); 684// m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
683 685
684 m_DetectParams = data.DetectParams; 686 m_DetectParams = data.DetectParams;
685 687