diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
| commit | 492f820c6b8a164cb201fed232e40e743e8e38c4 (patch) | |
| tree | 7d360ddc2ff2288d1ec8163b6215cf9c81031b51 /indra/llrender/llrendertarget.h | |
| parent | 1c58b3b18ea732e0032e70ae6dc9c8ec2f2834b4 (diff) | |
| parent | 34c01b6b1ff758463dcdff19782e5af668699304 (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; }; |