Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCC fixup.

Browse Source
This commit is contained in:
Shyotl
2015-06-26 01:40:01 -05:00
parent 18c6330af7
commit 4d61305095
6 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/floaterlocalassetbrowse.cpp
View File

@@ -369,7 +369,7 @@ std::vector<affected_object> LocalBitmap::getUsingObjects(bool seek_by_type, boo
{ {
std::vector<affected_object> affected_vector; std::vector<affected_object> affected_vector;
for (std::vector< LLPointer<LLViewerObject>>::iterator iter = gObjectList.mObjects.begin(); for (std::vector< LLPointer<LLViewerObject> >::iterator iter = gObjectList.mObjects.begin();
iter != gObjectList.mObjects.end(); iter++ ) iter != gObjectList.mObjects.end(); iter++ )
{ {
LLViewerObject* obj = *iter; LLViewerObject* obj = *iter;

12
indra/newview/llagentwearables.cpp
View File

@@ -278,11 +278,6 @@ LLAgentWearables::AddWearableToAgentInventoryCallback::AddWearableToAgentInvento
void LLAgentWearables::AddWearableToAgentInventoryCallback::fire(const LLUUID& inv_item) 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()) if (inv_item.isNull())
return; return;
@@ -294,17 +289,12 @@ void LLAgentWearables::AddWearableToAgentInventoryCallback::fire(const LLUUID& i
} }
if (mTodo & CALL_RECOVERDONE) if (mTodo & CALL_RECOVERDONE)
{ {
LLAppearanceMgr::instance().addCOFItemLink(inv_item,false); LLAppearanceMgr::instance().addCOFItemLink(inv_item);
gAgentWearables.recoverMissingWearableDone(); gAgentWearables.recoverMissingWearableDone();
} }
/* /*
* Do this for every one in the loop * 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) if (mTodo & CALL_MAKENEWOUTFITDONE)
{ {
gAgentWearables.makeNewOutfitDone(mType, mIndex); gAgentWearables.makeNewOutfitDone(mType, mIndex);

4
indra/newview/llagentwearablesfetch.cpp
View File

@@ -177,7 +177,7 @@ void LLInitialWearablesFetch::processContents()
// [/SL:KB] // [/SL:KB]
LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true); 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 // [SL:KB] - Patch: Appearance-MixedViewers | Checked: 2010-04-28 (Catznip-3.0.0a) | Modified: Catznip-2.0.0e
if (fUpdateFromCOF) if (fUpdateFromCOF)
// [/SL:KB] // [/SL:KB]
@@ -456,7 +456,7 @@ void LLLibraryOutfitsFetch::outfitsDone()
gInventory.collectDescendents(mLibraryClothingID, cat_array, wearable_array, gInventory.collectDescendents(mLibraryClothingID, cat_array, wearable_array,
LLInventoryModel::EXCLUDE_TRASH); LLInventoryModel::EXCLUDE_TRASH);
llassert(cat_array.count() > 0); llassert(cat_array.size() > 0);
for (LLInventoryModel::cat_array_t::const_iterator iter = cat_array.begin(); for (LLInventoryModel::cat_array_t::const_iterator iter = cat_array.begin();
iter != cat_array.end(); iter != cat_array.end();
++iter) ++iter)

5
indra/newview/llappearancemgr.cpp
View File

@@ -2977,11 +2977,6 @@ void LLAppearanceMgr::addCOFItemLink(const LLInventoryItem *item,
const LLViewerInventoryItem* inv_item = item_array.at(i).get(); const LLViewerInventoryItem* inv_item = item_array.at(i).get();
const LLWearableType::EType wearable_type = inv_item->getWearableType(); 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()) if (inv_item->getLinkedUUID() == vitem->getLinkedUUID())
{ {
linked_already = true; linked_already = true;

1
indra/newview/llfolderview.h
View File

@@ -282,7 +282,6 @@ protected:
protected: protected:
LLHandle<LLView> mPopupMenuHandle; LLHandle<LLView> mPopupMenuHandle;
typedef std::deque<LLFolderViewItem*> selected_items_t;
selected_items_t mSelectedItems; selected_items_t mSelectedItems;
BOOL mKeyboardSelection; BOOL mKeyboardSelection;
BOOL mAllowMultiSelect; BOOL mAllowMultiSelect;

6
indra/newview/llinventorybridge.cpp
View File

@@ -89,6 +89,7 @@
#include "rlvhandler.h" #include "rlvhandler.h"
#include "rlvlocks.h" #include "rlvlocks.h"
// [/RLVa:KB] // [/RLVa:KB]
#include <boost/foreach.hpp>
// Marketplace outbox current disabled // Marketplace outbox current disabled
#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1 #define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1
@@ -2511,7 +2512,10 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
LLInventoryModel::item_array_t items; LLInventoryModel::item_array_t items;
model->collectDescendents(cat_id, cats, items, LLInventoryModel::EXCLUDE_TRASH); model->collectDescendents(cat_id, cats, items, LLInventoryModel::EXCLUDE_TRASH);
LLInventoryObject::const_object_list_t citems; LLInventoryObject::const_object_list_t citems;
citems.insert(citems.begin(), items.begin(), items.end()); BOOST_FOREACH(LLPointer<LLViewerInventoryItem> item, items)
{
citems.push_back(item.get());
}
link_inventory_array(mUUID, citems, NULL); link_inventory_array(mUUID, citems, NULL);
} }
} }