diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-05-25 08:12:47 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-05-25 08:12:47 -0700 |
| commit | 67438c67aba96fe51dd29eee52bd332286dd2130 (patch) | |
| tree | 5c10eacc151dfedcf0afcccd97da045169d5d704 /indra/newview/llviewerassetupload.cpp | |
| parent | 9908fcf4ac43537728d1b34e30650735cfb36147 (diff) | |
| parent | fb598cd380b38714abed554b8feacabfc55b2aaa (diff) | |
pull from lynx
Diffstat (limited to 'indra/newview/llviewerassetupload.cpp')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index f0dafec240..497ff4d2bf 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -837,5 +837,12 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res } } + // Let the Snapshot floater know we have failed uploading. + LLFloater* floater_snapshot = LLFloaterReg::findInstance("snapshot"); + if (uploadInfo->getAssetType() == LLAssetType::AT_TEXTURE && floater_snapshot) + { + floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "inventory"))); + } + } |