diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-21 10:33:02 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-21 10:33:02 -0700 |
| commit | ea75559674a8ac6d48fbf511880b1a79cbb7642d (patch) | |
| tree | 7f24002709b109f06bcabfaa39b2492999374ee6 /indra | |
| parent | f07dc421e81d945531dc6f4befc19ea4fe4b9a47 (diff) | |
Compile issue with merge. Just use the method default parameters.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index d6ef008488..5940e3a2df 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -423,7 +423,7 @@ const void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker:: LLFloaterPerms::getEveryonePerms("Uploads"), expected_upload_cost)); - upload_new_resource(uploadInfo, NULL, NULL); + upload_new_resource(uploadInfo); } } |