diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-11-11 11:23:10 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-11-11 11:23:10 -0600 |
| commit | d682394d027e93b1b98e213f588126194ec517d1 (patch) | |
| tree | 8844ad2eb02dcb0e2278935d6d9b098e52dc1de4 /indra/newview/llviewerwindow.cpp | |
| parent | 2551bfb1b523c1ce2459e0139829a211c36e1bcc (diff) | |
| parent | ce667514032510ff1ae47daf0f2727933be849bc (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 573fb1a8b5..972c9c255e 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -655,12 +655,15 @@ public: } } - S32 pending = (S32) gMeshRepo.mPendingRequests.size(); - S32 header = (S32) gMeshRepo.mThread->mHeaderReqQ.size(); - S32 lod = (S32) gMeshRepo.mThread->mLODReqQ.size(); - - if (pending + header + lod + LLMeshRepoThread::sActiveHeaderRequests + LLMeshRepoThread::sActiveLODRequests != 0) + if (!gMeshRepo.mPendingRequests.empty() || + !gMeshRepo.mThread->mHeaderReqQ.empty() || + !gMeshRepo.mThread->mLODReqQ.empty()) { + LLMutexLock lock(gMeshRepo.mThread->mMutex); + S32 pending = (S32) gMeshRepo.mPendingRequests.size(); + S32 header = (S32) gMeshRepo.mThread->mHeaderReqQ.size(); + S32 lod = (S32) gMeshRepo.mThread->mLODReqQ.size(); + addText(xpos, ypos, llformat ("Mesh Queue - %d pending (%d:%d header | %d:%d LOD)", pending, LLMeshRepoThread::sActiveHeaderRequests, header, |