diff options
| author | James Cook <james@lindenlab.com> | 2009-11-12 08:53:20 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-12 08:53:20 -0800 |
| commit | 7a45dec2d540581ef080386e4a967befd22b6adb (patch) | |
| tree | df703ddb448fcde958dc2646c2127a5612a155e3 /indra/newview/llnearbychatbar.h | |
| parent | de6ca4c5eacb30b557e5c4a36ca8be11e5322b12 (diff) | |
| parent | d6136a40b1ba46d2841bfc84045f25a3414bc428 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
| -rw-r--r-- | indra/newview/llnearbychatbar.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 56ee706a97..224118e088 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -42,9 +42,6 @@ #include "llspeakers.h" -class LLSpeakButton; - - class LLGestureComboBox : public LLComboBox , public LLGestureManagerObserver @@ -76,7 +73,6 @@ protected: class LLNearbyChatBar : public LLPanel -, public LLVoiceClientStatusObserver { public: // constructor for inline chat-bars (e.g. hosted in chat history window) @@ -105,11 +101,6 @@ public: S32 getMinWidth() const; S32 getMaxWidth() const; - /** - * Implements LLVoiceClientStatusObserver::onChange() - */ - /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); - protected: static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str); static void onChatBoxKeystroke(LLLineEditor* caller, void* userdata); @@ -127,7 +118,6 @@ protected: static S32 sLastSpecialChatChannel; LLLineEditor* mChatBox; - LLSpeakButton* mSpeakBtn; LLOutputMonitorCtrl* mOutputMonitor; LLLocalSpeakerMgr* mSpeakerMgr; }; |