diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-08-31 12:04:10 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-08-31 12:04:10 -0400 |
| commit | 13456d01a71b873ed59e3839f817434357fc8da5 (patch) | |
| tree | 43242564df171301b7518e2e41b0d81a144ec05d /indra/newview/lltexturectrl.h | |
| parent | 96ec4b3a54268416e59fe68e597e5aea4579bd44 (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
DRTVWR-568: Merge branch 'master' into fix-monterey for D483 release.
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; }; ////////////////////////////////////////////////////////////////////////////////////////// |