diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
| commit | 2c536cd91dcdb89319fc569f34ee49cfaccd8a5d (patch) | |
| tree | ba304e9cc5bec1caebc360618cfa39bd8c3ffdd9 /indra/newview/llfloaterfacebook.cpp | |
| parent | 4a684fb9e27be77f7069215b597bb0e7807757b3 (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
merge changes for 5.1.3-release
Diffstat (limited to 'indra/newview/llfloaterfacebook.cpp')
| -rw-r--r-- | indra/newview/llfloaterfacebook.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp index b1d6d8be82..e84cbc289f 100644 --- a/indra/newview/llfloaterfacebook.cpp +++ b/indra/newview/llfloaterfacebook.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llfloaterfacebook.cpp * @brief Implementation of llfloaterfacebook * @author Gilbert@lindenlab.com @@ -41,7 +41,6 @@ #include "llresmgr.h" // LLLocale #include "llsdserialize.h" #include "llloadingindicator.h" -#include "llplugincookiestore.h" #include "llslurl.h" #include "lltrans.h" #include "llsnapshotlivepreview.h" @@ -296,16 +295,11 @@ void LLFacebookStatusPanel::showConnectedLayout() void LLFacebookStatusPanel::onConnect() { LLFacebookConnect::instance().checkConnectionToFacebook(true); - - //Clear only the facebook browser cookies so that the facebook login screen appears - LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); } void LLFacebookStatusPanel::onDisconnect() { LLFacebookConnect::instance().disconnectFromFacebook(); - - LLViewerMedia::getCookieStore()->removeCookiesByDomain(".facebook.com"); } void LLFacebookStatusPanel::clearAndClose() @@ -810,7 +804,7 @@ void LLFacebookCheckinPanel::sendCheckin() LLAgentUI::buildSLURL(slurl); std::string slurl_string = slurl.getSLURLString(); - // Use a valid http:// URL if the scheme is secondlife:// + // Use a valid http:// URL if the scheme is secondlife:// LLURI slurl_uri(slurl_string); if (slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME) { |