From 89ae19e57edc9abfd300b17caf2719d7794dabf9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 28 Jun 2013 20:19:17 +0100
Subject: removed old error popups and added better logging for ACME-653

---
 indra/newview/llfacebookconnect.cpp                | 29 ++++++----------------
 .../newview/skins/default/xui/en/notifications.xml | 11 --------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index 52268daa36..dc450aab7a 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -41,19 +41,12 @@
 
 
 // Local functions
-void prompt_user_for_error(U32 status, const std::string& reason, const std::string& code, const std::string& description)
+void log_facebook_connect_error(const std::string& request, U32 status, const std::string& reason, const std::string& code, const std::string& description)
 {
-    // Note: 302 (redirect) is *not* an error that warrants prompting the user
+    // Note: 302 (redirect) is *not* an error that warrants logging
     if (status != 302)
     {
-        LLSD args(LLSD::emptyMap());
-        std::stringstream msg;
-        msg << status;
-        args["STATUS"] = msg.str();
-		args["REASON"] = reason;
-		args["CODE"] = code;
-		args["DESCRIPTION"] = description;
-        LLNotificationsUtil::add("FacebookCannotConnect", args);
+		LL_WARNS("FacebookConnect") << request << " request failed with a " << status << " " << reason << ". Reason: " << code << "(" << description << ")" << LL_ENDL;
     }
 }
 
@@ -113,8 +106,7 @@ public:
 		else
 		{
             LLFacebookConnect::instance().setConnectionState(LLFacebookConnect::FB_CONNECTION_FAILED);
-            prompt_user_for_error(status, reason, content.get("error_code"), content.get("error_description"));
-            LL_WARNS("FacebookConnect") << "Failed to get a response. reason: " << reason << " status: " << status << LL_ENDL;
+            log_facebook_connect_error("Connect", status, reason, content.get("error_code"), content.get("error_description"));
 		}
 	}
     
@@ -147,8 +139,7 @@ public:
 		}
 		else
 		{
-            prompt_user_for_error(status, reason, content.get("error_code"), content.get("error_description"));
-            LL_WARNS("FacebookConnect") << "Failed to get a post response. reason: " << reason << " status: " << status << LL_ENDL;
+            log_facebook_connect_error("Share", status, reason, content.get("error_code"), content.get("error_description"));
 		}
 		
 		if (mShareCallback)
@@ -188,8 +179,7 @@ public:
 		}
 		else
 		{
-            prompt_user_for_error(status, reason, content.get("error_code"), content.get("error_description"));
-			LL_WARNS("FacebookConnect") << "Failed to get a response. reason: " << reason << " status: " << status << LL_ENDL;
+            log_facebook_connect_error("Disconnect", status, reason, content.get("error_code"), content.get("error_description"));
 		}
 	}
 };
@@ -218,8 +208,6 @@ public:
 		}
 		else
 		{
-			LL_WARNS("FacebookConnect") << "Failed to get a response. reason: " << reason << " status: " << status << LL_ENDL;
-            
 			// show the facebook login page if not connected yet
 			if (status == 404)
 			{
@@ -235,7 +223,7 @@ public:
             else
             {
                 LLFacebookConnect::instance().setConnectionState(LLFacebookConnect::FB_CONNECTION_FAILED);
-				prompt_user_for_error(status, reason, content.get("error_code"), content.get("error_description"));
+				log_facebook_connect_error("Connected", status, reason, content.get("error_code"), content.get("error_description"));
             }
 		}
 	}
@@ -261,8 +249,7 @@ public:
 		}
 		else
 		{
-            prompt_user_for_error(status, reason, content.get("error_code"), content.get("error_description"));
-			LL_WARNS("FacebookConnect") << "Failed to get a response. reason: " << reason << " status: " << status << LL_ENDL;
+            log_facebook_connect_error("Friends", status, reason, content.get("error_code"), content.get("error_description"));
 		}
 	}
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8911e47e8..1f20d3ab58 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5439,17 +5439,6 @@ This day cycle file references a missing sky file: [SKY].
 Sorry, the settings couldn't be applied to the region.  Leaving the region and then returning may help rectify the problem.  The reason given was: [FAIL_REASON]
   </notification>
 
-  <notification
-   functor="GenericAcknowledge"
-   icon="alertmodal.tga"
-   name="FacebookCannotConnect"
-   type="alertmodal">
-Connection to Facebook failed. Reason: [STATUS] [REASON] ([CODE] - [DESCRIPTION])
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-    
   <notification
    functor="GenericAcknowledge"
    icon="alertmodal.tga"
-- 
cgit v1.2.3