summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-04-25 16:59:20 -0600
committerXiaohong Bao <bao@lindenlab.com>2012-04-25 16:59:20 -0600
commit5ab4dadc703a0f7419929c7da57c471f2ece8a6c (patch)
treec96cda59be1b72bdb3b1068e6be09b6cf6f03cf5 /indra/newview/llviewertexturelist.h
parentadf5b5c1efaed30dc043652b174d76c9088f4b18 (diff)
for subtasks SH-3118, SH-3112, SH-3110, SH-3106, SH-3091 for SH-3086:
As a viewer architect, I would like to understand how fast each of the components of the texture pipeline can run in isolation
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
-rw-r--r--indra/newview/llviewertexturelist.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 64e2c1f791..7038ea24ce 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -109,6 +109,8 @@ public:
void doPreloadImages();
void doPrefetchImages();
+ void clearFetchingRequests();
+
static S32 getMinVideoRamSetting();
static S32 getMaxVideoRamSetting(bool get_recommended = false);
@@ -163,9 +165,7 @@ private:
// Request image from a specific host, used for baked avatar textures.
// Implemented in header in case someone changes default params above. JC
LLViewerFetchedTexture* getImageFromHost(const LLUUID& image_id, LLHost host)
- { return getImage(image_id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, host); }
-
- void clearFetchingRequests();
+ { return getImage(image_id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, host); }
public:
typedef std::set<LLPointer<LLViewerFetchedTexture> > image_list_t;