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

Merge.

meow-7.2.2
Nicky 2016-12-10 10:26:38 +01:00
parent 71e485ae57 d8e74da69f
commit 8be6e2ec49
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewerobject.cpp
View File

@ -3103,7 +3103,10 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS
LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(it->get());
if(item && item->getType() != LLAssetType::AT_CATEGORY)
{
std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
// <FS> Copy & paste error
//std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.end(), item->getAssetUUID());
// </FS>
if (id_it != pending_lst.end())
{
pending_lst.erase(id_it);