aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorDiva Canto2012-03-13 08:07:11 -0700
committerDiva Canto2012-03-13 08:07:11 -0700
commit37828c9b9a065e5ee4df06e05eecd1e0a41ea07e (patch)
treefbcc970ef6fa4256e98edf71d1ce4dc9c621440c /OpenSim/Region/ScriptEngine/Shared
parentDatasnapshot: added "secret" to the registration/deregistration query so that... (diff)
parentAdd max thread and min thread information to "xengine status" region console ... (diff)
downloadopensim-SC_OLD-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.zip
opensim-SC_OLD-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.tar.gz
opensim-SC_OLD-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.tar.bz2
opensim-SC_OLD-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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 {