summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-08-14 20:02:31 +0100
committerCho <cho@lindenlab.com>2013-08-14 20:02:31 +0100
commit4595978d59d905bc9ef95efd759eac8cb62b57c3 (patch)
tree4285f2dfdc717b0fb63c7c8ea9f79932cb714c39 /indra/newview
parentb338aa42c61b3a31be6e4e486fd8d4acf482e990 (diff)
removed momentary error message upon connecting to Facebook
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfacebookconnect.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index 0a4fefbd24..abfacdb93c 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -81,18 +81,18 @@ public:
{
if (tokens[0].asString() == "connect")
{
- // connect to facebook
- if (query_map.has("code"))
- {
- LLFacebookConnect::instance().connectToFacebook(query_map["code"], query_map.get("state"));
- }
-
// this command probably came from the fbc_web browser, so close it
LLFloater* fbc_web = LLFloaterReg::getInstance("fbc_web");
if (fbc_web)
{
fbc_web->closeFloater();
}
+
+ // connect to facebook
+ if (query_map.has("code"))
+ {
+ LLFacebookConnect::instance().connectToFacebook(query_map["code"], query_map.get("state"));
+ }
return true;
}
}