Merge

2 files changed, 21 insertions, 0 deletions

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index b32aea5ffa..559895da1a 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -443,6 +443,7 @@ void LLComboBox::onFocusLost()
 	{
 		mTextEntry->selectAll();
 	}
+	mButton->setForcePressedState(false);
 	LLUICtrl::onFocusLost();
 }
 
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 4b08798892..701a06a085 100755
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1775,6 +1775,11 @@ void LLTabContainer::onNextBtn( const LLSD& data )
 		scrollNext();
 	}
 	mScrolled = FALSE;
+
+	if(mCurrentTabIdx < mTabList.size()-1)
+	{
+		selectNextTab();
+	}
 }
 
 void LLTabContainer::onNextBtnHeld( const LLSD& data )
@@ -1783,6 +1788,11 @@ void LLTabContainer::onNextBtnHeld( const LLSD& data )
 	{
 		mScrollTimer.reset();
 		scrollNext();
+
+		if(mCurrentTabIdx < mTabList.size()-1)
+		{
+			selectNextTab();
+		}
 		mScrolled = TRUE;
 	}
 }
@@ -1794,6 +1804,11 @@ void LLTabContainer::onPrevBtn( const LLSD& data )
 		scrollPrev();
 	}
 	mScrolled = FALSE;
+
+	if(mCurrentTabIdx > 0)
+	{
+		selectPrevTab();
+	}
 }
 
 void LLTabContainer::onJumpFirstBtn( const LLSD& data )
@@ -1812,6 +1827,11 @@ void LLTabContainer::onPrevBtnHeld( const LLSD& data )
 	{
 		mScrollTimer.reset();
 		scrollPrev();
+
+		if(mCurrentTabIdx > 0)
+		{
+			selectPrevTab();
+		}
 		mScrolled = TRUE;
 	}
 }