diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-05-06 08:38:45 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-05-06 08:38:45 -0700 |
| commit | afe5d1f270b61fd1cc2eed45506874fb53dd54ce (patch) | |
| tree | f69429228e9d7ad3d2962e9822640b5f4bb60398 /indra/newview/llpanelface.h | |
| parent | c9be81a74753600b8a06f369966674b50ef9781a (diff) | |
| parent | 8b74adc89baad2a4f864e028951cd22f8d9d49b2 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17116-material-messaging
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); |