diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
commit | f7af29ab40c2405504969a453eba3919be1af5c5 (patch) | |
tree | f31f6d31582e8ff89c769334cb70e1076c887ef7 /indra/newview/llinventorypanel.cpp | |
parent | c2500f808cd8e1957054d5ec1b3555e30698c2b3 (diff) | |
parent | 889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (diff) |
merge with 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 |