diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-24 16:22:49 -0500 |
| commit | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (patch) | |
| tree | a8525988388de004be72251c0d7783a61d314888 /indra/llrender/llimagegl.h | |
| parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) | |
| parent | b40fad02de170b5da179cacc22f32f5f25ffd7cb (diff) | |
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
Diffstat (limited to 'indra/llrender/llimagegl.h')
| -rw-r--r-- | indra/llrender/llimagegl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index cf3c484c79..57a052b258 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -142,7 +142,7 @@ public: BOOL getHasGLTexture() const { return mTexName != 0; } LLGLuint getTexName() const { return mTexName; } - BOOL getIsAlphaMask() const { return mIsMask; } + BOOL getIsAlphaMask() const; BOOL getIsResident(BOOL test_now = FALSE); // not const @@ -262,11 +262,12 @@ public: #endif public: - static void initClass(S32 num_catagories) ; + static void initClass(S32 num_catagories, BOOL skip_analyze_alpha = false); static void cleanupClass() ; private: static S32 sMaxCategories; + static BOOL sSkipAnalyzeAlpha; //the flag to allow to call readBackRaw(...). //can be removed if we do not use that function at all. |