diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-09-09 14:52:06 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-09-09 14:52:06 -0700 |
| commit | 4192cfc1ea36a82f898839544932dc4d5cec00d3 (patch) | |
| tree | cee96d7efe75f771fe9f7f9f9b2cd42dc1f5f123 /indra/newview/llmaterialeditor.h | |
| parent | d6f15179d1a5c7bdb8977652aee557b3bd051cf7 (diff) | |
| parent | 52d973e95567efcb145ed0de1f4b6f0e19663776 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index 6b2f49e2fc..b29db706f8 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -115,6 +115,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener static bool canModifyObjectsMaterial(); static bool canSaveObjectsMaterial(); + static bool canClipboardObjectsMaterial(); static void saveObjectsMaterialAs(); static void onCopyObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions, const LLUUID& object_id, const LLUUID& item_id); static void onSaveObjectsMaterialAsMsgCallback(const LLSD& notification, const LLSD& response, const LLPermissions& permissions); |