diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-04-08 18:23:35 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-04-08 18:23:35 +0300 |
| commit | f5c21ce1aef74bd79cbcb8c7a6cd4f9f4891c993 (patch) | |
| tree | 7f4308a3f59a227265d075bf81f17532a10a7b4d | |
| parent | 8c973c812b956bda1f1afa1d6be4b5fb9ffd7ce6 (diff) | |
MAINT-6320 Snapshot floater is stuck in 'Saving to Inventory' state.
| -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"))); + } + } |