summaryrefslogtreecommitdiff
path: root/indra/newview/llblocklist.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-03 12:14:03 -0500
committerOz Linden <oz@lindenlab.com>2014-01-03 12:14:03 -0500
commit30f0d61510a2f7d28bd24d2165807e7e6ced4e55 (patch)
treed1640aaa6cd78e33bfe52defdeba5eb807459885 /indra/newview/llblocklist.cpp
parent5f635f7942130ab25f74f5c6aaeb5b135d0cb43e (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
merge changes for 3.6.12-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));
}
}