summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorWolfpup Lowenhar <wolfpup67@earthlink.net>2010-10-31 08:08:41 -0400
committerWolfpup Lowenhar <wolfpup67@earthlink.net>2010-10-31 08:08:41 -0400
commita4bb2b8bddcc58a99611bc88993543b9c1384b3b (patch)
treefa78ca5c59505bfb5d51e8f8b371f762fb5bb1da /indra/newview
parentdafece369a796bc1501246c45008ddb9e4ccb765 (diff)
parent42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (diff)
STORM-255 : Merge from viewer-development
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorypanel.cpp5
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