diff options
| author | Melanie | 2013-02-12 23:21:26 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-12 23:21:26 +0000 |
| commit | 467e8d56b533df287e59724188f3980f6dc979dd (patch) | |
| tree | d47411cc608c6382305bb5f0c3384d79ecf63d2e /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Extend TestJsonCreateStore() with a one key input and an input with raw numbe... (diff) | |
| download | opensim-SC_OLD-467e8d56b533df287e59724188f3980f6dc979dd.zip opensim-SC_OLD-467e8d56b533df287e59724188f3980f6dc979dd.tar.gz opensim-SC_OLD-467e8d56b533df287e59724188f3980f6dc979dd.tar.bz2 opensim-SC_OLD-467e8d56b533df287e59724188f3980f6dc979dd.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index c8ced43..26850c4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -603,7 +603,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 603 | if (!m_coopTermination) | 603 | if (!m_coopTermination) |
| 604 | { | 604 | { |
| 605 | // If we're not co-operative terminating then try and wait for the event to complete before stopping | 605 | // If we're not co-operative terminating then try and wait for the event to complete before stopping |
| 606 | if (workItem.Wait(new TimeSpan((long)timeout * 100000))) | 606 | if (workItem.Wait(timeout)) |
| 607 | return true; | 607 | return true; |
| 608 | } | 608 | } |
| 609 | else | 609 | else |
| @@ -618,7 +618,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 618 | 618 | ||
| 619 | // For now, we will wait forever since the event should always cleanly terminate once LSL loop | 619 | // For now, we will wait forever since the event should always cleanly terminate once LSL loop |
| 620 | // checking is implemented. May want to allow a shorter timeout option later. | 620 | // checking is implemented. May want to allow a shorter timeout option later. |
| 621 | if (workItem.Wait(TimeSpan.MaxValue)) | 621 | if (workItem.Wait(Timeout.Infinite)) |
| 622 | { | 622 | { |
| 623 | if (DebugLevel >= 1) | 623 | if (DebugLevel >= 1) |
| 624 | m_log.DebugFormat( | 624 | m_log.DebugFormat( |