diff options
author | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
commit | 5fabfa50d7135d29c0cb8a553006cf9038f9baae (patch) | |
tree | 1d0f21551bd443d4e1ba187480c082d612dfaac5 /indra/newview/lloutfitgallery.cpp | |
parent | 627e3d51c61778e07e350689ce68ede24afe61ab (diff) | |
parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/lloutfitgallery.cpp')
-rw-r--r-- | indra/newview/lloutfitgallery.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index 5aaa80a7ef..92a742466e 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -1226,7 +1226,7 @@ void LLOutfitGallery::uploadOutfitImage(const std::vector<std::string>& filename checkRemovePhoto(outfit_id); std::string upload_pending_name = outfit_id.asString(); std::string upload_pending_desc = ""; - LLUUID photo_id = upload_new_resource(filename, // file + upload_new_resource(filename, // file upload_pending_name, upload_pending_desc, 0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE, |