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/llview.h | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
Reverted changeset 2bb10eae42bf
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 8e705ed701..aba6c310f1 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -265,7 +265,7 @@ public: virtual BOOL postBuild() { return TRUE; } - const child_tab_order_t& getCtrlOrder() const { return mCtrlOrder; } + child_tab_order_t getCtrlOrder() const { return mCtrlOrder; } ctrl_list_t getCtrlList() const; ctrl_list_t getCtrlListSorted() const; @@ -620,13 +620,12 @@ public: class LLCompareByTabOrder { public: - LLCompareByTabOrder(const LLView::child_tab_order_t& order) : mTabOrder(order) {} + LLCompareByTabOrder(LLView::child_tab_order_t order) : mTabOrder(order) {} virtual ~LLCompareByTabOrder() {} bool operator() (const LLView* const a, const LLView* const b) const; private: virtual bool compareTabOrders(const LLView::tab_order_t & a, const LLView::tab_order_t & b) const { return a < b; } - // ok to store a reference, as this should only be allocated on stack during view query operations - const LLView::child_tab_order_t& mTabOrder; + LLView::child_tab_order_t mTabOrder; }; template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) const |