livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace changes of LLInventoryModel::item_array_t being a vector now.

Nicky 2014-06-10 19:42:37 +02:00
parent d08c416738
commit c952913ff3
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fsfloaterimport.cpp
View File

@ -1225,7 +1225,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
{
url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
new_file_agent_inventory = true;
LLTrace::add(LLVStatViewer::UPLOAD_SOUND,1);
LLTrace::add(LLStatViewer::UPLOAD_SOUND,1);
}
}
@ -1341,7 +1341,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
{
url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
new_file_agent_inventory = true;
LLTrace::add(LLStatViewer::UPLOAD_ANIM_COUNT,1);
LLTrace::add(LLStatViewer::ANIMATION_UPLOADS,1);
}
}
break;

19
indra/newview/llappearancemgr.cpp
View File

@ -1230,7 +1230,7 @@ static void removeDuplicateWearableItemsByAssetID(LLInventoryModel::item_array_t
if (idsAsset.end() == idsAsset.find(pItem->getAssetUUID()))
idsAsset.insert(pItem->getAssetUUID());
else
items.remove(idxItem);
items.erase(items.begin()+idxItem);
}
}
// [/SL:KB]
@ -1500,7 +1500,16 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
{
LL_INFOS() << "reinserting bridge at outfit remove" << LL_ENDL;
//items.find(FSLSLBridge::instance().getBridge());
items.removeObj(FSLSLBridge::instance().getBridge());
for (LLInventoryModel::item_array_t::iterator i = items.begin(); i != items.end(); ++i)
{
LLViewerInventoryItem *item = *i;
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
items.erase( i );
break;
}
}
}
}
// </FS:TT>
@ -3112,13 +3121,13 @@ void LLAppearanceMgr::updateIsDirty()
LLInventoryModel::EXCLUDE_TRASH, collector);
// <FS:TS> FIRE-3018: Ignore the bridge when checking for dirty.
for (U32 i = 0; i < cof_items.size(); ++i)
for (LLInventoryModel::item_array_t::iterator i = cof_items.begin(); i != cof_items.end(); ++i)
{
LLViewerInventoryItem *item = cof_items.at(i);
LLViewerInventoryItem *item = *i;
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
cof_items.remove(i);
cof_items.erase( i );
break;
}
}