Merge

1 files changed, 2 insertions, 33 deletions

diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 7cac4cc738..3ed273404c 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -218,7 +218,6 @@ protected:
 	LLPointer<LLUIImage>	mArrowImage;
 	LLUIString			mLabel;
 	BOOL				mHasAutocompletedText;
-	S32                 mLastSelectedIndex;
 
 private:
 	BOOL				mAllowTextEntry;
@@ -228,37 +227,7 @@ private:
 	commit_callback_t	mPrearrangeCallback;
 	commit_callback_t	mTextEntryCallback;
 	commit_callback_t	mSelectionCallback;
-        boost::signals2::connection mTopLostSignalConnection;
-};
-
-// A combo box with icons for the list of items.
-class LLIconsComboBox
-:	public LLComboBox
-{
-public:
-	struct Params
-	:	public LLInitParam::Block<Params, LLComboBox::Params>
-	{
-		Optional<S32>		icon_column,
-							label_column;
-		Params();
-	};
-
-	/*virtual*/ void setValue(const LLSD& value);
-
-private:
-	enum EColumnIndex
-	{
-		ICON_COLUMN = 0,
-		LABEL_COLUMN
-	};
-
-	friend class LLUICtrlFactory;
-	LLIconsComboBox(const Params&);
-	virtual ~LLIconsComboBox() {};
-
-	S32			mIconColumnIndex;
-	S32			mLabelColumnIndex;
+	boost::signals2::connection mTopLostSignalConnection;
+	S32                 mLastSelectedIndex;
 };
-
 #endif