summaryrefslogtreecommitdiff
path: root/indra/newview/llsnapshotlivepreview.cpp
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-11-04 23:42:21 +0000
committerCho <cho@lindenlab.com>2013-11-04 23:42:21 +0000
commitcea9ffe89ce98f04e311aa989cce5955e77a15ff (patch)
treea39aba4b740cd90afa649fd5fd08176bbf3e5af6 /indra/newview/llsnapshotlivepreview.cpp
parent7c46eb17f24e30fe83469a297086aa93f100e5ed (diff)
added Twitter floater for ACME-1146, ACME-1147, ACME-1148, ACME-1149, and ACME-1150
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r--indra/newview/llsnapshotlivepreview.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index afd9942e77..67952f83c7 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -36,6 +36,7 @@
#include "llfloaterreg.h"
#include "llfloatersocial.h"
#include "llfloaterflickr.h"
+#include "llfloatertwitter.h"
#include "llimagebmp.h"
#include "llimagej2c.h"
#include "llimagejpeg.h"
@@ -211,6 +212,7 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail
LLFloaterSnapshot::preUpdate();
LLFloaterSocial::preUpdate();
LLFloaterFlickr::preUpdate();
+ LLFloaterTwitter::preUpdate();
}
// Update thumbnail if requested.
@@ -769,6 +771,7 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview )
LLFloaterSnapshot::postUpdate();
LLFloaterSocial::postUpdate();
LLFloaterFlickr::postUpdate();
+ LLFloaterTwitter::postUpdate();
return TRUE;
}