diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:49:26 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:49:26 +0100 |
| commit | 90250cb36d1bf42daa4af3629ffbe3c54cb28390 (patch) | |
| tree | d23bb80259c8da03cde600071c037db4dce64850 /indra/newview | |
| parent | f8c91bad6bb86d9c4a288e8796302a232e18be78 (diff) | |
| parent | 5ad91abfdff9cfbadee555a297b95ace8f4f22b4 (diff) | |
merge backout.
Diffstat (limited to 'indra/newview')
| -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 efb2210e7a..8fb1b40b26 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1046,24 +1046,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 f1d1904d08..f798ee1a2b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5515,14 +5515,7 @@ Failed to find [TYPE] named [DESC] in database. <notification icon="notify.tga" - name="ShareToWebFailed" persist="true" - type="notify"> - Failed to upload image to web. - </notification> - - <notification - icon="notify.tga" name="InvalidWearable" persist="true" type="notify"> |