diff options
| author | eli_linden <eli@lindenlab.com> | 2010-09-16 12:07:29 -0700 |
|---|---|---|
| committer | eli_linden <eli@lindenlab.com> | 2010-09-16 12:07:29 -0700 |
| commit | fbffeea75b514e71707b9da14a503d3f50ca8b56 (patch) | |
| tree | 6337259fd1aecd175fc83c2ed2f1f9cf9a957670 /indra/newview/llsidetray.cpp | |
| parent | 78281577709bb3d06b9df3a386a3a4c4b97f6643 (diff) | |
| parent | 395a5cbafff00aa90e0cd71891f9741c501e9824 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -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 ); } } |