diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-07-15 12:31:08 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-15 12:31:08 -0700 |
commit | 5d85dad85f07ea23b3a2892276d8ac591a966864 (patch) | |
tree | 97aa94cc757e24239f8b13c0cedb3e4a543fff06 /indra/llui/lluictrl.cpp | |
parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) |
Reverted changeset 2bb10eae42bf
Diffstat (limited to 'indra/llui/lluictrl.cpp')
-rw-r--r-- | indra/llui/lluictrl.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index ff330f863a..3ade46d367 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -675,7 +675,7 @@ BOOL LLUICtrl::getIsChrome() const class CompareByDefaultTabGroup: public LLCompareByTabOrder { public: - CompareByDefaultTabGroup(const LLView::child_tab_order_t& order, S32 default_tab_group): + CompareByDefaultTabGroup(LLView::child_tab_order_t order, S32 default_tab_group): LLCompareByTabOrder(order), mDefaultTabGroup(default_tab_group) {} private: @@ -699,16 +699,13 @@ class LLUICtrl::DefaultTabGroupFirstSorter : public LLQuerySorter, public LLSing { public: /*virtual*/ void operator() (LLView * parent, viewList_t &children) const - { + { children.sort(CompareByDefaultTabGroup(parent->getCtrlOrder(), parent->getDefaultTabGroup())); } }; -LLFastTimer::DeclareTimer FTM_FOCUS_FIRST_ITEM("Focus First Item"); - BOOL LLUICtrl::focusFirstItem(BOOL prefer_text_fields, BOOL focus_flash) { - LLFastTimer _(FTM_FOCUS_FIRST_ITEM); // try to select default tab group child LLCtrlQuery query = getTabOrderQuery(); // sort things such that the default tab group is at the front |