diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 11:15:02 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 11:15:02 -0600 |
| commit | 1379188c82a49617782288a61f1c3908d8738a3e (patch) | |
| tree | 8a0c020aa8f6ab9ab2b62bfff01cd67e9c34bd32 /indra/newview/llviewertexture.h | |
| parent | e62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff) | |
| parent | e547c36e2562589c120bb23ee88308e21a826cd1 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index de528927b4..a4a5ae0a5b 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -597,7 +597,7 @@ public: private: void init(bool firstinit) ; - void scaleDown() ; + bool scaleDown() ; private: F32 mDiscardVirtualSize; // Virtual size used to calculate desired discard |