diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-09-15 23:48:46 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-09-15 23:48:46 +0300 |
| commit | 9a996978dd1a33a6b23e92e413ae06dc60ec6228 (patch) | |
| tree | 3f48829dc0e1400bced1c8fa8b61ff59f3683d77 /indra | |
| parent | e44011c3befe5f833490731baac90f418486cdea (diff) | |
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.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 ); } } |