summaryrefslogtreecommitdiff
path: root/indra/newview/llblocklist.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-12-09 16:11:09 -0800
committersimon <none@none>2013-12-09 16:11:09 -0800
commit50cba7940fbea7602f6b55df85fb9a2d2b47279b (patch)
tree269464d15a8d4a8803535b843e8ce7dcac7414cb /indra/newview/llblocklist.cpp
parent1a456c2e41905e93e393dc2dda0d143ee7611275 (diff)
parent4a09065691b6a3461ff2f4541abb3accade207fe (diff)
Merge in downstream code for 3.6.13
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));
}
}