From 729f880f78e26459d37ff0d120d9537791ccaf8d Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 18 Mar 2010 00:53:32 +0200
Subject: [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
---
 indra/llui/llcombobox.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/llui/llcombobox.h')

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