diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
| commit | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch) | |
| tree | d15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/llui/llview.h | |
| parent | 4c9760a073853ae81a78aa99119c059cdfaba664 (diff) | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
Merge from dessie/viewer-release
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 |