diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 16:30:39 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-13 16:30:39 +0200 |
| commit | bff45e735f55c474ecc6f485ef4b210ee0822b26 (patch) | |
| tree | 96c3af96911f3baa6ab76e8ddf4c45756933662c /indra/newview/llbottomtray.h | |
| parent | 8039b75ae8320a03a2a5339e5d0d1238de0335d2 (diff) | |
| parent | 78a16b9334c9484d328f8800e801196eacf3900f (diff) | |
merge
--HG--
branch : product-engine
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 090537042b..e88cd8edde 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); |