diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-10-04 08:45:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-10-04 08:45:47 -0400 |
| commit | c26123e11f576a43a3bbe3125e86814038096f74 (patch) | |
| tree | 383c0101a79348e59037c854c3418571e05694d7 /indra/newview/llconversationmodel.h | |
| parent | e2ea42cb6a078d250a5d1c7ee81be355bde669bc (diff) | |
| parent | 2465470817957c8378e81ec1a7e32551fbac7b26 (diff) | |
SL-18837: Merge branch 'main' of secondlife/viewer into actions
Diffstat (limited to 'indra/newview/llconversationmodel.h')
| -rw-r--r-- | indra/newview/llconversationmodel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 7c6980a7e6..3f607d434e 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -111,6 +111,7 @@ public: virtual void previewItem( void ); virtual void selectItem(void) { } virtual void showProperties(void); + virtual void navigateToFolder(bool new_window = false, bool change_mode = false) {} // Methods used in sorting (see LLConversationSort::operator()) EConversationType const getType() const { return mConvType; } @@ -249,7 +250,7 @@ public: bool check(const LLFolderViewModelItem* item) { return true; } bool checkFolder(const LLFolderViewModelItem* folder) const { return true; } void setEmptyLookupMessage(const std::string& message) { } - std::string getEmptyLookupMessage() const { return mEmpty; } + std::string getEmptyLookupMessage(bool is_empty_folder = false) const { return mEmpty; } bool showAllResults() const { return true; } std::string::size_type getStringMatchOffset(LLFolderViewModelItem* item) const { return std::string::npos; } std::string::size_type getFilterStringSize() const { return 0; } |