diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-08-14 09:29:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-14 09:29:58 -0700 |
| commit | 50e2973cd2360dedd6baf1c0772d9d009e2628d4 (patch) | |
| tree | 71a86030d3d52045642ea1a21168a2effc98e4f6 /indra/newview/llpanelface.h | |
| parent | d8e4572b901b429439f991703f2bc12f81e03901 (diff) | |
| parent | 076a02e2d8ddb10856602c3f5f3115ace41327b5 (diff) | |
Merge pull request #323 from secondlife/SL-20024
SL-20024: Improve material permissions handling
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index f6a813f9e5..d07be2e4b4 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -35,6 +35,8 @@ #include "lltextureentry.h" #include "llselectmgr.h" +#include <memory> + class LLButton; class LLCheckBoxCtrl; class LLColorSwatchCtrl; @@ -51,6 +53,8 @@ class LLMaterialID; class LLMediaCtrl; class LLMenuButton; +class PBRPickerItemListener; + // Represents an edit for use in replicating the op across one or more materials in the selection set. // // The apply function optionally performs the edit which it implements @@ -292,7 +296,7 @@ private: // // Do NOT call updateUI from within this function. // - void updateVisibility(); + void updateVisibility(LLViewerObject* objectp = nullptr); // Hey look everyone, a type-safe alternative to copy and paste! :) // @@ -453,7 +457,7 @@ private: void onPbrSelectionChanged(LLInventoryItem* itemp); void updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values); - void updateVisibilityGLTF(); + void updateVisibilityGLTF(LLViewerObject* objectp = nullptr); void updateSelectedGLTFMaterials(std::function<void(LLGLTFMaterial*)> func); void updateGLTFTextureTransform(float value, U32 pbr_type, std::function<void(LLGLTFMaterial::TextureTransform*)> edit); @@ -503,6 +507,8 @@ private: static Selection sMaterialOverrideSelection; + std::unique_ptr<PBRPickerItemListener> mInventoryListener; + public: #if defined(DEF_GET_MAT_STATE) #undef DEF_GET_MAT_STATE @@ -583,7 +589,6 @@ public: DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setNormalID); DEF_EDIT_MAT_STATE(LLUUID,const LLUUID&,setSpecularID); DEF_EDIT_MAT_STATE(LLColor4U, const LLColor4U&,setSpecularLightColor); - DEF_EDIT_MAT_STATE(LLUUID, const LLUUID&, setMaterialID); }; class LLSelectedTE |