diff options
author | UbitUmarov | 2018-12-01 23:13:24 +0000 |
---|---|---|
committer | UbitUmarov | 2018-12-01 23:13:24 +0000 |
commit | 4ced4fed33c35599502c67a060139475fadafdb6 (patch) | |
tree | bc64d0439e461af4a264132daf7001e3c9f04c29 /OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |
parent | clean a bit (diff) | |
download | opensim-SC-4ced4fed33c35599502c67a060139475fadafdb6.zip opensim-SC-4ced4fed33c35599502c67a060139475fadafdb6.tar.gz opensim-SC-4ced4fed33c35599502c67a060139475fadafdb6.tar.bz2 opensim-SC-4ced4fed33c35599502c67a060139475fadafdb6.tar.xz |
replace GetMeshModule and GetTextureModule
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index ca940b5..c986233 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -398,22 +398,13 @@ namespace OpenSim.Region.ClientStack.Linden | |||
398 | while (true) | 398 | while (true) |
399 | { | 399 | { |
400 | APollRequest poolreq; | 400 | APollRequest poolreq; |
401 | if (!m_queue.TryTake(out poolreq, 4500) || poolreq == null || poolreq.thepoll == null) | 401 | if (m_queue.TryTake(out poolreq, 4500)) |
402 | { | 402 | { |
403 | Watchdog.UpdateThread(); | 403 | Watchdog.UpdateThread(); |
404 | continue; | 404 | if (poolreq.thepoll != null) |
405 | poolreq.thepoll.Process(poolreq); | ||
405 | } | 406 | } |
406 | |||
407 | Watchdog.UpdateThread(); | 407 | Watchdog.UpdateThread(); |
408 | try | ||
409 | { | ||
410 | poolreq.thepoll.Process(poolreq); | ||
411 | } | ||
412 | catch (Exception e) | ||
413 | { | ||
414 | m_log.ErrorFormat( | ||
415 | "[INVENTORY]: Failed to process queued inventory Exception {0}", e.Message); | ||
416 | } | ||
417 | } | 408 | } |
418 | } | 409 | } |
419 | } | 410 | } |