summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-07-26 18:59:27 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-07-26 18:59:27 -0700
commite97d0f4195b3c9ee7e57ecf4822ef208f76e7a99 (patch)
tree8bfe52c61b8b9991a4aa794162716a44d721919d /indra/newview
parent1e65ba1f909604b027cb7dee5631f698a9f550a8 (diff)
parent797825a22219fc6b83c40aedaa58f806698bbac3 (diff)
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventoryfilter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 3f38d80a39..3e14faa55e 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -89,7 +89,7 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item)
const BOOL passed_clipboard = (listener ? checkAgainstClipboard(listener->getUUID()) : TRUE);
// If it's a folder and we're showing all folders, return automatically.
- const BOOL is_folder = listener->getInventoryType() == LLInventoryType::IT_CATEGORY;;
+ const BOOL is_folder = listener->getInventoryType() == LLInventoryType::IT_CATEGORY;
if (is_folder && (mFilterOps.mShowFolderState == LLInventoryFilter::SHOW_ALL_FOLDERS))
{
return passed_clipboard;