diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
commit | 5ae117aff6bfbc3c07876146ca270129dd91a047 (patch) | |
tree | 462f491cc055aa296b9da0041a322cd9512c045b /indra/newview/lldrawpoolalpha.h | |
parent | 8abd6ed6b8c294ec6bfca59929dbcc71cd65c3a3 (diff) | |
parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) |
merge with viewer-release
Diffstat (limited to 'indra/newview/lldrawpoolalpha.h')
-rwxr-xr-x | indra/newview/lldrawpoolalpha.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h index a4245e561d..43122218ed 100755 --- a/indra/newview/lldrawpoolalpha.h +++ b/indra/newview/lldrawpoolalpha.h @@ -50,11 +50,6 @@ public: LLDrawPoolAlpha(U32 type = LLDrawPool::POOL_ALPHA); /*virtual*/ ~LLDrawPoolAlpha(); - /*virtual*/ S32 getNumDeferredPasses(); - /*virtual*/ void beginDeferredPass(S32 pass); - /*virtual*/ void endDeferredPass(S32 pass); - /*virtual*/ void renderDeferred(S32 pass); - /*virtual*/ S32 getNumPostDeferredPasses(); /*virtual*/ void beginPostDeferredPass(S32 pass); /*virtual*/ void endPostDeferredPass(S32 pass); @@ -70,7 +65,7 @@ public: void renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE); void renderAlpha(U32 mask); void renderAlphaHighlight(U32 mask); - + static BOOL sShowDebugAlpha; private: |