diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-16 15:53:16 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-16 15:53:16 -0400 |
| commit | c445b9ee61c29d125d904fd2e58f157e72ee5b3b (patch) | |
| tree | 51a45cb4f56d2214ec6c11ce2e0b06c9b11eccf6 /indra/newview/llbottomtray.cpp | |
| parent | 7645c6a19f9b110121d674604a56c5a407736885 (diff) | |
| parent | fdc4a704f3622d1da471619413aadb609220962d (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index f51552aae5..01d19c5ba0 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -46,6 +46,7 @@ #include "llhints.h" #include "llimfloater.h" // for LLIMFloater #include "llnearbychatbar.h" +#include "llnearbychatbarlistener.h" #include "llsidetray.h" #include "llspeakbutton.h" #include "llsplitbutton.h" @@ -537,6 +538,8 @@ BOOL LLBottomTray::postBuild() mNearbyChatBar = findChild<LLNearbyChatBar>("chat_bar"); LLHints::registerHintTarget("chat_bar", mNearbyChatBar->LLView::getHandle()); + mListener.reset(new LLNearbyChatBarListener(*mNearbyChatBar)); + mChatBarContainer = getChild<LLLayoutPanel>("chat_bar_layout_panel"); mNearbyCharResizeHandlePanel = getChild<LLPanel>("chat_bar_resize_handle_panel"); |