Backed out changeset d5b761982e63

This got pushed too early - sorry.  Sigh.

1 files changed, 14 insertions, 33 deletions

diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h
index d9a7403611..224118e088 100644
--- a/indra/newview/llnearbychatbar.h
+++ b/indra/newview/llnearbychatbar.h
@@ -42,52 +42,33 @@
 #include "llspeakers.h"
 
 
-class LLGestureComboList
-	: public LLGestureManagerObserver
-	, public LLUICtrl
+class LLGestureComboBox
+	: public LLComboBox
+	, public LLGestureManagerObserver
 {
 public:
-	struct Params :	public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<LLButton::Params>			combo_button;
-		Optional<LLScrollListCtrl::Params>	combo_list;
-		
-		Params();
-	};
-
+	struct Params : public LLInitParam::Block<Params, LLComboBox::Params> { };
 protected:
-	
+	LLGestureComboBox(const Params&);
 	friend class LLUICtrlFactory;
-	LLGestureComboList(const Params&);
-	std::vector<LLMultiGesture*> mGestures;
-	std::string mLabel;
-	LLSD::Integer mViewAllItemIndex;
-
 public:
+	~LLGestureComboBox();
 
-	~LLGestureComboList();
-
-	LLCtrlListInterface* getListInterface()		{ return (LLCtrlListInterface*)mList; };
-	virtual void	showList();
-	virtual void	hideList();
-	virtual BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent);
-
-	S32				getCurrentIndex() const;
-	void			onItemSelected(const LLSD& data);
-	void			sortByName(bool ascending = true);
 	void refreshGestures();
 	void onCommitGesture();
-	void onButtonCommit();
-	virtual LLSD	getValue() const;
+	virtual void draw();
 
 	// LLGestureManagerObserver trigger
 	virtual void changed() { refreshGestures(); }
 
-private:
+protected:
+
+	virtual void showList();
 
-	LLButton*			mButton;
-	LLScrollListCtrl*	mList;
-	S32                 mLastSelectedIndex;
+	LLFrameTimer mGestureLabelTimer;
+	std::vector<LLMultiGesture*> mGestures;
+	std::string mLabel;
+	LLSD::Integer mViewAllItemIndex;
 };
 
 class LLNearbyChatBar