diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
| commit | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch) | |
| tree | f963815f91b6259ea403d41807d19b69e759897e /indra/newview/llappviewer.h | |
| parent | 516ec63f52245a777725d29efe3c35e4e4e72936 (diff) | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 27e8bec1d5..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; } @@ -191,6 +193,7 @@ private: bool initThreads(); // Initialize viewer threads, return false on failure. bool initConfiguration(); // Initialize settings from the command line/config file. + void initGridChoice(); bool initCache(); // Initialize local client cache. |