diff options
| author | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
| commit | 6c953d0bde107059db75d01cd30326a31cd0de54 (patch) | |
| tree | c41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/newview/llfloatertwitter.cpp | |
| parent | bdd7bdf390775860fb26a6c7d0923f45bb20256c (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/newview/llfloatertwitter.cpp')
| -rw-r--r-- | indra/newview/llfloatertwitter.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llfloatertwitter.cpp b/indra/newview/llfloatertwitter.cpp index 4bab89ace2..2b33bc6935 100644 --- a/indra/newview/llfloatertwitter.cpp +++ b/indra/newview/llfloatertwitter.cpp @@ -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" @@ -404,13 +403,12 @@ void LLTwitterPhotoPanel::clearAndClose() void LLTwitterPhotoPanel::updateStatusTextLength(BOOL restore_old_status_text) { bool add_location = mLocationCheckbox->getValue().asBoolean(); - bool add_photo = mPhotoCheckbox->getValue().asBoolean(); // Restrict the status text length to Twitter's character limit LLTextEditor* status_text_box = dynamic_cast<LLTextEditor*>(mStatusTextBox); if (status_text_box) { - int max_status_length = 140 - (add_location ? 40 : 0) - (add_photo ? 40 : 0); + int max_status_length = 280 - (add_location ? 40 : 0); status_text_box->setMaxTextLength(max_status_length); if (restore_old_status_text) { @@ -684,16 +682,11 @@ void LLTwitterAccountPanel::showConnectedLayout() void LLTwitterAccountPanel::onConnect() { LLTwitterConnect::instance().checkConnectionToTwitter(true); - - //Clear only the twitter browser cookies so that the twitter login screen appears - LLViewerMedia::getCookieStore()->removeCookiesByDomain(".twitter.com"); } void LLTwitterAccountPanel::onDisconnect() { LLTwitterConnect::instance().disconnectFromTwitter(); - - LLViewerMedia::getCookieStore()->removeCookiesByDomain(".twitter.com"); } //////////////////////// |