Merge viewer-release, become version 3.7.29

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 67393504e7..c9b1212b70 100755
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -199,6 +199,11 @@ public:
 	void			setTextEntryCallback( commit_callback_t cb ) { mTextEntryCallback = cb; }
 	void			setTextChangedCallback( commit_callback_t cb ) { mTextChangedCallback = cb; }
 
+	/**
+	* Connects callback to signal called when Return key is pressed.
+	*/
+	boost::signals2::connection setReturnCallback( const commit_signal_t::slot_type& cb ) { return mOnReturnSignal.connect(cb); }
+
 	void			setButtonVisible(BOOL visible);
 
 	void			onButtonMouseDown();
@@ -231,6 +236,7 @@ private:
 	commit_callback_t	mTextChangedCallback;
 	commit_callback_t	mSelectionCallback;
 	boost::signals2::connection mTopLostSignalConnection;
+	commit_signal_t		mOnReturnSignal;
 	S32                 mLastSelectedIndex;
 };