diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/pipeline.h | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index ac2c32fedd..389b80813d 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -389,6 +389,8 @@ public: static BOOL sRenderGlow; static BOOL sTextureBindTest; static BOOL sRenderFrameTest; + static BOOL sRenderAttachedLights; + static BOOL sRenderAttachedParticles; //screen texture LLRenderTarget mScreen; @@ -403,10 +405,6 @@ public: //texture for making the glow LLRenderTarget mGlow[3]; - - //framebuffer objects for off-screen scratch space - //GLuint mFramebuffer[4]; - //GLuint mDepthbuffer[2]; //dynamic cube map scratch space LLPointer<LLCubeMap> mCubeBuffer; |