diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
| commit | 761bf254a4e72ec521ff1a52ac12f8594a350818 (patch) | |
| tree | c72f84bb4ac319c10299a35934b52a09a73a127d /indra/newview/lldrawpoolalpha.h | |
| parent | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff) | |
| parent | 1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff) | |
merge changes for 3.6.0-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: |