summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-07-02 08:56:49 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-07-02 08:56:49 -0700
commit6098fd2ebcd1bd78a8f8c638f707e8a14033df9b (patch)
tree9e296f4096ee670237e9545ee0e9c083c6ad5dbd /indra/newview/llinventorypanel.cpp
parentf1a1f613cf035d9c8e15c03bac7b00972eb3bb66 (diff)
parent5fd6887477b61e10ffd29086b9330a54b3a571d2 (diff)
Automated merge with ssh://hg.lindenlab.com/brad/viewer-dev
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 72d35af3b7..5af99f3c8f 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -256,9 +256,9 @@ void LLInventoryPanel::setHoursAgo(U32 hours)
getFilter()->setHoursAgo(hours);
}
-void LLInventoryPanel::setIncludeLinks(BOOL include_links)
+void LLInventoryPanel::setFilterLinks(U64 filter_links)
{
- getFilter()->setIncludeLinks(include_links);
+ getFilter()->setFilterLinks(filter_links);
}
void LLInventoryPanel::setShowFolderState(LLInventoryFilter::EFolderShow show)