diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
| commit | 77876a3c4f18b480f9afd17be57b123d2e5f1e84 (patch) | |
| tree | 04b31f26cceef5cc411b166d30eb694707d995aa /indra/newview/lltexturefetch.cpp | |
| parent | e0f6e449594c44511d9634ea54faf54f8fe5cb7c (diff) | |
| parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) | |
Merged with viewer-development.
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), |