diff options
author | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
commit | 27cf0ec7f34887ada651307fe438ef0d627bf67f (patch) | |
tree | 90611a41d9ad25b98db6899745208c8aab51c150 /indra/newview/llblocklist.cpp | |
parent | c6aa86750c22c20dca6895695386e2357b953bbd (diff) | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) |
Merge with 3.6.11
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)); } } |