Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W

# Conflicts:
#	indra/newview/llspatialpartition.cpp

1 files changed, 11 insertions, 6 deletions

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 8767c3f916..6aeae0f291 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -2147,14 +2147,19 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y)
 {
 	if (!getTabsHidden() && hasMouseCapture())
 	{
-		for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
+		for (tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
 		{
-			LLTabTuple* tuple = *iter;
-			S32 local_x = x - tuple->mButton->getRect().mLeft;
-			S32 local_y = y - tuple->mButton->getRect().mBottom;
-			if (tuple->mButton->pointInView(local_x, local_y) && tuple->mButton->getEnabled() && !tuple->mTabPanel->getVisible())
+			LLButton* button = (*iter)->mButton;
+			LLPanel* panel = (*iter)->mTabPanel;
+			if (button->getEnabled() && button->getVisible() && !panel->getVisible())
 			{
-				tuple->mButton->onCommit();
+				S32 local_x = x - button->getRect().mLeft;
+				S32 local_y = y - button->getRect().mBottom;
+				if (button->pointInView(local_x, local_y))
+				{
+					button->onCommit();
+					break;
+				}
 			}
 		}
 	}