diff options
| author | Cho <cho@lindenlab.com> | 2013-11-02 01:50:17 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-11-02 01:50:17 +0100 |
| commit | 0e71fb3c9d82bf2a307431f68f8ec84d223a4887 (patch) | |
| tree | a6b8291a742154f60cafd8e484ebc3a67fde9987 /indra/newview/llsnapshotlivepreview.cpp | |
| parent | 963c97f64a4d1490fe8380805c4de38598adddad (diff) | |
added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ACME-1141
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
| -rw-r--r-- | indra/newview/llsnapshotlivepreview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp index 7532ebfc57..afd9942e77 100644 --- a/indra/newview/llsnapshotlivepreview.cpp +++ b/indra/newview/llsnapshotlivepreview.cpp @@ -35,6 +35,7 @@ #include "llfloaterperms.h" #include "llfloaterreg.h" #include "llfloatersocial.h" +#include "llfloaterflickr.h" #include "llimagebmp.h" #include "llimagej2c.h" #include "llimagejpeg.h" @@ -209,6 +210,7 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail mSnapshotDelayTimer.setTimerExpirySec(delay); LLFloaterSnapshot::preUpdate(); LLFloaterSocial::preUpdate(); + LLFloaterFlickr::preUpdate(); } // Update thumbnail if requested. @@ -766,6 +768,7 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview ) lldebugs << "done creating snapshot" << llendl; LLFloaterSnapshot::postUpdate(); LLFloaterSocial::postUpdate(); + LLFloaterFlickr::postUpdate(); return TRUE; } |