diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-08-02 19:25:10 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-08-02 19:25:10 -0700 |
| commit | 35278461964653fc032995afdc366f096c937a14 (patch) | |
| tree | b96a0628699f5547c12eceabef2bad451d2e8a86 /indra/newview/llfloatersocial.cpp | |
| parent | 56b54aaf2954765f68c4fbe843495fdcdb918744 (diff) | |
ACME-796 : Do not flip the fbc state to failure while connecting through web browser. Handle the dismiss case as best as possible.
Diffstat (limited to 'indra/newview/llfloatersocial.cpp')
| -rw-r--r-- | indra/newview/llfloatersocial.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index eb9a7d2400..59db93f4b2 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -684,8 +684,12 @@ void LLSocialAccountPanel::onVisibilityChange(const LLSD& new_visibility) else { showDisconnectedLayout(); - LLFacebookConnect::instance().checkConnectionToFacebook(); } + if ((LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_NOT_CONNECTED) || + (LLFacebookConnect::instance().getConnectionState() == LLFacebookConnect::FB_CONNECTION_FAILED)) + { + LLFacebookConnect::instance().checkConnectionToFacebook(); + } } else { |