summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-01-21 16:25:23 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-01-21 16:25:23 -0700
commit4af7e9eb64097c9fdcef86758fc42932d3ccd477 (patch)
tree3d4d5300b0c476d8343baad8d28c0809806d5c8b /indra/newview/lltexturefetch.h
parentbb3be2c07f492577254ae9ace5675eb92d10f061 (diff)
parente3f5b66d5a649b061e470bba44fa29a56f7b93b5 (diff)
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
Diffstat (limited to 'indra/newview/lltexturefetch.h')
-rw-r--r--indra/newview/lltexturefetch.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index ad00a7ea36..d101da1f4b 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -79,6 +79,7 @@ public:
void dump();
S32 getNumRequests() ;
S32 getNumHTTPRequests() ;
+ U32 getTotalNumHTTPRequests() ;
// Public for access by callbacks
S32 getPending();
@@ -183,6 +184,9 @@ private:
U32 mHTTPTextureBits;
+ //debug use
+ U32 mTotalHTTPRequests ;
+
// Out-of-band cross-thread command queue. This command queue
// is logically tied to LLQueuedThread's list of
// QueuedRequest instances and so must be covered by the