diff options
| author | Robert Adams | 2013-05-01 12:08:12 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-01 12:08:12 -0700 |
| commit | fca4e4ec7c044921ba602862c5a42900f819015a (patch) | |
| tree | f3a1e0b09b7a454009437dd9b1015891a85eadb8 /OpenSim/Region/ScriptEngine/Shared | |
| parent | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working... (diff) | |
| parent | Add in-code exaplanation for the change in cancellation signalling in STP 2.2... (diff) | |
| download | opensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.zip opensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.tar.gz opensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.tar.bz2 opensim-SC-fca4e4ec7c044921ba602862c5a42900f819015a.tar.xz | |
Merge branch 'master' into bulletsim4
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -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 1e6db43..887a317 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -564,9 +564,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 564 | 564 | ||
| 565 | public bool Stop(int timeout) | 565 | public bool Stop(int timeout) |
| 566 | { | 566 | { |
| 567 | // m_log.DebugFormat( | 567 | if (DebugLevel >= 1) |
| 568 | // "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}", | 568 | m_log.DebugFormat( |
| 569 | // ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks); | 569 | "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}", |
| 570 | ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks); | ||
| 570 | 571 | ||
| 571 | IScriptWorkItem workItem; | 572 | IScriptWorkItem workItem; |
| 572 | 573 | ||