diff options
author | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-11-21 15:35:25 -0500 |
commit | 915ade1029eb39fcd8f3b997b4b8cf2b394c1eb9 (patch) | |
tree | 577c0d98b21d05f0b6f28241f2ab2b7ee31f8618 /indra/newview/llblocklist.cpp | |
parent | dd7b0f96157bdfbdd8892cc8aa209182ae777380 (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
merge changes for 3.6.11-release
Diffstat (limited to 'indra/newview/llblocklist.cpp')
-rwxr-xr-x | indra/newview/llblocklist.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llblocklist.cpp b/indra/newview/llblocklist.cpp index ac41b26a34..3849fbeb54 100755 --- a/indra/newview/llblocklist.cpp +++ b/indra/newview/llblocklist.cpp @@ -206,10 +206,10 @@ void LLBlockList::refresh() if(selected == mute.mID) { // we are going to remove currently selected item, so select next item and save the selection to restore it - if (!selectNextItemPair(false, true)) - { - selectNextItemPair(true, true); - } + if (!selectNextItemPair(false, true)) + { + selectNextItemPair(true, true); + } next_selected = getSelectedUUID(); } removeListItem(&mute); @@ -229,7 +229,7 @@ void LLBlockList::refresh() { LLBlockedListItem * curItem = dynamic_cast<LLBlockedListItem *> (*it); if(curItem) - { + { hideListItem(curItem, findInsensitive(curItem->getName(), mNameFilter)); } } |