diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-01-25 15:58:38 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-01-25 15:58:38 -0800 |
| commit | 56f9cce8a11cadff1b7c8cf7c001638bfe1155fb (patch) | |
| tree | 1510152e3884a3ae40a91fd5c6240ba0c82bbbb6 | |
| parent | 25cd2ed2052b0d30d61e8b81df151993983f561b (diff) | |
MAINT-7082: Remove waiting loop in frame when textures queued for download in alternate thread. With debug spam for observation.
| -rw-r--r-- | indra/newview/llappviewer.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a0ebae119e..a148d3c30d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1491,7 +1491,7 @@ bool LLAppViewer::frame() idleTimer.reset(); S32 total_work_pending = 0; S32 total_io_pending = 0; - while(1) + //while(1) { S32 work_pending = 0; S32 io_pending = 0; @@ -1515,11 +1515,15 @@ bool LLAppViewer::frame() total_work_pending += work_pending ; total_io_pending += io_pending ; - - if (!work_pending || idleTimer.getElapsedTimeF64() >= max_idle_time) - { - break; - } + + if (work_pending) + { + LL_WARNS("Idle") << "Work pending in texture thread: " << work_pending << LL_ENDL; + } +// if (!work_pending || idleTimer.getElapsedTimeF64() >= max_idle_time) +// { +// break; +// } } gMeshRepo.update() ; |