summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-18 14:30:57 -0400
committerOz Linden <oz@lindenlab.com>2013-03-18 14:30:57 -0400
commited7785bf97a601448ba2da5fb2f19ea2861454c5 (patch)
tree17e8d9ccf28ae30c5029ecea7e0ab8bed0fe3926 /indra/newview/lltexturefetch.h
parentc8533650b4779040c5e196f9ff156e3454edc9c8 (diff)
parentbf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff)
merge up to 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rw-r--r--indra/newview/lltexturefetch.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 3a99432b48..5ea3c14e1a 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -37,7 +37,9 @@
#include "lltextureinfo.h"
#include "llapr.h"
#include "llimageworker.h"
+#include "llstat.h"
#include "llcurl.h"
+#include "llstat.h"
#include "httprequest.h"
#include "httpoptions.h"
#include "httpheaders.h"
@@ -449,7 +451,6 @@ private:
LLPointer<LLImageRaw> mRawImage;
e_curl_state mCurlState;
S32 mCurlReceivedSize;
- S32 mHTTPFailCount;
LLCore::HttpHandle mHttpHandle;
FetchEntry() :
@@ -465,7 +466,6 @@ private:
mFetchedSize(f_size),
mDecodedSize(d_size),
mNeedsAux(false),
- mHTTPFailCount(0),
mHttpHandle(LLCORE_HTTP_HANDLE_INVALID)
{}
};