diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-05-05 21:39:20 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-05-05 21:39:20 +0000 |
| commit | 8b74adc89baad2a4f864e028951cd22f8d9d49b2 (patch) | |
| tree | 52fb1c527a86f5fc0a1020ea4ba37b4da5d88eb2 /indra/newview/llpanelface.h | |
| parent | fa26abf9017e3bf279904e21065d085baec21819 (diff) | |
| parent | cce5fdca844c3e762288e7aa4b255c29a5408e45 (diff) | |
Merged in euclid-17325 (pull request #968)
SL-17325 apply inventory material to face
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 9282b70b3c..2a53b7ff15 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -205,7 +205,10 @@ protected: static void onCommitRepeatsPerMeter( LLUICtrl* ctrl, void* userinfo); static void onClickAutoFix(void*); static void onAlignTexture(void*); + static void onSaveMaterial(void*); + static void renderMaterialToLLSD(LLSD* sd, LLUUID uuid, void* userdata); + static void applyMaterialUUID(LLUUID uuid, void*); static F32 valueGlow(LLViewerObject* object, S32 face); |