diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-13 20:30:27 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-13 20:30:27 +0100 |
| commit | 873981f03fce3d1cd8ede3b2275681453d8dc7f0 (patch) | |
| tree | 9c27a9785781fa7f280257930ddf3dfab952ae7e /indra/newview/llfloaterflickr.cpp | |
| parent | c0e16b28001e4b34511d84537155f0c8b9d692d7 (diff) | |
| parent | 4c0af0891e4e4c7e1894b900cdcc919e9d1d67cf (diff) | |
Merge
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"); } //////////////////////// |