diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-07-09 07:00:30 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-07-09 07:00:30 +0000 |
| commit | b90099b4b020579b6a1f650f0bfafc48142bad66 (patch) | |
| tree | 7aacb3f52eee9ebef12d81fe5f386dc08e9ebf34 /indra/newview/llbottomtray.h | |
| parent | a994f3dbeeb33a3f043ca29191cf29e0c9fc2b21 (diff) | |
1. created prototype stand up button ins LLBottomTray
2. re-arranged LLFloaterReg::add alphabetically
to be reviewed
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 9a773773e9..0d477122d1 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -65,9 +65,12 @@ public: static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata); void refresh(); + /*virtual*/void draw(); + void refreshStandUp(); void updateRightPosition(const S32 new_right_position); void onCommitGesture(LLUICtrl* ctrl); + void onCommitStandUp(LLUICtrl* ctrl); void refreshGestures(); // LLIMSessionObserver observe triggers @@ -98,6 +101,7 @@ protected: LLTalkButton* mTalkBtn; LLComboBox* mGestureCombo; LLFrameTimer mGestureLabelTimer; + LLButton* mStandUpBtn; }; extern LLBottomTray* gBottomTray; |