diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-11-04 10:32:58 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-11-04 10:32:58 -0400 |
commit | c24586756954107218b6a85b480732c46444a02a (patch) | |
tree | ba410d561dd5cbe53574c313380c676b16e0db0c /indra/newview/llinventorypanel.cpp | |
parent | 89f191cd68c54f1d6f46d7d8d4011df180c9de8d (diff) | |
parent | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r-- | indra/newview/llinventorypanel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 50adae09c0..0870b5b8dd 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -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 |