diff options
author | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
commit | b3c010ea7130331d454c480b82d1309bac712004 (patch) | |
tree | 8f5e2ba709ebd52400f2831785e0c07c3396815f /indra/newview/lldrawpoolalpha.h | |
parent | d65f09ebcafe6ca968236a9991961983d4cd7a47 (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
Pull merge lindenlab/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: |