MAINT-8403 Restore fail case for general upload snapshot

Thu, 22 Mar 2018 12:21:38 +0200

author
maxim_productengine<mnikolenko@productengine.com>
date
Thu, 22 Mar 2018 12:21:38 +0200
changeset 55353
29c656ea46ab
parent 55352
96b994daf116
child 55354
27143bdfa240

MAINT-8403 Restore fail case for general upload snapshot

indra/newview/llviewerassetupload.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llviewerassetupload.cpp	Wed Mar 21 23:56:46 2018 +0200
     1.2 +++ b/indra/newview/llviewerassetupload.cpp	Thu Mar 22 12:21:38 2018 +0200
     1.3 @@ -865,10 +865,18 @@
     1.4  
     1.5      // Let the Snapshot floater know we have failed uploading.
     1.6      LLFloaterSnapshot* floater_snapshot = LLFloaterSnapshot::findInstance();
     1.7 -    if (uploadInfo->getAssetType() == LLAssetType::AT_IMAGE_JPEG && floater_snapshot && floater_snapshot->isWaitingState())
     1.8 +    if (floater_snapshot && floater_snapshot->isWaitingState())
     1.9      {
    1.10 -        floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "postcard")));
    1.11 +        if (uploadInfo->getAssetType() == LLAssetType::AT_IMAGE_JPEG)
    1.12 +        {
    1.13 +            floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "postcard")));
    1.14 +        }
    1.15 +        if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE)
    1.16 +        {
    1.17 +            floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "inventory")));
    1.18 +        }
    1.19      }
    1.20 +
    1.21      LLFloater* floater_outfit_snapshot = LLFloaterReg::findInstance("outfit_snapshot");
    1.22      if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE && floater_outfit_snapshot && floater_outfit_snapshot->isShown())
    1.23      {

mercurial