diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-01-25 16:41:33 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-01-25 16:41:33 -0800 |
| commit | ef8cb022bb7ba38a330a5a9f7da64572794946b2 (patch) | |
| tree | 80d13c0d2e6d19fb131378c29edcb2eb29472bab /indra/llrender/llimagegl.h | |
| parent | 226f64ea796745c8d95142cfffe75cc5a6d04e26 (diff) | |
| parent | b00813ae3ca14a7531d93d35d795ce7c23119886 (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llimagegl.h')
| -rw-r--r-- | indra/llrender/llimagegl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index facfb7bd62..f0870c3fc4 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -193,6 +193,8 @@ public: private: LLPointer<LLImageRaw> mSaveData; // used for destroyGL/restoreGL U8* mPickMask; //downsampled bitmap approximation of alpha channel. NULL if no alpha channel + U16 mPickMaskWidth; + U16 mPickMaskHeight; S8 mUseMipMaps; S8 mHasExplicitFormat; // If false (default), GL format is f(mComponents) S8 mAutoGenMips; |