From 11e6e208d43f1347037fb312921a65af138f47b4 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 17 Mar 2010 14:21:58 -0700
Subject: [PATCH] Adding error handling to share to web feature. Reviewed by
Callum
---
indra/newview/llfloatersnapshot.cpp | 19 +++++++++++++++++--
.../skins/default/xui/en/notifications.xml | 7 +++++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 7b0486da48..2df297fc42 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1045,9 +1045,24 @@ class LLSendWebResponder : public LLHTTPClient::Responder
{
public:
- void result(const LLSD& content)
+ virtual void error(U32 status, const std::string& reason)
{
- LLWeb::loadURLExternal(content["response_url"]);
+ llwarns << status << ": " << reason << llendl;
+ LLNotificationsUtil::add("ShareToWebFailed");
+ }
+
+ virtual void result(const LLSD& content)
+ {
+ std::string response_url = content["response_url"].asString();
+
+ if (!response_url.empty())
+ {
+ LLWeb::loadURLExternal(response_url);
+ }
+ else
+ {
+ LLNotificationsUtil::add("ShareToWebFailed");
+ }
}
};
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5680b91c05..c39a91281e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5292,6 +5292,13 @@ Failed to find [TYPE] in database.
Failed to find [TYPE] named [DESC] in database.
</notification>
+ <notification
+ icon="notify.tga"
+ name="ShareToWebFailed"
+ type="notify">
+ Failed to upload image to web.
+ </notification>
+
<notification
icon="notify.tga"
name="InvalidWearable"
--
GitLab