summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.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/llappviewer.h
parent87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff)
parent03b0c60ff5c0f458d6979a14bb3518461970e7a4 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r--indra/newview/llappviewer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index a915b7fa50..60645c46d4 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -102,6 +102,8 @@ public:
static LLImageDecodeThread* getImageDecodeThread() { return sImageDecodeThread; }
static LLTextureFetch* getTextureFetch() { return sTextureFetch; }
+ static S32 getCacheVersion() ;
+
const std::string& getSerialNumber() { return mSerialNumber; }
bool getPurgeCache() const { return mPurgeCache; }