summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-06-06 20:08:46 -0700
committerMerov Linden <merov@lindenlab.com>2013-06-06 20:08:46 -0700
commitbee5369b2f2fc0208b1a0645c2702ed1cea43c55 (patch)
tree9ff5520d754c1ca6e76356ad4a072eeb2c7738d5 /indra/newview/llfloatersnapshot.cpp
parent4163603a1118a9c1e220e56f22e757d162932ebe (diff)
ACME-464 : Fixed : We connect to FB when bringing up the Upload to FB Snapshot panel
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
-rwxr-xr-xindra/newview/llfloatersnapshot.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index d8d62e5bbb..8405d8aeec 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -37,6 +37,7 @@
#include "llcriticaldamp.h"
#include "llfloaterperms.h"
#include "llui.h"
+#include "llfacebookconnect.h"
#include "llfocusmgr.h"
#include "llbutton.h"
#include "llcombobox.h"
@@ -2245,7 +2246,16 @@ void LLFloaterSnapshot::update()
{
changed |= LLSnapshotLivePreview::onIdle(*iter);
}
- if(changed)
+
+ // We need to pool on facebook connection as it might change any time
+ static bool s_facebook_connected = false;
+ if (LLFacebookConnect::instance().getConnected() != s_facebook_connected)
+ {
+ s_facebook_connected = LLFacebookConnect::instance().getConnected();
+ changed = true;
+ }
+
+ if (changed)
{
lldebugs << "changed" << llendl;
inst->impl.updateControls(inst);