diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-02-10 18:05:07 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-02-10 18:05:07 -0800 |
| commit | d245dad7ddbac36b013c70326ad25eb9247784f6 (patch) | |
| tree | 2cce7b69f3778b21de7d14e4def746f8ad2bb328 /indra/newview/llinventoryfilter.h | |
| parent | 2a4aa438f5798c34f1eef3ef75dc3289492138e1 (diff) | |
EXP-1863 : Fix the filtering of cut folders, also fix the move to trash of folders in double cut scenarios
Diffstat (limited to 'indra/newview/llinventoryfilter.h')
| -rw-r--r-- | indra/newview/llinventoryfilter.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h index fb4f84b139..1ac90788b2 100644 --- a/indra/newview/llinventoryfilter.h +++ b/indra/newview/llinventoryfilter.h @@ -59,8 +59,7 @@ public: FILTERTYPE_UUID = 0x1 << 2, // find the object with UUID and any links to it FILTERTYPE_DATE = 0x1 << 3, // search by date range FILTERTYPE_WEARABLE = 0x1 << 4, // search by wearable type - FILTERTYPE_EMPTYFOLDERS = 0x1 << 5, // pass if folder is not a system folder to be hidden if empty - FILTERTYPE_CLIPBOARD = 0x1 << 6 // pass if item is not on the clipboard + FILTERTYPE_EMPTYFOLDERS = 0x1 << 5 // pass if folder is not a system folder to be hidden if empty }; enum EFilterLink @@ -92,7 +91,6 @@ public: void setFilterUUID(const LLUUID &object_id); void setFilterWearableTypes(U64 types); void setFilterEmptySystemFolders(); - void setFilterClipboard(); void updateFilterTypes(U64 types, U64& current_types); void setFilterSubString(const std::string& string); @@ -125,6 +123,7 @@ public: BOOL checkAgainstPermissions(const LLFolderViewItem* item) const; bool checkAgainstPermissions(const LLInventoryItem* item) const; BOOL checkAgainstFilterLinks(const LLFolderViewItem* item) const; + bool checkAgainstClipboard(const LLUUID& object_id) const; std::string::size_type getStringMatchOffset() const; |