diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 734125fb03..d3d35839f5 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -942,14 +942,6 @@ void LLFolderViewItem::draw() } LLColor4 color = (mIsSelected && filled) ? mFontHighlightColor : mFontColor; - // Re-apply FIRE-6714: Don't move objects to trash during cut&paste - // Don't hide cut items in inventory - if (!getRoot()->getFolderViewModel()->getFilter().checkClipboard(getViewModelItem())) - { - // Fade out item color to indicate it's being cut - color.mV[VALPHA] *= 0.5f; - } - // Re-apply FIRE-6714: Don't move objects to trash during cut&paste drawLabel(font, text_left, y, color, right_x); // Special for protected items diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h index 6a12c6f5a5..78886c0b1d 100644 --- a/indra/llui/llfolderviewmodel.h +++ b/indra/llui/llfolderviewmodel.h @@ -83,8 +83,6 @@ public: // +-------------------------------------------------------------------+ virtual bool check(const LLFolderViewModelItem* item) = 0; virtual bool checkFolder(const LLFolderViewModelItem* folder) const = 0; - // For clipboard highlighting - virtual bool checkClipboard(const LLFolderViewModelItem* item) = 0; virtual void setEmptyLookupMessage(const std::string& message) = 0; virtual std::string getEmptyLookupMessage() const = 0; diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index f4baa9fc3c..640f1a4144 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -243,8 +243,6 @@ public: bool check(const LLFolderViewModelItem* item) { return true; } bool checkFolder(const LLFolderViewModelItem* folder) const { return true; } - // For clipboard highlighting - bool checkClipboard(const LLFolderViewModelItem* item) { return true; } void setEmptyLookupMessage(const std::string& message) { } std::string getEmptyLookupMessage() const { return mEmpty; } bool showAllResults() const { return true; } diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 6e452fc95d..668308058b 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -331,8 +331,7 @@ BOOL LLInvFVBridge::perform_cutToClipboard() { LLClipboard::instance().setCutMode(true); BOOL added_to_clipboard = LLClipboard::instance().addToClipboard(mUUID); - // Re-apply FIRE-6714: Don't move objects to trash during cut&paste - //removeObject(&gInventory, mUUID); // Always perform the remove even if the object couldn't make it to the clipboard + removeObject(&gInventory, mUUID); // Always perform the remove even if the object couldn't make it to the clipboard return added_to_clipboard; } return FALSE; diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 531f527046..d9dadf3b85 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -118,11 +118,7 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item) const LLFolderViewModelItemInventory* listener = dynamic_cast(item); // Clipboard cut items are *always* filtered so we need this value upfront - // FIRE-6714: Don't move objects to trash during cut&paste - // Don't hide cut items in inventory - //const BOOL passed_clipboard = (listener ? checkAgainstClipboard(listener->getUUID()) : TRUE); - const BOOL passed_clipboard = TRUE; - // FIRE-6714: Don't move objects to trash during cut&paste + const BOOL passed_clipboard = (listener ? checkAgainstClipboard(listener->getUUID()) : TRUE); // If it's a folder and we're showing all folders, return automatically. const BOOL is_folder = listener->getInventoryType() == LLInventoryType::IT_CATEGORY; @@ -200,11 +196,7 @@ bool LLInventoryFilter::check(const LLInventoryItem* item) const bool passed_string = (mFilterSubString.size() ? item->getName().find(mFilterSubString) != std::string::npos : true); const bool passed_filtertype = checkAgainstFilterType(item); const bool passed_permissions = checkAgainstPermissions(item); - // FIRE-6714: Don't move objects to trash during cut&paste - // Don't hide cut items in inventory - //const bool passed_clipboard = checkAgainstClipboard(item->getUUID()); - const bool passed_clipboard = true; - // Don't filter cut items + const bool passed_clipboard = checkAgainstClipboard(item->getUUID()); return passed_filtertype && passed_permissions && passed_clipboard && passed_string; } @@ -226,11 +218,7 @@ bool LLInventoryFilter::checkFolder(const LLFolderViewModelItem* item) const bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const { // Always check against the clipboard - // FIRE-6714: Don't move objects to trash during cut&paste - // Don't hide cut items in inventory - //const BOOL passed_clipboard = checkAgainstClipboard(folder_id); - const BOOL passed_clipboard = TRUE; - // FIRE-6714: Don't move objects to trash during cut&paste + const BOOL passed_clipboard = checkAgainstClipboard(folder_id); // we're showing all folders, overriding filter if (mFilterOps.mShowFolderState == LLInventoryFilter::SHOW_ALL_FOLDERS) @@ -528,19 +516,6 @@ bool LLInventoryFilter::checkAgainstClipboard(const LLUUID& object_id) const return true; } -// For clipboard highlighting -bool LLInventoryFilter::checkClipboard(const LLFolderViewModelItem* item) -{ - const LLFolderViewModelItemInventory* listener = dynamic_cast(item); - if (!listener) - { - return true; - } - - return checkAgainstClipboard(listener->getUUID()); -} -// - bool LLInventoryFilter::checkAgainstPermissions(const LLFolderViewModelItemInventory* listener) const { if (!listener) return FALSE; diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h index 65011799dd..256a3bb4dd 100644 --- a/indra/newview/llinventoryfilter.h +++ b/indra/newview/llinventoryfilter.h @@ -235,8 +235,6 @@ public: // +-------------------------------------------------------------------+ bool check(const LLFolderViewModelItem* listener); bool check(const LLInventoryItem* item); - // For clipboard highlighting - bool checkClipboard(const LLFolderViewModelItem* item); bool checkFolder(const LLFolderViewModelItem* listener) const; bool checkFolder(const LLUUID& folder_id) const;