diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 15:01:14 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 15:01:14 -0800 |
| commit | db9f74d55074d6f814783815a803d81238af507a (patch) | |
| tree | 01a3ee89f3c072472dd651815db4f3bb7beef5f6 /indra/newview/llfavoritesbar.h | |
| parent | a0c133f819b7b6043e39a39a02310cd1fad67859 (diff) | |
| parent | a63d01b8bcac2ee248e8011ae45988e94187f3aa (diff) | |
merge
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
| -rw-r--r-- | indra/newview/llfavoritesbar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index 20a324c67c..b2fe3cc651 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -33,6 +33,7 @@ #ifndef LL_LLFAVORITESBARCTRL_H #define LL_LLFAVORITESBARCTRL_H +#include "llbutton.h" #include "lluictrl.h" #include "llinventoryobserver.h" @@ -43,8 +44,8 @@ class LLFavoritesBarCtrl : public LLUICtrl, public LLInventoryObserver public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<std::string> chevron_button_tool_tip; Optional<LLUIImage*> image_drag_indication; + Optional<LLButton::Params> chevron_button; Params(); }; @@ -105,9 +106,7 @@ protected: item_names_array_t mItemNamesCache; LLUUID mSelectedItemID; - LLRect mChevronRect; - std::string mChevronButtonToolTip; LLUIImage* mImageDragIndication; private: @@ -150,6 +149,7 @@ private: BOOL mShowDragMarker; LLUICtrl* mLandingTab; LLUICtrl* mLastTab; + LLButton* mChevronButton; LLUUID mDragItemId; BOOL mStartDrag; |