summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-04-07 11:54:03 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-04-07 11:54:03 -0600
commit5aa6abb6be52c4559a3715bb3323543ea024ebff (patch)
treecfe157657c26f5e16064d19b206a7f824b0b3650 /indra/newview/lltexturecache.h
parent87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff)
parent03b0c60ff5c0f458d6979a14bb3518461970e7a4 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/lltexturecache.h')
-rw-r--r--indra/newview/lltexturecache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index ca8815ee7e..5dc06ff401 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -110,7 +110,8 @@ public:
/*virtual*/ S32 update(U32 max_time_ms);
void purgeCache(ELLPath location);
- S64 initCache(ELLPath location, S64 maxsize, BOOL read_only);
+ void setReadOnly(BOOL read_only) ;
+ S64 initCache(ELLPath location, S64 maxsize, BOOL disable_texture_cache);
handle_t readFromCache(const std::string& local_filename, const LLUUID& id, U32 priority, S32 offset, S32 size,
ReadResponder* responder);