diff options
author | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2022-12-07 02:16:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-07 02:16:12 +0200 |
commit | c69c8aa347363bc51ed256523bc368d4584dbfd1 (patch) | |
tree | 8e60dd7e471a00634452189f85d67b3901e52136 /indra/newview/llpreviewgesture.cpp | |
parent | c033278ec2d16181b94d6433a3353765c8981850 (diff) |
SL-18777 PBR upload was stuck waiting for texture
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely.
Unblock floater if upload fails.
Diffstat (limited to 'indra/newview/llpreviewgesture.cpp')
-rw-r--r-- | indra/newview/llpreviewgesture.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index 759e7859f2..544ff8b5dc 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -1108,14 +1108,16 @@ void LLPreviewGesture::saveIfNeeded() item->setComplete(true); uploadInfo = std::make_shared<LLBufferedAssetUploadInfo>(mItemUUID, LLAssetType::AT_GESTURE, buffer, - [](LLUUID itemId, LLUUID newAssetId, LLUUID, LLSD) { + [](LLUUID itemId, LLUUID newAssetId, LLUUID, LLSD) + { LLPreviewGesture::finishInventoryUpload(itemId, newAssetId); - }); + }, + nullptr); url = agent_url; } else if (!mObjectUUID.isNull() && !task_url.empty()) { - uploadInfo = std::make_shared<LLBufferedAssetUploadInfo>(mObjectUUID, mItemUUID, LLAssetType::AT_GESTURE, buffer, nullptr); + uploadInfo = std::make_shared<LLBufferedAssetUploadInfo>(mObjectUUID, mItemUUID, LLAssetType::AT_GESTURE, buffer, nullptr, nullptr); url = task_url; } |