summaryrefslogtreecommitdiff
path: root/indra/newview/llblocklist.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-12-05 15:26:38 -0500
commitda135de77dea24427f5e658ebac43b77c215cc9b (patch)
treeb6ccf4971d081a6dfc78a2729d015a7f01e912b2 /indra/newview/llblocklist.cpp
parentb2d769534c82de2ac7b36f11ce6fab61f3e0d378 (diff)
parentfc4f6e2dacfc8944b1536004fed80c4ca3a24544 (diff)
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
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));
}
}