Skip to content
Snippets Groups Projects
Commit 00c6c29d authored by maxim_productengine's avatar maxim_productengine
Browse files

MAINT-8403 Restore fail case for general upload snapshot

parent 925ae4cf
No related branches found
No related tags found
No related merge requests found
...@@ -865,10 +865,18 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res ...@@ -865,10 +865,18 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res
// Let the Snapshot floater know we have failed uploading. // Let the Snapshot floater know we have failed uploading.
LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance(); LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
if (uploadInfo->getAssetType() == LLAssetType::AT_IMAGE_JPEG && floater_snapshot && floater_snapshot->isWaitingState()) if (floater_snapshot && floater_snapshot->isWaitingState())
{ {
floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "postcard"))); if (uploadInfo->getAssetType() == LLAssetType::AT_IMAGE_JPEG)
{
floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "postcard")));
}
if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE)
{
floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "inventory")));
}
} }
LLFloater* floater_outfit_snapshot = LLFloaterReg::findInstance("outfit_snapshot"); LLFloater* floater_outfit_snapshot = LLFloaterReg::findInstance("outfit_snapshot");
if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE && floater_outfit_snapshot && floater_outfit_snapshot->isShown()) if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE && floater_outfit_snapshot && floater_outfit_snapshot->isShown())
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment