diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-08 23:06:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-08 23:06:01 -0700 |
| commit | 657f75b89de4cfd5ade82e3bc30e236cd2533017 (patch) | |
| tree | 09d6b1bcf6a89795dfa1bf5b8acaa1de77344ee3 /indra/newview/llnearbychatbar.h | |
| parent | 39e5d2ecf04deceda92d6a53413298ca1c3bc0c7 (diff) | |
| parent | a2fb3fabc7926dd105393391f334baa78f232640 (diff) | |
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
| -rw-r--r-- | indra/newview/llnearbychatbar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 955a665624..cc905736fd 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -34,6 +34,7 @@ #include "llvoiceclient.h" #include "lloutputmonitorctrl.h" #include "llspeakers.h" +#include "llbottomtray.h" class LLGestureComboList @@ -43,7 +44,7 @@ class LLGestureComboList public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<LLButton::Params> combo_button; + Optional<LLBottomtrayButton::Params> combo_button; Optional<LLScrollListCtrl::Params> combo_list; Params(); |