summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderviewmodelinventory.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-09-22 17:11:17 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-09-22 17:11:17 -0400
commit8897e7ca24533e0093825346391f5fa9a37f2427 (patch)
tree781b08a7a90e53124d4f11b507be4d726544f0f0 /indra/newview/llfolderviewmodelinventory.cpp
parent79ab7c20703c092a4416a4f9a885e0246fc17ee0 (diff)
parent499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff)
Merge. Refresh from viewer-release after 3.7.16 release.
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.cpp')
-rwxr-xr-xindra/newview/llfolderviewmodelinventory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index 7339398fa5..7615c12043 100755
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -133,9 +133,9 @@ void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_gen
bool before = mPrevPassedAllFilters;
mPrevPassedAllFilters = passedFilter(filter_generation);
- if (before != mPrevPassedAllFilters)
+ if (before != mPrevPassedAllFilters)
{
- // Need to rearrange the folder if the filtered state of the item changed
+ // Need to rearrange the folder if the filtered state of the item changed
LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder();
if (parent_folder)
{