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.h | |
parent | d0d8ee87e7648e80b83b125202d6270495e955b6 (diff) | |
parent | ba8d9afe17a5eb75b7c89b6a1400e412bb473379 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.h')
-rw-r--r-- | indra/newview/llfloaterimsessiontab.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h index 4851904074..cd0bcd481c 100644 --- a/indra/newview/llfloaterimsessiontab.h +++ b/indra/newview/llfloaterimsessiontab.h @@ -149,6 +149,7 @@ protected: LLFolderView* mConversationsRoot; LLScrollContainer* mScroller; + LLOutputMonitorCtrl* mSpeakingIndicator; LLChatHistory* mChatHistory; LLChatEntry* mInputEditor; int mInputEditorTopPad; // padding between input field and chat history |