diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-05-06 17:16:56 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-05-06 17:16:56 +0000 |
| commit | 6c1fdac9df52ff920860066905a08db748ab0d95 (patch) | |
| tree | efaeec3a59ff485afaa219698c5061f4fe29bcf8 /indra/newview/llpanelface.h | |
| parent | af11b7fb9c475755d389991e6ede7d269dee0100 (diff) | |
| parent | 6095a7d3105ec75c6df55383f1f919bff7bbfb71 (diff) | |
Merged in brad/SL-17116-material-messaging (pull request #973)
brad/SL-17198 material assets
Approved-by: Euclid Linden
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rw-r--r-- | indra/newview/llpanelface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 2a53b7ff15..a8ecf8fdf2 100644 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -207,7 +207,7 @@ protected: static void onAlignTexture(void*); static void onSaveMaterial(void*); - static void renderMaterialToLLSD(LLSD* sd, LLUUID uuid, void* userdata); + static LLSD renderMaterialToLLSD(LLUUID uuid, void* userdata); static void applyMaterialUUID(LLUUID uuid, void*); static F32 valueGlow(LLViewerObject* object, S32 face); |