diff options
| author | Melanie | 2013-05-01 21:39:49 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-01 21:39:49 +0100 |
| commit | 8c5445b774c602a13a7b49db1630b5f9fb9ff438 (patch) | |
| tree | 6e829d2903b589c0c703793fb804632ea2324d62 /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.zip opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.tar.gz opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.tar.bz2 opensim-SC_OLD-8c5445b774c602a13a7b49db1630b5f9fb9ff438.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index fa238aa..8da06d1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -572,9 +572,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 572 | 572 | ||
| 573 | public bool Stop(int timeout) | 573 | public bool Stop(int timeout) |
| 574 | { | 574 | { |
| 575 | // m_log.DebugFormat( | 575 | if (DebugLevel >= 1) |
| 576 | // "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}", | 576 | m_log.DebugFormat( |
| 577 | // ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks); | 577 | "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}", |
| 578 | ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks); | ||
| 578 | 579 | ||
| 579 | IScriptWorkItem workItem; | 580 | IScriptWorkItem workItem; |
| 580 | 581 | ||