summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-08-10 10:53:59 -0700
committerRichard Nelson <richard@lindenlab.com>2011-08-10 10:53:59 -0700
commite1532afb1267b2012a6fbb9b72b09ab80a85f763 (patch)
treee35dbac762939feef4d175f3b133ae9d9f27e0ff /indra/newview
parent802a063a878a145904d152bed98ac55e7cfecb42 (diff)
parent11005a9d917dde208fc0917bb84701d09e1a395e (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfolderview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 02be477e0d..f471caa65c 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -2040,8 +2040,10 @@ void LLFolderView::removeItemID(const LLUUID& id)
mItemMap.erase(id);
}
+LLFastTimer::DeclareTimer FTM_GET_ITEM_BY_ID("Get FolderViewItem by ID");
LLFolderViewItem* LLFolderView::getItemByID(const LLUUID& id)
{
+ LLFastTimer _(FTM_GET_ITEM_BY_ID);
if (id == getListener()->getUUID())
{
return this;