From 9f000e4b348a9598b43070e8caeeb8bdeebefbea Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 8 Jun 2012 15:49:11 -0400 Subject: SH-3153 FIX --- indra/newview/lltexturefetch.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 indra/newview/lltexturefetch.cpp diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp old mode 100644 new mode 100755 index e2af497a7d..7e6dfbc9d9 --- 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"); -- cgit v1.2.3 From 9ee115f5e5baec231828a60173bf5ce9d393cd58 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 9 Jun 2012 07:06:38 -0400 Subject: tag merge of DRTVWR-165 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2e73c71878..ba8a9364f4 100644 --- a/.hgtags +++ b/.hgtags @@ -312,3 +312,4 @@ f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 3.3.3-beta1 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c DRTVWR-144 f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 DRTVWR-144 2d6c0634b11e6f3df11002b8510a72a0433da00a DRTVWR-164 +80b5e5e9775966d3839331ffa7a16a60f9d7c930 DRTVWR-165 -- cgit v1.2.3 From c931c74fdb282fe7b730d9da93aa939d7d63b82b Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 9 Jun 2012 08:19:14 -0400 Subject: Added tag 3.3.3-beta2 for changeset fdcc08a4f20a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index ba8a9364f4..d838dc16b2 100644 --- a/.hgtags +++ b/.hgtags @@ -313,3 +313,4 @@ f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 3.3.3-beta1 f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 DRTVWR-144 2d6c0634b11e6f3df11002b8510a72a0433da00a DRTVWR-164 80b5e5e9775966d3839331ffa7a16a60f9d7c930 DRTVWR-165 +fdcc08a4f20ae9bb060f4693c8980d216534efdf 3.3.3-beta2 -- cgit v1.2.3