diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-18 22:42:55 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-18 22:42:55 +0000 |
| commit | 4ee757b45d527699b094bf9422244171fdd7d693 (patch) | |
| tree | 90d0efe57653bf0cc31c0a8620d9d6cc05edcc2c /indra/newview/llsidetray.cpp | |
| parent | 1404ab0bde762eda99609a045555c9c29cd06f0f (diff) | |
Merging revisions 2036-2042 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bug Fixes: EXT-1542 EXT-1540 EXT-1529 EXT-1539
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 2be0aa40d2..4db849c159 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -427,7 +427,16 @@ void LLSideTray::createButtons () void LLSideTray::onTabButtonClick(string name) { - + LLSideTrayTab* side_bar = getTab(name); + + if(side_bar == mActiveTab) + { + if(mCollapsed) + expandSideBar(); + else + collapseSideBar(); + return; + } selectTabByName (name); if(mCollapsed) expandSideBar(); |