diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-04 10:14:41 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-04 10:14:41 -0800 |
| commit | 3d1ec8b462bc091e9d63c385ec0bc595937f31c5 (patch) | |
| tree | 7d6dda88bf45d2fae769e1ae1bf6e570bf1678a2 /indra/llui | |
| parent | 9f965be297422ddab79ff9be47fb6d5c64a5096f (diff) | |
| parent | a26c1672235578f3a4e21be370b11522207e2c57 (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index f67c134751..fdb4108afb 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -2072,7 +2072,7 @@ LLFolderViewItem* LLFolderViewFolder::getPreviousFromChild( LLFolderViewItem* it if (fit != fend) { // try selecting child element of this folder - if ((*fit)->isOpen()) + if ((*fit)->isOpen() && include_children) { result = (*fit)->getPreviousFromChild(NULL); } diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 91527c68f2..0c43a571b8 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -1483,6 +1483,8 @@ BOOL LLTabContainer::setTab(S32 which) for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter) { LLTabTuple* tuple = *iter; + if (!tuple) + continue; BOOL is_selected = ( tuple == selected_tuple ); tuple->mButton->setUseEllipses(mUseTabEllipses); tuple->mButton->setHAlign(mFontHalign); |