diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
| commit | 7f354c70ba623b591c36dadd0f6616b349be4fc7 (patch) | |
| tree | 67557a9981877e6e4b1f08937dfde94e6287dc61 /indra/newview/llfilepicker_mac.mm | |
| parent | 5b9cb5bba3c12b1b5c86ba56d43ccf06b83edc14 (diff) | |
| parent | 33e0766ee08cccb480675a75d83b3a6e78849906 (diff) | |
Merge tag '6.6.14-release'
source for viewer 6.6.14.581101
Diffstat (limited to 'indra/newview/llfilepicker_mac.mm')
| -rw-r--r-- | indra/newview/llfilepicker_mac.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker_mac.mm b/indra/newview/llfilepicker_mac.mm index e5965abbd6..4dd8bea4e1 100644 --- a/indra/newview/llfilepicker_mac.mm +++ b/indra/newview/llfilepicker_mac.mm @@ -103,7 +103,6 @@ std::unique_ptr<std::vector<std::string>> doLoadDialog(const std::vector<std::st } } } - return outfiles; } @@ -150,7 +149,7 @@ void doLoadDialogModeless(const std::vector<std::string>* allowed_types, } } -std::unique_ptr<std::string> doSaveDialog(const std::string* file, +std::unique_ptr<std::string> doSaveDialog(const std::string* file, const std::string* type, const std::string* creator, const std::string* extension, |