diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
| commit | 7637acf76e6a1170508e8bddd381c426d219b1ee (patch) | |
| tree | c48b5ea58fda587a103278860b943122f6ce8fae /indra/newview/llnearbychatbar.cpp | |
| parent | 6525fc4a4fc09e02c4fa709e0cbba4aa8d7d25ae (diff) | |
| parent | c4dfdcb338aaeeb4e3adc4e1aef4f5b190ef5c57 (diff) | |
merge changes for DRTVWR-149
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index b4224e30e6..c71ea48193 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -34,6 +34,7 @@ #include "llfirstuse.h" #include "llnearbychatbar.h" +#include "llnearbychatbarlistener.h" #include "llagent.h" #include "llgesturemgr.h" #include "llmultigesture.h" @@ -80,6 +81,7 @@ LLNearbyChatBar::LLNearbyChatBar(const LLSD& key) mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT) { mSpeakerMgr = LLLocalSpeakerMgr::getInstance(); + mListener.reset(new LLNearbyChatBarListener(*this)); } //virtual |