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/llfloatersnapshot.cpp | |
| parent | 963c97f64a4d1490fe8380805c4de38598adddad (diff) | |
added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ACME-1141
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
| -rwxr-xr-x | indra/newview/llfloatersnapshot.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index ea385d7baf..fa92ed094b 100755 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -32,6 +32,7 @@ #include "llfacebookconnect.h" #include "llfloaterreg.h" #include "llfloatersocial.h" +#include "llfloaterflickr.h" #include "llcheckboxctrl.h" #include "llcombobox.h" #include "llpostcard.h" @@ -1265,8 +1266,9 @@ void LLFloaterSnapshot::update() { LLFloaterSnapshot* inst = LLFloaterReg::findTypedInstance<LLFloaterSnapshot>("snapshot"); LLFloaterSocial* floater_social = LLFloaterReg::findTypedInstance<LLFloaterSocial>("social"); + LLFloaterFlickr* floater_flickr = LLFloaterReg::findTypedInstance<LLFloaterFlickr>("flickr"); - if (!inst && !floater_social) + if (!inst && !floater_social && !floater_flickr) return; BOOL changed = FALSE; |