diff options
author | UbitUmarov | 2012-02-10 23:03:30 +0000 |
---|---|---|
committer | UbitUmarov | 2012-02-10 23:03:30 +0000 |
commit | e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7 (patch) | |
tree | 0fff77027caf8e6ba723489c45e0cf1cb77bb0ec /OpenSim/Region/ScriptEngine/Shared | |
parent | Changes to vehicles code etc. Includes some debug aids to remove later. (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.zip opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.gz opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.bz2 opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
prebuild.xml
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 34f2cc7..da2ef7b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -538,6 +538,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
538 | 538 | ||
539 | public bool Stop(int timeout) | 539 | public bool Stop(int timeout) |
540 | { | 540 | { |
541 | // m_log.DebugFormat( | ||
542 | // "[SCRIPT INSTANCE]: Stopping script {0} {1} with timeout {2}", ScriptName, ItemID, timeout); | ||
543 | |||
541 | IScriptWorkItem result; | 544 | IScriptWorkItem result; |
542 | 545 | ||
543 | lock (m_EventQueue) | 546 | lock (m_EventQueue) |
@@ -772,7 +775,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
772 | } | 775 | } |
773 | catch (Exception e) | 776 | catch (Exception e) |
774 | { | 777 | { |
775 | // m_log.DebugFormat("[SCRIPT] Exception: {0}", e.Message); | 778 | // m_log.DebugFormat( |
779 | // "[SCRIPT] Exception in script {0} {1}: {2}{3}", | ||
780 | // ScriptName, ItemID, e.Message, e.StackTrace); | ||
781 | |||
776 | m_InEvent = false; | 782 | m_InEvent = false; |
777 | m_CurrentEvent = String.Empty; | 783 | m_CurrentEvent = String.Empty; |
778 | 784 | ||