From 4d61305095805db84155951a4b007229ad45e210 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 26 Jun 2015 01:40:01 -0500 Subject: [PATCH] GCC fixup. --- indra/newview/floaterlocalassetbrowse.cpp | 2 +- indra/newview/llagentwearables.cpp | 12 +----------- indra/newview/llagentwearablesfetch.cpp | 4 ++-- indra/newview/llappearancemgr.cpp | 5 ----- indra/newview/llfolderview.h | 1 - indra/newview/llinventorybridge.cpp | 6 +++++- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/indra/newview/floaterlocalassetbrowse.cpp b/indra/newview/floaterlocalassetbrowse.cpp index f58754779..b7a404e2f 100644 --- a/indra/newview/floaterlocalassetbrowse.cpp +++ b/indra/newview/floaterlocalassetbrowse.cpp @@ -369,7 +369,7 @@ std::vector LocalBitmap::getUsingObjects(bool seek_by_type, boo { std::vector affected_vector; - for (std::vector< LLPointer>::iterator iter = gObjectList.mObjects.begin(); + for (std::vector< LLPointer >::iterator iter = gObjectList.mObjects.begin(); iter != gObjectList.mObjects.end(); iter++ ) { LLViewerObject* obj = *iter; diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 046b45b5c..a8f21ed2f 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -278,11 +278,6 @@ LLAgentWearables::AddWearableToAgentInventoryCallback::AddWearableToAgentInvento void LLAgentWearables::AddWearableToAgentInventoryCallback::fire(const LLUUID& inv_item) { - if (mTodo & CALL_CREATESTANDARDDONE) - { - LL_INFOS() << "callback fired, inv_item " << inv_item.asString() << LL_ENDL; - } - if (inv_item.isNull()) return; @@ -294,17 +289,12 @@ void LLAgentWearables::AddWearableToAgentInventoryCallback::fire(const LLUUID& i } if (mTodo & CALL_RECOVERDONE) { - LLAppearanceMgr::instance().addCOFItemLink(inv_item,false); + LLAppearanceMgr::instance().addCOFItemLink(inv_item); gAgentWearables.recoverMissingWearableDone(); } /* * Do this for every one in the loop */ - if (mTodo & CALL_CREATESTANDARDDONE) - { - LLAppearanceMgr::instance().addCOFItemLink(inv_item,false); - gAgentWearables.createStandardWearablesDone(mType, mIndex); - } if (mTodo & CALL_MAKENEWOUTFITDONE) { gAgentWearables.makeNewOutfitDone(mType, mIndex); diff --git a/indra/newview/llagentwearablesfetch.cpp b/indra/newview/llagentwearablesfetch.cpp index 9b8d91af9..d12d592cc 100644 --- a/indra/newview/llagentwearablesfetch.cpp +++ b/indra/newview/llagentwearablesfetch.cpp @@ -177,7 +177,7 @@ void LLInitialWearablesFetch::processContents() // [/SL:KB] LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true); -// if (wearable_array.count() > 0) +// if (wearable_array.size() > 0) // [SL:KB] - Patch: Appearance-MixedViewers | Checked: 2010-04-28 (Catznip-3.0.0a) | Modified: Catznip-2.0.0e if (fUpdateFromCOF) // [/SL:KB] @@ -456,7 +456,7 @@ void LLLibraryOutfitsFetch::outfitsDone() gInventory.collectDescendents(mLibraryClothingID, cat_array, wearable_array, LLInventoryModel::EXCLUDE_TRASH); - llassert(cat_array.count() > 0); + llassert(cat_array.size() > 0); for (LLInventoryModel::cat_array_t::const_iterator iter = cat_array.begin(); iter != cat_array.end(); ++iter) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 96b6990c2..0b804a4da 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -2977,11 +2977,6 @@ void LLAppearanceMgr::addCOFItemLink(const LLInventoryItem *item, const LLViewerInventoryItem* inv_item = item_array.at(i).get(); const LLWearableType::EType wearable_type = inv_item->getWearableType(); - const bool is_body_part = (wearable_type == LLWearableType::WT_SHAPE) - || (wearable_type == LLWearableType::WT_HAIR) - || (wearable_type == LLWearableType::WT_EYES) - || (wearable_type == LLWearableType::WT_SKIN); - if (inv_item->getLinkedUUID() == vitem->getLinkedUUID()) { linked_already = true; diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 5311fb5f4..3a147c442 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -282,7 +282,6 @@ protected: protected: LLHandle mPopupMenuHandle; - typedef std::deque selected_items_t; selected_items_t mSelectedItems; BOOL mKeyboardSelection; BOOL mAllowMultiSelect; diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index e3cc5faae..0d7adca28 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -89,6 +89,7 @@ #include "rlvhandler.h" #include "rlvlocks.h" // [/RLVa:KB] +#include // Marketplace outbox current disabled #define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1 @@ -2511,7 +2512,10 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, LLInventoryModel::item_array_t items; model->collectDescendents(cat_id, cats, items, LLInventoryModel::EXCLUDE_TRASH); LLInventoryObject::const_object_list_t citems; - citems.insert(citems.begin(), items.begin(), items.end()); + BOOST_FOREACH(LLPointer item, items) + { + citems.push_back(item.get()); + } link_inventory_array(mUUID, citems, NULL); } }