diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2022-09-02 19:56:35 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2022-09-02 19:56:35 +0100 |
commit | 852d552ca205506bba3dcd5a31a012f1acdf1cc4 (patch) | |
tree | bc4e2776dec44c7b7271cc5ad4b460fa29b100db /indra/newview/llselectmgr.h | |
parent | 3c3442cbbc38beff1ab82ffcc7f81390c7979361 (diff) | |
parent | bded34a8615a2adceb2eda2f2d85501a70990efe (diff) |
Merge branch 'DRTVWR-559' of https://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 |