diff options
| author | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-11-15 15:52:54 -0800 |
| commit | 50d21a75a7c6a41a5a3355a8c4406a33454c70dd (patch) | |
| tree | e2fe3e855d710700cd956b505a3f0548038c9dac /indra/newview/llnearbychatbar.h | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
| parent | 4bdac3f152862b257b9babe9b5a43329c9f544f9 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
| -rw-r--r-- | indra/newview/llnearbychatbar.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index cc905736fd..033d1dd5a2 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -46,6 +46,8 @@ public: { Optional<LLBottomtrayButton::Params> combo_button; Optional<LLScrollListCtrl::Params> combo_list; + Optional<bool> get_more, + view_all; Params(); }; @@ -56,6 +58,8 @@ protected: LLGestureComboList(const Params&); std::vector<LLMultiGesture*> mGestures; std::string mLabel; + bool mShowViewAll; + bool mShowGetMore; LLSD::Integer mViewAllItemIndex; LLSD::Integer mGetMoreItemIndex; |