diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-16 18:19:36 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-16 18:19:36 +0100 |
| commit | 73467a0f30c2165592f33da82501d0dc4483ad2e (patch) | |
| tree | 518e0d5a4a1eb1684bb4dea7ce3a55996e0ce1c3 /indra/newview | |
| parent | 35734598115c6e527a5fb45f6c80bb3884cfb5ee (diff) | |
| parent | 9a996978dd1a33a6b23e92e413ae06dc60ec6228 (diff) | |
merge vwr-20694 / storm-157
Diffstat (limited to 'indra/newview')
| -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 ); } } |