diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-04 21:17:04 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-04 21:17:04 -0800 |
| commit | 0dfc7f6145b0c179ee66dbc7539b7c3d9a68cc37 (patch) | |
| tree | 7cce8cf627609aec932923679fd811a671bd3b9c /indra/newview/llfloatersnapshot.cpp | |
| parent | f5b356a7d4b51fbf509926295cb38d3a1e8442e3 (diff) | |
| parent | 5a23bf50bcee13a5841f680b13ca480753d367a1 (diff) | |
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
| -rwxr-xr-x | indra/newview/llfloatersnapshot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 4701e128d3..c3efc26991 100755 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -31,7 +31,7 @@ #include "llagent.h" #include "llfacebookconnect.h" #include "llfloaterreg.h" -#include "llfloatersocial.h" +#include "llfloaterfacebook.h" #include "llfloaterflickr.h" #include "llfloatertwitter.h" #include "llcheckboxctrl.h" @@ -1266,11 +1266,11 @@ S32 LLFloaterSnapshot::notify(const LLSD& info) void LLFloaterSnapshot::update() { LLFloaterSnapshot* inst = LLFloaterReg::findTypedInstance<LLFloaterSnapshot>("snapshot"); - LLFloaterSocial* floater_social = LLFloaterReg::findTypedInstance<LLFloaterSocial>("social"); + LLFloaterFacebook* floater_facebook = LLFloaterReg::findTypedInstance<LLFloaterFacebook>("facebook"); LLFloaterFlickr* floater_flickr = LLFloaterReg::findTypedInstance<LLFloaterFlickr>("flickr"); LLFloaterTwitter* floater_twitter = LLFloaterReg::findTypedInstance<LLFloaterTwitter>("twitter"); - if (!inst && !floater_social && !floater_flickr && !floater_twitter) + if (!inst && !floater_facebook && !floater_flickr && !floater_twitter) return; BOOL changed = FALSE; |