diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-14 17:56:55 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-14 17:56:55 -0500 |
commit | 984feefbecd0338618ea499dc1fa44c5a5fe747d (patch) | |
tree | 2114f73857009a983ca7b1ce90e2bf36237c57b9 /indra/llrender/llrendertarget.h | |
parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
parent | baa0ff7d3e34053a1dbc8c5207fe899d9e201ee0 (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; }; |