From d3f544d39d204c60c6112f0ba4abd906ac28481a Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 17 Jan 2018 16:13:19 -0800
Subject: Fixes for 'MAINT-8196 Remove LLPluginCookieStore from the viewer' and
 'MAINT-8194 Remove per-frame calls to updateJavascriptObject()'

---
 indra/newview/llfloaterflickr.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/newview/llfloaterflickr.cpp')

diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 15b7c7fafa..69a92b2b54 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -40,7 +40,6 @@
 #include "llresmgr.h"		// LLLocale
 #include "llsdserialize.h"
 #include "llloadingindicator.h"
-#include "llplugincookiestore.h"
 #include "llslurl.h"
 #include "lltrans.h"
 #include "llsnapshotlivepreview.h"
@@ -660,16 +659,11 @@ void LLFlickrAccountPanel::showConnectedLayout()
 void LLFlickrAccountPanel::onConnect()
 {
 	LLFlickrConnect::instance().checkConnectionToFlickr(true);
-
-	//Clear only the flickr browser cookies so that the flickr login screen appears
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".flickr.com"); 
 }
 
 void LLFlickrAccountPanel::onDisconnect()
 {
 	LLFlickrConnect::instance().disconnectFromFlickr();
-
-	LLViewerMedia::getCookieStore()->removeCookiesByDomain(".flickr.com"); 
 }
 
 ////////////////////////
-- 
cgit v1.2.3