STORM-303, STORM-270 : merge with viewer-development

meow-7.2.2
Merov Linden 2010-10-29 16:35:00 -07:00
commit 42b49397d2
1 changed files with 4 additions and 1 deletions

View File

@ -290,7 +290,10 @@ void LLInventoryPanel::modelChanged(U32 mask)
const LLUUID& item_id = (*items_iter);
const LLInventoryObject* model_item = model->getObject(item_id);
LLFolderViewItem* view_item = mFolderRoot->getItemByID(item_id);
LLFolderViewFolder* view_folder = mFolderRoot->getFolderByID(item_id);
// LLFolderViewFolder is derived from LLFolderViewItem so dynamic_cast from item
// to folder is the fast way to get a folder without searching through folders tree.
LLFolderViewFolder* view_folder = dynamic_cast<LLFolderViewFolder*>(view_item);
//////////////////////////////
// LABEL Operation