From dee48496166e44f0e9b13a6c0b348d3409ddf0e5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 1 Dec 2009 11:26:43 -0800
Subject: EXT-2635 	 No message reminding user that a restart is required
 to reset cache (was Clear Cache) EXT-2652 	 Favorites bar drop-down
 button (for when favorites exceed width of viewer) is not configurable via
 XUI EXT-2227 	 [BSI] Preferences -> Setup -> Cache Location blank EXT-1036 
  Clicking menu separators selects wrong menu option (allows selection of
 greyed-out option) reviewed by James

---
 indra/newview/llfavoritesbar.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfavoritesbar.h')

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;
-- 
cgit v1.2.3