diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-08-30 15:23:37 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-08-30 15:23:37 -0700 |
| commit | 2aace1793b2940c86b2aa0d001137d09aec82dae (patch) | |
| tree | cae30bd3700fe91c23adce45aeae17531f5f70db /indra/newview/lltexturectrl.h | |
| parent | ef58b9751a514e5e63cd77f9f78e6513bc6403cd (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
Merge branch 'master' into DRTVWR-568
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 3769f43737..fbb38c4464 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -169,6 +169,8 @@ public: void setBlankImageAssetID( const LLUUID& id ) { mBlankImageAssetID = id; } const LLUUID& getBlankImageAssetID() const { return mBlankImageAssetID; } + void setOpenTexPreview(bool open_preview) { mOpenTexPreview = open_preview; } + void setCaption(const std::string& caption); void setCanApplyImmediately(BOOL b); @@ -248,6 +250,8 @@ private: BOOL mShowLoadingPlaceholder; std::string mLoadingPlaceholderString; S32 mLabelWidth; + bool mOpenTexPreview; + BOOL mBakeTextureEnabled; }; ////////////////////////////////////////////////////////////////////////////////////////// |