diff options
author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-04-19 12:57:19 -0700 |
---|---|---|
committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-04-19 12:57:19 -0700 |
commit | 3c4ca3985a274c519cf9ed6a7bb50ef85aaaa0ac (patch) | |
tree | b49fc90bf1c4634557972dd48bca10e887c071a5 /indra/newview/llfloaterflickr.cpp | |
parent | 7c90da6b9ef48757636b04f6401d5ea1dedf85f0 (diff) | |
parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llfloaterflickr.cpp')
-rw-r--r-- | indra/newview/llfloaterflickr.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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"); } //////////////////////// |