diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/llui/lltabcontainer.cpp | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 9c356f9524..1ba991f916 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -1048,7 +1048,7 @@ BOOL LLTabContainer::selectTab(S32 which) // tuple->mTabPanel->setFocus(is_selected); // not clear that we want to do this here. tuple->mButton->setToggleState( is_selected ); // RN: this limits tab-stops to active button only, which would require arrow keys to switch tabs - tuple->mButton->setTabStop( is_selected && mTabList.size() > 1 ); + tuple->mButton->setTabStop( is_selected ); if( is_selected && mMaxScrollPos > 0) { @@ -1466,4 +1466,3 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDrag return LLView::handleDragAndDrop(x, y, mask, drop, type, cargo_data, accept, tooltip); } - |