summaryrefslogtreecommitdiff
path: root/indra/newview/llblocklist.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-11-25 12:32:21 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-11-25 12:32:21 -0500
commitfc4f6e2dacfc8944b1536004fed80c4ca3a24544 (patch)
tree3eb7254290b834ae5f2529861a76c41d8decad1e /indra/newview/llblocklist.cpp
parentd191585a3eec778e36e5f0c4b620c3d525c86c42 (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
Merge. Refresh from viewer-release after 3.6.11 release.
Diffstat (limited to 'indra/newview/llblocklist.cpp')
-rwxr-xr-xindra/newview/llblocklist.cpp10
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));
}
}