From 5ad91abfdff9cfbadee555a297b95ace8f4f22b4 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 14:49:16 +0100
Subject: Backed out changeset b447707f20f5

---
 indra/newview/llfloatersnapshot.cpp                  | 19 ++-----------------
 indra/newview/skins/default/xui/en/notifications.xml |  7 -------
 2 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'indra/newview')

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
@@ -5292,13 +5292,6 @@ 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"
-- 
cgit v1.2.3