From fd2d81223697bad850b979f308c271ca370eccd3 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 25 Nov 2013 16:03:52 -0500 Subject: SH-4549 FIX - code cleanup --- indra/newview/llinventorybridge.cpp | 33 --------------------------------- indra/newview/llinventoryobserver.cpp | 1 - 2 files changed, 34 deletions(-) (limited to 'indra') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 74837bac37..1f942f5f4b 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2984,39 +2984,6 @@ std::string LLFolderBridge::getLabelSuffix() const : LLStringUtil::null; } -class ScrollOnRenameObserver: public LLInventoryObserver -{ -public: - LLFolderView *mView; - LLUUID mUUID; - - ScrollOnRenameObserver(const LLUUID& uuid, LLFolderView *view): - mUUID(uuid), - mView(view) - { - } - void changed(U32 mask) - { - if (mask & LLInventoryObserver::LABEL) - { - // TODO - check for whether this is the item we're waiting for a rename of - const uuid_set_t& changed_item_ids = gInventory.getChangedIDs(); - for (uuid_set_t::const_iterator it = changed_item_ids.begin(); it != changed_item_ids.end(); ++it) - { - const LLUUID& id = *it; - if (id == mUUID) - { - mView->scrollToShowSelection(); - - gInventory.removeObserver(this); - delete this; - return; - } - } - } - } -}; - BOOL LLFolderBridge::renameItem(const std::string& new_name) { diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index ae59b44184..f71cf26b30 100755 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -706,7 +706,6 @@ void LLScrollOnRenameObserver::changed(U32 mask) { if (mask & LLInventoryObserver::LABEL) { - // TODO - check for whether this is the item we're waiting for a rename of const uuid_set_t& changed_item_ids = gInventory.getChangedIDs(); for (uuid_set_t::const_iterator it = changed_item_ids.begin(); it != changed_item_ids.end(); ++it) { -- cgit v1.2.3