livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-155 Fixed attempt to show an invisible sidebar tab. 

Reason: when you detach the bottommost sidebar tab, the fake open/close tab gets selected, which is invisible.
Fix: select a normal, visible tab.
meow-7.2.2
Vadim Savchuk 2010-09-14 23:28:19 +03:00
parent 73ba1f288d
commit b6a39ffa21
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llsidetray.cpp
View File

@ -762,8 +762,15 @@ bool LLSideTray::removeTab(LLSideTrayTab* tab)
// Deselect the tab.
if (mActiveTab == tab)
{
child_vector_iter_t next_tab_it =
(tab_it < (mTabs.end() - 1)) ? tab_it + 1 : mTabs.begin();
// Select the next tab (or first one, if we're removing the last tab),
// skipping the fake open/close tab (STORM-155).
child_vector_iter_t next_tab_it = tab_it;
do
{
next_tab_it = (next_tab_it < (mTabs.end() - 1)) ? next_tab_it + 1 : mTabs.begin();
}
while ((*next_tab_it)->getName() == "sidebar_openclose");
selectTabByName((*next_tab_it)->getName(), true); // Don't hide the tab being removed.
}