diff options
author | Richard Linden <none@none> | 2012-08-01 01:27:38 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-08-01 01:27:38 -0700 |
commit | 997812c7b04f9edc119006baeb261cf602631978 (patch) | |
tree | ec470bc9af3cb207d9e9a504728bda679be673fe /indra/newview/llfolderviewmodelinventory.h | |
parent | a204059d2e69fb33cb1a3c8d2fbed35d3967297c (diff) | |
parent | 2855e8bf8e91454e814cdd00985056830d8a8f5b (diff) |
merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.h')
-rw-r--r-- | indra/newview/llfolderviewmodelinventory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h index 5b0ad5e46e..664addf336 100644 --- a/indra/newview/llfolderviewmodelinventory.h +++ b/indra/newview/llfolderviewmodelinventory.h @@ -53,7 +53,7 @@ public: virtual EInventorySortGroup getSortGroup() const = 0; virtual LLInventoryObject* getInventoryObject() const = 0; virtual void requestSort(); - virtual void setPassedFilter(bool filtered, bool filtered_folder, S32 filter_generation); + virtual void setPassedFilter(bool filtered, bool filtered_folder, S32 filter_generation, std::string::size_type string_offset = std::string::npos, std::string::size_type string_size = 0); virtual void filter( LLFolderViewFilter& filter); virtual void filterChildItem( LLFolderViewModelItem* item, LLFolderViewFilter& filter); |