diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
| commit | f8b51f40289255ce38f65830f5bb0f29def3b757 (patch) | |
| tree | 43712a7aa38e35d297eba4c74eaa7f03930f777c /indra/newview/llfloaterimsessiontab.cpp | |
| parent | d0d8ee87e7648e80b83b125202d6270495e955b6 (diff) | |
| parent | ba8d9afe17a5eb75b7c89b6a1400e412bb473379 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 82d25b9da9..ea99a1c5bf 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -54,6 +54,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id) , mSessionID(session_id.asUUID()) , mConversationsRoot(NULL) , mScroller(NULL) + , mSpeakingIndicator(NULL) , mChatHistory(NULL) , mInputEditor(NULL) , mInputEditorTopPad(0) @@ -206,6 +207,8 @@ BOOL LLFloaterIMSessionTab::postBuild() mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroller_params); mScroller->setFollowsAll(); + mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator"); + // Insert that scroller into the panel widgets hierarchy mParticipantListPanel->addChild(mScroller); |