diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-13 16:25:48 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-13 16:25:48 +0000 |
| commit | 20e56a6925b4d4106059a73a22170beb5a38be1e (patch) | |
| tree | 6b9d6dec9f628dfa1ab948cbfb10b86fe4cdc826 /indra/newview/llnearbychatbar.h | |
| parent | 330e635c2ce2ea0650226f56559cf1068df0320d (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379
* Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
| -rw-r--r-- | indra/newview/llnearbychatbar.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 1b71ad69f2..d6827315f2 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -40,6 +40,7 @@ #include "llchiclet.h" #include "llvoiceclient.h" #include "lloutputmonitorctrl.h" +#include "llfloateractivespeakers.h" class LLGestureComboBox : public LLComboBox @@ -84,6 +85,8 @@ public: LLLineEditor* getChatBox() { return mChatBox; } + virtual void draw(); + std::string getCurrentChat(); virtual BOOL handleKeyHere( KEY key, MASK mask ); @@ -110,12 +113,15 @@ protected: static LLWString stripChannelNumber(const LLWString &mesg, S32* channel); EChatType processChatTypeTriggers(EChatType type, std::string &str); + void displaySpeakingIndicator(); + // Which non-zero channel did we last chat on? static S32 sLastSpecialChatChannel; LLLineEditor* mChatBox; LLTalkButton* mTalkBtn; LLOutputMonitorCtrl* mOutputMonitor; + LLActiveSpeakerMgr mSpeakerMgr; }; #endif |