diff options
author | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
commit | e271c47994fc9dd86bda9d6ad7e79799229e52aa (patch) | |
tree | 39a95ca75541cab5952708b6cfed741394bf9e9c /indra/newview/llimfloatercontainer.h | |
parent | 8cd5d361600f34a0a7fa504a721bea3301191644 (diff) | |
parent | d41202336b7c797bc3fe4feffa8be2164518e845 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
-rw-r--r-- | indra/newview/llimfloatercontainer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index 300a820a26..a72a3e2221 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -103,6 +103,8 @@ private: void onAddButtonClicked(); void onAvatarPicked(const uuid_vec_t& ids); + void onCustomAction (const LLSD& userdata); + LLButton* mExpandCollapseBtn; LLLayoutPanel* mMessagesPane; LLLayoutPanel* mConversationsPane; |