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

Merge remote-tracking branch 'lirusato/Canon'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-31 17:21:08 +01:00
parent 70eeddabba d756225684
commit 719ea47a35
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llappearancemgr.cpp
View File

@@ -2026,7 +2026,6 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
// if (!append) // if (!append)
{ {
link_waiter->addItem(category); link_waiter->addItem(category);
}
// Remove current COF contents. Have to do this after creating // Remove current COF contents. Have to do this after creating
// the link_waiter so links can be followed for any items that get // the link_waiter so links can be followed for any items that get
@@ -2034,6 +2033,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
// contain one) // contain one)
bool keep_outfit_links = append; bool keep_outfit_links = append;
purgeCategory(cof, keep_outfit_links); purgeCategory(cof, keep_outfit_links);
}
gInventory.notifyObservers(); gInventory.notifyObservers();
LL_DEBUGS("Avatar") << self_av_string() << "waiting for LLUpdateAppearanceOnDestroy" << LL_ENDL; LL_DEBUGS("Avatar") << self_av_string() << "waiting for LLUpdateAppearanceOnDestroy" << LL_ENDL;