diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-01-22 09:16:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 09:16:12 -0800 |
| commit | 2adecc6fac9852974e44e3d58ccf2619b45642a9 (patch) | |
| tree | 0465739323a25c7d1457ed17e13a6db8a612ea0b /indra/newview/lltexturectrl.h | |
| parent | 09ee84f675cf08f98cbd49516c5e01c289b42a20 (diff) | |
| parent | 42623ad81142f93290b31b380cc0f888a1c3c3b6 (diff) | |
Merge pull request #658 from secondlife/SL-20606
SL-20606: PBR swatches in build floater should show entire material
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index cb6ce636e0..77919637ac 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -250,6 +250,8 @@ private: commit_callback_t mOnCloseCallback; texture_selected_callback mOnTextureSelectedCallback; LLPointer<LLViewerFetchedTexture> mTexturep; + LLPointer<LLFetchedGLTFMaterial> mGLTFMaterial; + LLPointer<LLViewerTexture> mGLTFPreview; LLUIColor mBorderColor; LLUUID mImageItemID; LLUUID mImageAssetID; @@ -382,6 +384,7 @@ protected: LLPointer<LLViewerTexture> mTexturep; LLPointer<LLFetchedGLTFMaterial> mGLTFMaterial; + LLPointer<LLViewerTexture> mGLTFPreview; LLView* mOwner; LLUUID mImageAssetID; // Currently selected texture |