diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:35:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:35:18 -0400 |
| commit | 76eb05380c619daac543872d9ad3ca40a03062c0 (patch) | |
| tree | c912cdfd58eb135231c6230b84f230439f362163 /indra/newview/llappviewer.h | |
| parent | 592ebc9ec63b3c1e636fdd96c68353f97e298506 (diff) | |
| parent | a6e94d201612dcf601aba2a665ddaf86745c9803 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 1fcf38d18a..c5cac6827c 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -94,7 +94,8 @@ public: static LLImageDecodeThread* getImageDecodeThread() { return sImageDecodeThread; } static LLTextureFetch* getTextureFetch() { return sTextureFetch; } - static S32 getCacheVersion() ; + static U32 getTextureCacheVersion() ; + static U32 getObjectCacheVersion() ; const std::string& getSerialNumber() { return mSerialNumber; } |