diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 22:01:18 +0200 |
commit | e70fe3a50d43bd5276f80c9f82fcfb2de02109cb (patch) | |
tree | c35ab61e94d7b93e0e8be63f60c439d3b6a8c4b9 /indra/newview/llviewermenufile.h | |
parent | 15861d8dec096de57b0b51fa55a61a199a0f4337 (diff) | |
parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewermenu.cpp
Diffstat (limited to 'indra/newview/llviewermenufile.h')
-rw-r--r-- | indra/newview/llviewermenufile.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h index 4e6250d9b4..beeac418d9 100644 --- a/indra/newview/llviewermenufile.h +++ b/indra/newview/llviewermenufile.h @@ -37,6 +37,7 @@ #include "llviewerassetupload.h" class LLTransactionID; +class LLPluginClassMedia; void init_menu_file(); @@ -71,6 +72,7 @@ void assign_defaults_and_show_upload_message( const std::string& display_name, std::string& description); +//consider moving all file pickers below to more suitable place class LLFilePickerThread : public LLThread { //multi-threaded file picker (runs system specific file picker in background and calls "notify" from main thread) public: @@ -127,5 +129,17 @@ private: file_picked_signal_t* mFailureSignal; }; +class LLMediaFilePicker : public LLFilePickerThread +{ +public: + LLMediaFilePicker(LLPluginClassMedia* plugin, LLFilePicker::ELoadFilter filter, bool get_multiple); + LLMediaFilePicker(LLPluginClassMedia* plugin, LLFilePicker::ESaveFilter filter, const std::string &proposed_name); + + virtual void notify(const std::vector<std::string>& filenames); + +private: + boost::shared_ptr<LLPluginClassMedia> mPlugin; +}; + #endif |