summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-11-16 20:07:55 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2011-11-16 20:07:55 +0200
commitbd0bd119c0bdae7e7d02014a5a843b927b9d226f (patch)
treec1671b537613b7c1de161d36055948070a0b3756 /indra/newview
parent0a25d9b1ba4f01ae391319d35e4f573dc6624365 (diff)
EXP-1594 FIXED Stop the upload progress indicator if inventory texture upoload fails.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llassetuploadresponders.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 40a4d665f8..65bfc990d1 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -295,6 +295,11 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content)
{
// remove the "Uploading..." message
LLUploadDialog::modalUploadFinished();
+ LLFloater* floater_snapshot = LLFloaterReg::findInstance("snapshot");
+ if (floater_snapshot)
+ {
+ floater_snapshot->notify(LLSD().with("set-finished", LLSD().with("ok", false).with("msg", "inventory")));
+ }
std::string reason = content["state"];
// deal with L$ errors