diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
| commit | a22bb00530bb779d8e5bb40b68e55767604d88dc (patch) | |
| tree | 520019b0c1e8c9cf475d19a60a0322a3c1caea6e /indra/newview/llbottomtray.h | |
| parent | 0904cbe4846192c9897267c9a60175f84881f9ed (diff) | |
| parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 97bcc23403..7640cdcf9d 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -98,12 +98,18 @@ private: , RS_BUTTON_MOVEMENT = 0x0010 , RS_BUTTON_GESTURES = 0x0020 , RS_BUTTON_SPEAK = 0x0040 + + /** + * Specifies buttons which can be hidden when bottom tray is shrunk. + * They are: Gestures, Movement (Move), Camera (View), Snapshot + */ + , RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES }EResizeState; S32 processWidthDecreased(S32 delta_width); void processWidthIncreased(S32 delta_width); void log(LLView* panel, const std::string& descr); - bool processShowButton(EResizeState shown_object_type, S32* available_width, S32* buttons_required_width); + bool processShowButton(EResizeState shown_object_type, S32* available_width); void processHideButton(EResizeState processed_object_type, S32* required_width, S32* buttons_freed_width); /** @@ -112,7 +118,7 @@ private: * @param - required_width - width which buttons can use to be shrunk. It is a negative value. * It is increased on the value processed by buttons. */ - void processShrinkButtons(S32* required_width); + void processShrinkButtons(S32* required_width, S32* buttons_freed_width); void processShrinkButton(EResizeState processed_object_type, S32* required_width); /** @@ -175,6 +181,7 @@ protected: LLChicletPanel* mChicletPanel; LLNotificationChiclet* mSysWell; + LLPanel* mSpeakPanel; LLSpeakButton* mSpeakBtn; LLNearbyChatBar* mNearbyChatBar; LLLayoutStack* mToolbarStack; |