summaryrefslogtreecommitdiff
path: root/indra/newview/llfacebookconnect.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-08-02 19:25:10 -0700
committerMerov Linden <merov@lindenlab.com>2013-08-02 19:25:10 -0700
commit35278461964653fc032995afdc366f096c937a14 (patch)
treeb96a0628699f5547c12eceabef2bad451d2e8a86 /indra/newview/llfacebookconnect.cpp
parent56b54aaf2954765f68c4fbe843495fdcdb918744 (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/llfacebookconnect.cpp')
-rw-r--r--indra/newview/llfacebookconnect.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index e4ac2a4960..98fd8b1d7b 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -122,7 +122,7 @@ public:
// Grab some graph data now that we are connected
LLFacebookConnect::instance().setConnectionState(LLFacebookConnect::FB_CONNECTED);
}
- else
+ else if (status != 302)
{
LLFacebookConnect::instance().setConnectionState(LLFacebookConnect::FB_CONNECTION_FAILED);
log_facebook_connect_error("Connect", status, reason, content.get("error_code"), content.get("error_description"));