diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:16:14 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:16:14 +0200 |
| commit | fee385247e3d3ce3264df8a9f796c4c91cc31d96 (patch) | |
| tree | d3fca87208b5d8b28d01c13f00f2fec997256c47 /indra/newview/llmaterialeditor.h | |
| parent | aed6313d7c755ae1b980074fc27dfd98267fca24 (diff) | |
| parent | 77395eddc911e0801e50fd693f7bbaee8046aa95 (diff) | |
Merge branch 'main' into DRTVWR-594-maint-Y
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index 95a4c4572d..4e0350b4cc 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -117,7 +117,6 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener 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); static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |