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

Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

meow-7.2.2
Eric M. Tulla (BigPapi) 2009-12-31 19:04:49 -05:00
parent eb5a76996a eef77735ce
commit 32657e37ab
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llagentwearables.cpp
View File

@ -2128,6 +2128,7 @@ void LLLibraryOutfitsFetch::done()
}
if (mOutfitsPopulated)
{
gInventory.notifyObservers();
delete this;
}
}
@ -2162,6 +2163,11 @@ void LLLibraryOutfitsFetch::folderDone(void)
// everything is already here - call done.
outfitsDone();
}
else
{
gInventory.removeObserver(this);
gInventory.addObserver(this);
}
}
void LLLibraryOutfitsFetch::outfitsDone(void)
@ -2172,6 +2178,8 @@ void LLLibraryOutfitsFetch::outfitsDone(void)
LLInventoryModel::EXCLUDE_TRASH);
LLInventoryFetchDescendentsObserver::folder_ref_t folders;
llassert(cat_array.count() > 0);
for(S32 i = 0; i < cat_array.count(); ++i)
{
if (cat_array.get(i)->getName() != "More Outfits" && cat_array.get(i)->getName() != "Ruth"){
@ -2186,6 +2194,11 @@ void LLLibraryOutfitsFetch::outfitsDone(void)
// everything is already here - call done.
contentsDone();
}
else
{
gInventory.removeObserver(this);
gInventory.addObserver(this);
}
}
void LLLibraryOutfitsFetch::contentsDone(void)
@ -2199,7 +2212,6 @@ void LLLibraryOutfitsFetch::contentsDone(void)
mOutfits[i].second);
LLAppearanceManager::getInstance()->shallowCopyCategory(mOutfits[i].first, folder_id, NULL);
gInventory.notifyObservers();
}
mOutfitsPopulated = true;
}