summaryrefslogtreecommitdiff
path: root/indra/newview/llfacebookconnect.cpp
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-12-18 23:18:02 +0000
committerCho <cho@lindenlab.com>2013-12-18 23:18:02 +0000
commit19d482e913e66f76f3bb7a3e1048e35853be535f (patch)
tree5587b278675d4b475b2837a7c0a67c125b336af3 /indra/newview/llfacebookconnect.cpp
parente88c9909b627502db55aa85ba8b2947039818e60 (diff)
Cleaned up some code while investigated ACME-1152
Diffstat (limited to 'indra/newview/llfacebookconnect.cpp')
-rw-r--r--indra/newview/llfacebookconnect.cpp36
1 files changed, 6 insertions, 30 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index 77c67b1779..eb044d90cd 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -83,11 +83,7 @@ public:
if (tokens.size() >= 2 && tokens[1].asString() == "flickr")
{
// this command probably came from the flickr_web browser, so close it
- LLFloater* flickr_web = LLFloaterReg::getInstance("flickr_web");
- if (flickr_web)
- {
- flickr_web->closeFloater();
- }
+ LLFloaterReg::hideInstance("flickr_web");
// connect to flickr
if (query_map.has("oauth_token"))
@@ -99,11 +95,7 @@ public:
else if (tokens.size() >= 2 && tokens[1].asString() == "twitter")
{
// this command probably came from the twitter_web browser, so close it
- LLFloater* twitter_web = LLFloaterReg::getInstance("twitter_web");
- if (twitter_web)
- {
- twitter_web->closeFloater();
- }
+ LLFloaterReg::hideInstance("twitter_web");
// connect to twitter
if (query_map.has("oauth_token"))
@@ -115,11 +107,7 @@ public:
else //if (tokens.size() >= 2 && tokens[1].asString() == "facebook")
{
// 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();
- }
+ LLFloaterReg::hideInstance("fbc_web");
// connect to facebook
if (query_map.has("code"))
@@ -152,11 +140,7 @@ public:
if (tokens.size() >= 2 && tokens[1].asString() == "flickr")
{
// this command probably came from the flickr_web browser, so close it
- LLFloater* flickr_web = LLFloaterReg::getInstance("flickr_web");
- if (flickr_web)
- {
- flickr_web->closeFloater();
- }
+ LLFloaterReg::hideInstance("flickr_web");
// connect to flickr
if (query_map.has("oauth_token"))
@@ -168,11 +152,7 @@ public:
else if (tokens.size() >= 2 && tokens[1].asString() == "twitter")
{
// this command probably came from the twitter_web browser, so close it
- LLFloater* twitter_web = LLFloaterReg::getInstance("twitter_web");
- if (twitter_web)
- {
- twitter_web->closeFloater();
- }
+ LLFloaterReg::hideInstance("twitter_web");
// connect to twitter
if (query_map.has("oauth_token"))
@@ -184,11 +164,7 @@ public:
else //if (tokens.size() >= 2 && tokens[1].asString() == "facebook")
{
// 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();
- }
+ LLFloaterReg::hideInstance("fbc_web");
// connect to facebook
if (query_map.has("code"))