diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-15 13:49:30 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-17 13:26:55 +0300 |
| commit | d3d349ae0f17a72481f30b9354b9367b1cd3b639 (patch) | |
| tree | 6f51ef179497265b5bff2a355471ae5dc9643ad2 /indra/newview/llinventoryfunctions.cpp | |
| parent | 06ff001d49a38563e134cf4c708aa28e69b5ec08 (diff) | |
Post-merge fix: "upload to folder" regression
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 3a583c7d99..2be6a91bbf 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -3792,8 +3792,7 @@ void LLInventoryAction::fileUploadLocation(const LLUUID& dest_id, const std::str } else if (action == "upload_bulk") { - //LLFilePickerReplyThread::startPicker(boost::bind(&upload_bulk, _1, _2, dest_id), LLFilePicker::FFLOAD_ALL, true); - LLFilePickerReplyThread::startPicker(boost::bind(&upload_bulk, _1, _2, true), LLFilePicker::FFLOAD_ALL, true); // TODO: merge conflict; fix this + LLFilePickerReplyThread::startPicker(boost::bind(&upload_bulk, _1, _2, true, dest_id), LLFilePicker::FFLOAD_ALL, true); } } |