diff --git a/.hgtags b/.hgtags index 181c01e04676f11f8d73c9f20fda197fbde78f2b..330e552ec2cb6e072d8c922f2e4c8e36d8289a0b 100644 --- a/.hgtags +++ b/.hgtags @@ -317,3 +317,5 @@ f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 3.3.3-beta1 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c DRTVWR-144 f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 DRTVWR-144 2d6c0634b11e6f3df11002b8510a72a0433da00a DRTVWR-164 +80b5e5e9775966d3839331ffa7a16a60f9d7c930 DRTVWR-165 +fdcc08a4f20ae9bb060f4693c8980d216534efdf 3.3.3-beta2 diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp old mode 100644 new mode 100755 index e2af497a7d05470de4b219fdfbb7d494a82f07a8..7e6dfbc9d9a2d8fcc07f6d33b4cb4b02f0ef4fb8 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1860,7 +1860,8 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image mTotalHTTPRequests(0), mCurlGetRequest(NULL), mQAMode(qa_mode), - mFetchDebugger(NULL) + mFetchDebugger(NULL), + mFetcherLocked(FALSE) { mCurlPOSTRequestCount = 0; mMaxBandwidth = gSavedSettings.getF32("ThrottleBandwidthKBPS");