summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgtags2
-rwxr-xr-x[-rw-r--r--]indra/newview/lltexturefetch.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 181c01e046..330e552ec2 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
index e2af497a7d..7e6dfbc9d9 100644..100755
--- 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");