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/llbottomtray.h | |
| parent | de6ca4c5eacb30b557e5c4a36ca8be11e5322b12 (diff) | |
| parent | d6136a40b1ba46d2841bfc84045f25a3414bc428 (diff) | |
merge
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 6509fea63d..c88bdeda1c 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -33,7 +33,7 @@ #ifndef LL_LLBOTTOMPANEL_H #define LL_LLBOTTOMPANEL_H -#include <llmenugl.h> +#include "llmenugl.h" #include "llpanel.h" #include "llimview.h" @@ -51,6 +51,7 @@ class LLBottomTray : public LLSingleton<LLBottomTray> , public LLPanel , public LLIMSessionObserver + , public LLVoiceClientStatusObserver { LOG_CLASS(LLBottomTray); friend class LLSingleton<LLBottomTray>; @@ -75,6 +76,10 @@ public: virtual void onFocusLost(); virtual void setVisible(BOOL visible); + // Implements LLVoiceClientStatusObserver::onChange() to enable the speak + // button when voice is available + /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); + void showBottomTrayContextMenu(S32 x, S32 y, MASK mask); void showGestureButton(BOOL visible); |