diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-03-18 00:53:32 +0200 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-03-18 00:53:32 +0200 |
| commit | 729f880f78e26459d37ff0d120d9537791ccaf8d (patch) | |
| tree | 4b83939d48b0bc63e9ac23a27b47e2caeb7d3f58 /indra/llui/llcombobox.h | |
| parent | 17421a30d4d5126933bf30005a6434937f69c329 (diff) | |
[SHOWSTOPPER] Fix for (EXT-4704) Add maturity icons to Prefs -> General and (EXT-4705) Show maturity icon on Region/Estate tab.
- Made changes to combobox onItemSelected() to fix (EXT-6269) typing a location into the nav bar always sends you to the first location you typed in.
- Replaced LLIconsComboBox pointers with base class pointers LLComboBox.
Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/29/
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llcombobox.h')
| -rw-r--r-- | indra/llui/llcombobox.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 965061ead2..f0bd432f3a 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; @@ -232,6 +231,7 @@ private: commit_callback_t mTextEntryCallback; commit_callback_t mSelectionCallback; boost::signals2::connection mTopLostSignalConnection; + S32 mLastSelectedIndex; }; // A combo box with icons for the list of items. @@ -247,7 +247,6 @@ public: Params(); }; - /*virtual*/ void setValue(const LLSD& value); /*virtual*/ const std::string getSelectedItemLabel(S32 column = 0) const; private: |