diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-12 21:13:10 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-12 21:13:10 -0400 |
| commit | 3d191c09b1b1eb6726fe67f6fdf5445d83536578 (patch) | |
| tree | fa1c7e42b499638c0487b6af5c59ed048624f4a0 /indra/newview/llviewermenufile.cpp | |
| parent | b8678d8fa3521f4496ddc569de391633711e46cb (diff) | |
| parent | ccbd69bf6b287861b41fdb00e9d372746dfc2702 (diff) | |
Merge branch 'develop' into release/luau-scripting
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 935f112955..2a871a24af 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -996,7 +996,7 @@ class LLFileQuit : public view_listener_t }; -void handle_compress_image(void*) +void handle_compress_image() { LLFilePicker& picker = LLFilePicker::instance(); if (picker.getMultipleOpenFiles(LLFilePicker::FFLOAD_IMAGE)) @@ -1046,7 +1046,7 @@ size_t get_file_size(std::string &filename) return file_length; } -void handle_compress_file_test(void*) +void handle_compress_file_test() { LLFilePicker& picker = LLFilePicker::instance(); if (picker.getOpenFile()) |