Merge branch 'DRTVWR-546' into DRTVWR-539

# Conflicts:
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llcombobox.h
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp

1 files changed, 3 insertions, 5 deletions

diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 49a55c98a3..cac8850a25 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -78,8 +78,6 @@ public:
 											text_entry_callback,
 											text_changed_callback;
 
-        Optional<CommitCallbackParam>       mouse_down_callback;
-
 		Optional<EPreferredPosition, PreferredPositionValues>	list_position;
 		
 		// components
@@ -107,6 +105,8 @@ protected:
     virtual std::string _getSearchText() const;
     virtual void onSetHighlight() const;
 
+    void imageLoaded();
+
 public:
 	// LLView interface
 	virtual void	onFocusLost();
@@ -209,8 +209,6 @@ public:
 	void			setTextEntryCallback( commit_callback_t cb ) { mTextEntryCallback = cb; }
 	void			setTextChangedCallback( commit_callback_t cb ) { mTextChangedCallback = cb; }
 
-    boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb );
-
 	/**
 	* Connects callback to signal called when Return key is pressed.
 	*/
@@ -248,7 +246,7 @@ private:
 	commit_callback_t	mTextChangedCallback;
 	commit_callback_t	mSelectionCallback;
 	boost::signals2::connection mTopLostSignalConnection;
-    commit_signal_t*	mMouseDownSignal;
+    boost::signals2::connection mImageLoadedConnection;
 	commit_signal_t		mOnReturnSignal;
 	S32                 mLastSelectedIndex;
 };