From 9a996978dd1a33a6b23e92e413ae06dc60ec6228 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 15 Sep 2010 23:48:46 +0300 Subject: STORM-157 FIXED A tab might be highlighted while SB was collapsed. Made sure that a tab can only be highlighted when sidebar is expanended. --- indra/newview/llsidetray.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llsidetray.cpp') diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index b0914eee69..9ee504cc4c 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -568,8 +568,9 @@ void LLSideTray::toggleTabButton(LLSideTrayTab* tab) { LLButton* btn = it->second; bool new_state = !btn->getToggleState(); - btn->setToggleState(new_state); - btn->setImageOverlay( new_state ? tab->mImageSelected : tab->mImage ); + btn->setToggleState(new_state); + // Only highlight the tab if side tray is expanded (STORM-157). + btn->setImageOverlay( new_state && !getCollapsed() ? tab->mImageSelected : tab->mImage ); } } -- cgit v1.2.3