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/llpanelsnapshotoptions.cpp | |
parent | f5b356a7d4b51fbf509926295cb38d3a1e8442e3 (diff) | |
parent | 5a23bf50bcee13a5841f680b13ca480753d367a1 (diff) |
Pull merge from lindenlab/viewer-acme
Diffstat (limited to 'indra/newview/llpanelsnapshotoptions.cpp')
-rwxr-xr-x | indra/newview/llpanelsnapshotoptions.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelsnapshotoptions.cpp b/indra/newview/llpanelsnapshotoptions.cpp index 4cadd837d1..a7b9b6d22e 100755 --- a/indra/newview/llpanelsnapshotoptions.cpp +++ b/indra/newview/llpanelsnapshotoptions.cpp @@ -32,7 +32,7 @@ #include "llfloatersnapshot.h" // FIXME: create a snapshot model #include "llfloaterreg.h" -#include "llfloatersocial.h" +#include "llfloaterfacebook.h" #include "llfloaterflickr.h" #include "llfloatertwitter.h" @@ -144,12 +144,12 @@ void LLPanelSnapshotOptions::onSendToFacebook() { LLFloaterReg::hideInstance("snapshot"); - LLFloaterSocial* social_floater = dynamic_cast<LLFloaterSocial*>(LLFloaterReg::getInstance("social")); - if (social_floater) + LLFloaterFacebook* facebook_floater = dynamic_cast<LLFloaterFacebook*>(LLFloaterReg::getInstance("facebook")); + if (facebook_floater) { - social_floater->showPhotoPanel(); + facebook_floater->showPhotoPanel(); } - LLFloaterReg::showInstance("social"); + LLFloaterReg::showInstance("facebook"); } void LLPanelSnapshotOptions::onSendToTwitter() |