Skip to content
Snippets Groups Projects
Commit 42b49397 authored by Merov Linden's avatar Merov Linden
Browse files

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

parents 46396911 124c2f21
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llinventorypanel.cpp
+ 4
− 1
View file @ 42b49397
...@@ -290,7 +290,10 @@ void LLInventoryPanel::modelChanged(U32 mask) ...@@ -290,7 +290,10 @@ void LLInventoryPanel::modelChanged(U32 mask)
const LLUUID& item_id = (*items_iter); const LLUUID& item_id = (*items_iter);
const LLInventoryObject* model_item = model->getObject(item_id); const LLInventoryObject* model_item = model->getObject(item_id);
LLFolderViewItem* view_item = mFolderRoot->getItemByID(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 // LABEL Operation
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment