diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-16 08:19:49 -0400 |
commit | bf96c7f67e623b09f83b2300e7b82cb04dce1ee3 (patch) | |
tree | 3d3ff515c4055877d2f1158287ddaf9dd5107a13 /indra/newview/lltexturefetch.cpp | |
parent | 76a54429fef78bb36ef5d4189e78867a7002f058 (diff) | |
parent | 4924f0c99b021869967f4587df703084d2bdc8ed (diff) |
merge
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), |