diff options
| author | Richard@Callum-HP-PC.lindenlab.com <Richard@Callum-HP-PC.lindenlab.com> | 2011-10-21 14:41:24 -0700 |
|---|---|---|
| committer | Richard@Callum-HP-PC.lindenlab.com <Richard@Callum-HP-PC.lindenlab.com> | 2011-10-21 14:41:24 -0700 |
| commit | f5197b6158bf1b9350fab2dd7877f6c0a4c2f778 (patch) | |
| tree | ff9c621341b9076fff8a11b66befa6e37183f286 /indra/newview/lltexturefetch.cpp | |
| parent | f2952ded0396e98e1010ebe39de5bba0ae6ba5f7 (diff) | |
| parent | 255eebf11615a1a8c47003ee24b1696b8ae63e23 (diff) | |
merge with viewer-dev
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index a6e0d4530a..56dfb61c4f 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -674,6 +674,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher, mRetryAttempt(0), mActiveCount(0), mGetStatus(0), + mWorkMutex(NULL), mFirstPacket(0), mLastPacket(-1), mTotalPackets(0), @@ -1815,6 +1816,8 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image mDebugPause(FALSE), mPacketCount(0), mBadPacketCount(0), + mQueueMutex(getAPRPool()), + mNetworkQueueMutex(getAPRPool()), mTextureCache(cache), mImageDecodeThread(imagedecodethread), mTextureBandwidth(0), |