diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:49:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:49:16 +0100 |
| commit | 5ad91abfdff9cfbadee555a297b95ace8f4f22b4 (patch) | |
| tree | ed61707fed537dc47d4a4ff86c98d73250e64919 | |
| parent | 11e6e208d43f1347037fb312921a65af138f47b4 (diff) | |
Backed out changeset b447707f20f5
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 19 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
2 files changed, 2 insertions, 24 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 2df297fc42..7b0486da48 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1045,24 +1045,9 @@ class LLSendWebResponder : public LLHTTPClient::Responder { public: - virtual void error(U32 status, const std::string& reason) + void result(const LLSD& content) { - 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"); - } + LLWeb::loadURLExternal(content["response_url"]); } }; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index c39a91281e..5680b91c05 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5294,13 +5294,6 @@ Failed to find [TYPE] named [DESC] in database. <notification icon="notify.tga" - name="ShareToWebFailed" - type="notify"> - Failed to upload image to web. - </notification> - - <notification - icon="notify.tga" name="InvalidWearable" type="notify"> The item you are trying to wear uses a feature that your Viewer can't read. Please upgrade your version of [APP_NAME] to wear this item. |