summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llcombobox.h')
-rw-r--r--indra/llui/llcombobox.h35
1 files changed, 2 insertions, 33 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index c694724248..82134c4ffe 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -221,7 +221,6 @@ protected:
LLPointer<LLUIImage> mArrowImage;
LLUIString mLabel;
BOOL mHasAutocompletedText;
- S32 mLastSelectedIndex;
private:
BOOL mAllowTextEntry;
@@ -231,37 +230,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