diff options
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index c3c840ede0..b25dec7b92 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -37,6 +37,7 @@ #include "llpanel.h" #include "llimview.h" +#include "llcombobox.h" class LLChicletPanel; class LLLineEditor; @@ -70,9 +71,11 @@ public: virtual void onFocusLost(); virtual void setVisible(BOOL visible); - virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + void showBottomTrayContextMenu(S32 x, S32 y, MASK mask); - void showCameraAndMoveControls(BOOL visible); + void showGestureButton(BOOL visible); + void showMoveButton(BOOL visible); + void showCameraButton(BOOL visible); private: @@ -82,9 +85,6 @@ protected: void onChicletClick(LLUICtrl* ctrl); - bool onShowCamMoveCtrlsContextMenuItemEnabled(const LLSD& userdata); - void onShowCamMoveCtrlsContextMenuItemClicked(const LLSD& userdata); - static void* createNearbyChatBar(void* userdata); /** @@ -97,9 +97,10 @@ protected: LLTalkButton* mTalkBtn; LLNearbyChatBar* mNearbyChatBar; LLLayoutStack* mToolbarStack; - LLMenuGL* mShowCamMoveCtrlsContextMenu; + LLMenuGL* mBottomTrayContextMenu; LLPanel* mMovementPanel; LLPanel* mCamPanel; + LLComboBox* mGestureCombo; }; #endif // LL_LLBOTTOMPANEL_H |