summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-29 16:35:00 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-29 16:35:00 -0700
commit42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (patch)
tree5a95d2387435ff0a24a4dd8a92d2c74b860a26b8 /indra/newview
parent463969116fa64c6f90cd7eb455e2432db375d359 (diff)
parent124c2f21a38563c81ae93681120518a7dd5cf38c (diff)
STORM-303, STORM-270 : merge with 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