summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterwebcontent.cpp
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-11-06 02:06:53 +0000
committerCho <cho@lindenlab.com>2013-11-06 02:06:53 +0000
commit1a1826a4f7110dc2b7859f6ce871ab0ac957525f (patch)
treeb2410137e3d31217cc268e555db8de2f06a4ea82 /indra/newview/llfloaterwebcontent.cpp
parent181a7d22964b7cfbdd108493560ea60064a65f86 (diff)
separated web floaters for Facebook, Flickr, and Twitter to fix ACME-1151
Diffstat (limited to 'indra/newview/llfloaterwebcontent.cpp')
-rwxr-xr-xindra/newview/llfloaterwebcontent.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 4fa2d4cb20..814c91ef6c 100755
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -299,16 +299,25 @@ void LLFloaterWebContent::onClose(bool app_quitting)
{
LLFacebookConnect::instance().setConnectionState(LLFacebookConnect::FB_CONNECTION_FAILED);
}
+ }
+ // Same with Flickr
+ LLFloater* flickr_web = LLFloaterReg::getInstance("flickr_web");
+ if (flickr_web == this)
+ {
if (!LLFlickrConnect::instance().isConnected())
{
LLFlickrConnect::instance().setConnectionState(LLFlickrConnect::FLICKR_CONNECTION_FAILED);
}
+ }
+ // And Twitter
+ LLFloater* twitter_web = LLFloaterReg::getInstance("twitter_web");
+ if (twitter_web == this)
+ {
if (!LLTwitterConnect::instance().isConnected())
{
LLTwitterConnect::instance().setConnectionState(LLTwitterConnect::TWITTER_CONNECTION_FAILED);
}
}
-
LLViewerMedia::proxyWindowClosed(mUUID);
destroy();
}