separated web floaters for Facebook, Flickr, and Twitter to fix ACME-1151

1 files changed, 21 insertions, 7 deletions

diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index b0111f63fa..bf517fbc9e 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -80,15 +80,15 @@ public:
 		{
 			if (tokens[0].asString() == "connect")
 			{
-				// 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();
-				}
-
 				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();
+					}
+
 					// connect to flickr
 					if (query_map.has("oauth_token"))
 					{
@@ -98,6 +98,13 @@ 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();
+					}
+
 					// connect to twitter
 					if (query_map.has("oauth_token"))
 					{
@@ -107,6 +114,13 @@ 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();
+					}
+
 					// connect to facebook
 					if (query_map.has("code"))
 					{