diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-08-08 15:17:48 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-08-08 15:17:48 -0700 |
commit | 1d675841717f664a46e9963b6c51cf77b0678ecf (patch) | |
tree | 359274802ab043393cab5c460c9f523ed4c27adc /indra/newview/llfolderview.cpp | |
parent | b6685b5872a4afe976f39d201868b8d656044e84 (diff) | |
parent | f5886bfaff0385acf0a55bc1b8678330ae89442a (diff) |
merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r-- | indra/newview/llfolderview.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 7581fa91c5..02be477e0d 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -369,16 +369,6 @@ void LLFolderView::closeAllFolders() arrangeAll(); } -void LLFolderView::openFolder(const std::string& foldername) -{ - LLFolderViewFolder* inv = findChild<LLFolderViewFolder>(foldername); - if (inv) - { - setSelection(inv, FALSE, FALSE); - inv->setOpen(TRUE); - } -} - void LLFolderView::openTopLevelFolders() { for (folders_t::iterator iter = mFolders.begin(); @@ -720,8 +710,10 @@ void LLFolderView::extendSelection(LLFolderViewItem* selection, LLFolderViewItem mSignalSelectCallback = SIGNAL_KEYBOARD_FOCUS; } +static LLFastTimer::DeclareTimer FTM_SANITIZE_SELECTION("Sanitize Selection"); void LLFolderView::sanitizeSelection() { + LLFastTimer _(FTM_SANITIZE_SELECTION); // store off current item in case it is automatically deselected // and we want to preserve context LLFolderViewItem* original_selected_item = getCurSelectedItem(); |