Downstream merge from lindenlab/viewer-serval

1 files changed, 0 insertions, 22 deletions

diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index c591dfacaf..23fd6d9c8e 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -30,8 +30,6 @@
 #include "lliconctrl.h"
 #include "llfloaterreg.h"
 #include "llhttpconstants.h"
-#include "llflickrconnect.h"
-#include "lltwitterconnect.h"
 #include "lllayoutstack.h"
 #include "llpluginclassmedia.h"
 #include "llprogressbar.h"
@@ -288,26 +286,6 @@ void LLFloaterWebContent::onOpen(const LLSD& key)
 //virtual
 void LLFloaterWebContent::onClose(bool app_quitting)
 {
-    // If we close the web browsing window showing the Flickr login, we need to signal to this object that the connection will not happen
-	// MAINT-3440 note change here to use findInstance and not getInstance - latter creates an instance if it's not there which is bad.
-	LLFloater* flickr_web = LLFloaterReg::findInstance("flickr_web");
-    if (flickr_web == this)
-    {
-        if (!LLFlickrConnect::instance().isConnected())
-        {
-            LLFlickrConnect::instance().setConnectionState(LLFlickrConnect::FLICKR_CONNECTION_FAILED);
-        }
-    }
-	// Same with Twitter
-	// MAINT-3440 note change here to use findInstance and not getInstance - latter creates an instance if it's not there which is bad.
-	LLFloater* twitter_web = LLFloaterReg::findInstance("twitter_web");
-    if (twitter_web == this)
-    {
-        if (!LLTwitterConnect::instance().isConnected())
-        {
-            LLTwitterConnect::instance().setConnectionState(LLTwitterConnect::TWITTER_CONNECTION_FAILED);
-        }
-    }
 	LLViewerMedia::getInstance()->proxyWindowClosed(mUUID);
 	destroy();
 }