From 02e713b392e4399597708d23f9da36efa7bbcb41 Mon Sep 17 00:00:00 2001 From: Liny Date: Sat, 16 May 2020 05:01:32 -0700 Subject: [PATCH] Revert "BUG-228760 Notecard editor external edit button graphical error" This reverts commit 5cab84388af050bc129bd636124464abf617dd92. --- indra/newview/llpreviewnotecard.cpp | 30 +++++++++++------------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp index 9feaab50e2..9dd6a7cf76 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -125,15 +125,13 @@ bool LLPreviewNotecard::saveItem() void LLPreviewNotecard::setEnabled( BOOL enabled ) { - LLViewerTextEditor* editor = findChild("Notecard Editor"); - // editor is part of xml, if it doesn't exists, nothing else does - if (editor) - { - editor->setEnabled(enabled); - getChildView("lock")->setVisible( !enabled); - getChildView("desc")->setEnabled(enabled); - getChildView("Save")->setEnabled(enabled && (!editor->isPristine())); - } + + LLViewerTextEditor* editor = getChild("Notecard Editor"); + + getChildView("Notecard Editor")->setEnabled(enabled); + getChildView("lock")->setVisible( !enabled); + getChildView("desc")->setEnabled(enabled); + getChildView("Save")->setEnabled(enabled && editor && (!editor->isPristine())); } @@ -340,7 +338,6 @@ void LLPreviewNotecard::loadAsset() { editor->setEnabled(FALSE); getChildView("lock")->setVisible( TRUE); - getChildView("Edit")->setEnabled(FALSE); // Don't enable external editor button on no mod notecards. } if((allow_modify || is_owner) && !source_library) @@ -566,19 +563,14 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem, bool sync) if (mObjectUUID.isNull() && !agent_url.empty()) { - uploadInfo = std::make_shared(mItemUUID, LLAssetType::AT_NOTECARD, buffer, - [](LLUUID itemId, LLUUID newAssetId, LLUUID newItemId, LLSD) { - LLPreviewNotecard::finishInventoryUpload(itemId, newAssetId, newItemId); - }); + uploadInfo = LLResourceUploadInfo::ptr_t(new LLBufferedAssetUploadInfo(mItemUUID, LLAssetType::AT_NOTECARD, buffer, + boost::bind(&LLPreviewNotecard::finishInventoryUpload, _1, _2, _3))); url = agent_url; } else if (!mObjectUUID.isNull() && !task_url.empty()) { - LLUUID object_uuid(mObjectUUID); - uploadInfo = std::make_shared(mObjectUUID, mItemUUID, LLAssetType::AT_NOTECARD, buffer, - [object_uuid](LLUUID itemId, LLUUID, LLUUID newAssetId, LLSD) { - LLPreviewNotecard::finishTaskUpload(itemId, newAssetId, object_uuid); - }); + uploadInfo = LLResourceUploadInfo::ptr_t(new LLBufferedAssetUploadInfo(mObjectUUID, mItemUUID, LLAssetType::AT_NOTECARD, buffer, + boost::bind(&LLPreviewNotecard::finishTaskUpload, _1, _3, mObjectUUID))); url = task_url; }