diff options
| author | UbitUmarov | 2017-05-27 05:47:05 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-27 05:47:05 +0100 |
| commit | c54985f8a16a00032a3647112555b5c82b43efde (patch) | |
| tree | 862483e0e10e4862e99b5437340e326df3f3f072 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | minor cleanup (diff) | |
| download | opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.zip opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.gz opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.bz2 opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 1688aa6..e01d2e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
| @@ -226,9 +226,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 226 | try | 226 | try |
| 227 | { | 227 | { |
| 228 | Thread.Sleep(cmdHandlerThreadCycleSleepms); | 228 | Thread.Sleep(cmdHandlerThreadCycleSleepms); |
| 229 | 229 | Watchdog.UpdateThread(); | |
| 230 | DoOneCmdHandlerPass(); | 230 | DoOneCmdHandlerPass(); |
| 231 | |||
| 232 | Watchdog.UpdateThread(); | 231 | Watchdog.UpdateThread(); |
| 233 | } | 232 | } |
| 234 | catch ( System.Threading.ThreadAbortException) { } | 233 | catch ( System.Threading.ThreadAbortException) { } |