aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-12 21:16:05 +0000
committerJustin Clark-Casey (justincc)2012-03-12 21:16:05 +0000
commit25592bbd852e9350bca25f240d6d54c7a54e28a0 (patch)
tree193f54e17fe4f87c77bc3abba2087a05143afdac /OpenSim/Region/ScriptEngine/Shared/Instance
parentRename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream(). (diff)
downloadopensim-SC_OLD-25592bbd852e9350bca25f240d6d54c7a54e28a0.zip
opensim-SC_OLD-25592bbd852e9350bca25f240d6d54c7a54e28a0.tar.gz
opensim-SC_OLD-25592bbd852e9350bca25f240d6d54c7a54e28a0.tar.bz2
opensim-SC_OLD-25592bbd852e9350bca25f240d6d54c7a54e28a0.tar.xz
Add max thread and min thread information to "xengine status" region console command
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index bc1902b..4010167 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -578,7 +578,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
578 return true; 578 return true;
579 579
580 if (!m_InSelfDelete) 580 if (!m_InSelfDelete)
581 {
582// m_log.ErrorFormat("[SCRIPT INSTANCE]: Aborting script {0} {1}", ScriptName, ItemID);
581 result.Abort(); 583 result.Abort();
584 }
582 585
583 lock (m_EventQueue) 586 lock (m_EventQueue)
584 { 587 {