diff options
author | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 11:39:06 -0500 |
commit | 69c32b04cfd52c6fbd34997fa6485a84435743ef (patch) | |
tree | 9e95073f5d7109b86ed5fdb06b26dae4416c7146 /indra/newview/llblocklist.cpp | |
parent | dc2af90b04a16a41851874b9ab55b4ac61af2d7b (diff) | |
parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) |
merge changes for 3.6.12-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)); } } |