summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorKyle Ambroff <ambroff@lindenlab.com>2010-10-29 19:52:01 -0700
committerKyle Ambroff <ambroff@lindenlab.com>2010-10-29 19:52:01 -0700
commitfa17864382a64c90e9106a54368386f6e4115d67 (patch)
tree7883e97e7bd4d3b0a7d9ac7a0096424e71e0c1ad /indra/newview/llinventorypanel.cpp
parent4b49b0eff79c41060ba53d0d33ff83b4c18e277b (diff)
parent42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (diff)
Merge with lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-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