diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-08-18 15:05:01 -0400 |
| commit | 2efe91ef64a963ef488d6018d04196753fe815ca (patch) | |
| tree | 09b198468fcc4b7a9405e68f355413aafde1d1b9 /indra/newview/llinventoryfilter.h | |
| parent | dff79705eddd4ce92fbb3d8a3b3b47a734b4837b (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
merge changes for 3.8.3-release
Diffstat (limited to 'indra/newview/llinventoryfilter.h')
| -rwxr-xr-x | indra/newview/llinventoryfilter.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h index abc4ae347c..eee36b7e40 100755 --- a/indra/newview/llinventoryfilter.h +++ b/indra/newview/llinventoryfilter.h @@ -204,6 +204,9 @@ public: void setFilterLinks(U64 filter_link); U64 getFilterLinks() const; + // sets params for Link-only search and backs up search settings for future restoration + void setFindAllLinksMode(const std::string &search_name, const LLUUID& search_id); + // +-------------------------------------------------------------------+ // + Execution And Results // +-------------------------------------------------------------------+ @@ -278,6 +281,7 @@ private: FilterOps mFilterOps; FilterOps mDefaultFilterOps; + FilterOps mBackupFilterOps; // for backup purposes when leaving 'search link' mode std::string mFilterSubString; std::string mFilterSubStringOrig; |