diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-03 17:56:36 -0500 |
| commit | d49e5bcbe26a4b148ce1d20a60d16581f41134c0 (patch) | |
| tree | bd8caf39e789437574119304688ba3c71b7940cf /indra/newview/llfavoritesbar.h | |
| parent | 1e47e5b42d352d5d838eeb96984dbf6497020e32 (diff) | |
| parent | 9d71aae8273fd44dada82b1005c121255dc14dda (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
| -rw-r--r-- | indra/newview/llfavoritesbar.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index 40dd551eef..2c6d8d1580 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -35,6 +35,7 @@ #include "llbutton.h" #include "lluictrl.h" +#include "lltextbox.h" #include "llinventoryobserver.h" #include "llinventorymodel.h" @@ -46,6 +47,7 @@ public: { Optional<LLUIImage*> image_drag_indication; Optional<LLButton::Params> chevron_button; + Optional<LLTextBox::Params> label; Params(); }; @@ -139,6 +141,7 @@ private: LLUICtrl* mLandingTab; LLUICtrl* mLastTab; LLButton* mChevronButton; + LLTextBox* mBarLabel; LLUUID mDragItemId; BOOL mStartDrag; |