summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelsnapshotprofile.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-09-16 16:00:07 -0700
committerRider Linden <rider@lindenlab.com>2016-09-16 16:00:07 -0700
commit8d86f5a0c457fceff5923fb7ca32259b2718addc (patch)
treeb374188accf39136045590254133d0bc2e62d47c /indra/newview/llpanelsnapshotprofile.cpp
parent68b8d2658a741617ae9844824090efe922da1edd (diff)
parent51bb369a39142ff5049f753099f9638ce68b95dc (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelsnapshotprofile.cpp')
-rw-r--r--indra/newview/llpanelsnapshotprofile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelsnapshotprofile.cpp b/indra/newview/llpanelsnapshotprofile.cpp
index 8949eb73eb..38dec78030 100644
--- a/indra/newview/llpanelsnapshotprofile.cpp
+++ b/indra/newview/llpanelsnapshotprofile.cpp
@@ -58,7 +58,7 @@ private:
/*virtual*/ std::string getAspectRatioCBName() const { return "profile_keep_aspect_check"; }
/*virtual*/ std::string getImageSizeComboName() const { return "profile_size_combo"; }
/*virtual*/ std::string getImageSizePanelName() const { return "profile_image_size_lp"; }
- /*virtual*/ LLFloaterSnapshot::ESnapshotFormat getImageFormat() const { return LLFloaterSnapshot::SNAPSHOT_FORMAT_PNG; }
+ /*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const { return LLSnapshotModel::SNAPSHOT_FORMAT_PNG; }
/*virtual*/ void updateControls(const LLSD& info);
void onSend();
@@ -96,6 +96,6 @@ void LLPanelSnapshotProfile::onSend()
std::string caption = getChild<LLUICtrl>("caption")->getValue().asString();
bool add_location = getChild<LLUICtrl>("add_location_cb")->getValue().asBoolean();
- LLWebProfile::uploadImage(LLFloaterSnapshot::getImageData(), caption, add_location);
- LLFloaterSnapshot::postSave();
+ LLWebProfile::uploadImage(mSnapshotFloater->getImageData(), caption, add_location);
+ mSnapshotFloater->postSave();
}