diff options
author | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
commit | 55f69de90c9b32c7fa25f16ec7d1f41064eff614 (patch) | |
tree | 054b0d99490cc6600b3be0e3cb2aaf7918f3fe50 /indra/llrender/llrendertarget.h | |
parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
parent | 1bea08335b6c2fa31f414db2fe7316a118b2ec18 (diff) |
merge
Diffstat (limited to 'indra/llrender/llrendertarget.h')
-rw-r--r-- | indra/llrender/llrendertarget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h index dea1de12d8..2735ab21c5 100644 --- a/indra/llrender/llrendertarget.h +++ b/indra/llrender/llrendertarget.h @@ -64,6 +64,7 @@ class LLRenderTarget public: //whether or not to use FBO implementation static bool sUseFBO; + static U32 sBytesAllocated; LLRenderTarget(); ~LLRenderTarget(); @@ -147,7 +148,6 @@ protected: bool mUseDepth; bool mRenderDepth; LLTexUnit::eTextureType mUsage; - U32 mSamples; static LLRenderTarget* sBoundTarget; }; |