diff options
author | Ptolemy <ptolemy@lindenlab.com> | 2022-09-02 00:00:58 -0700 |
---|---|---|
committer | Ptolemy <ptolemy@lindenlab.com> | 2022-09-02 00:00:58 -0700 |
commit | 44f1aed84cda3158c19573205ce25d69d632b29a (patch) | |
tree | 310497e0a116f6c5d39212d1f30535c512909144 /indra/newview/llselectmgr.h | |
parent | d9d33c15973550efdb428a165aacd3ccdd7cc14f (diff) | |
parent | e15982eb55c03e53f669eb91715cf2aa7d32998c (diff) |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llselectmgr.h')
-rw-r--r-- | indra/newview/llselectmgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index aec2baa6a7..3b76f87c44 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -605,6 +605,7 @@ public: void selectionSetRestitution(F32 restitution); void selectionSetMaterial(U8 material); void selectionSetImage(const LLUUID& imageid); // could be item or asset id + void selectionSetGLTFMaterial(const LLUUID& mat_id); // could be item or asset id void selectionSetColor(const LLColor4 &color); void selectionSetColorOnly(const LLColor4 &color); // Set only the RGB channels void selectionSetAlphaOnly(const F32 alpha); // Set only the alpha channel |