diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
commit | 4bbe823302427a705ea541d968f6058571a13c2f (patch) | |
tree | d932a7a3483b674a7600b0e4bff3d0bda3344b35 /indra/newview/llinventorypanel.cpp | |
parent | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (diff) | |
parent | f7af29ab40c2405504969a453eba3919be1af5c5 (diff) |
merge with STORM-105
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 |