diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-03-18 15:39:38 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-03-18 15:39:38 -0600 |
commit | 331f290f61183c30c3ce87148fdfd7fb2a3e4f14 (patch) | |
tree | a7cc6e53fbcbc6aa3b1b4478fe5ddbe2ae746c44 /indra/newview/llpanelsnapshot.cpp | |
parent | 332232c532b006dff18c6b6c20da1ef475db14bb (diff) | |
parent | 328329fceab6b18dd7dda6f7ce9a3d4788fd7c54 (diff) |
Merge master (v 6.3.9) into DRTVWR-440
Diffstat (limited to 'indra/newview/llpanelsnapshot.cpp')
-rw-r--r-- | indra/newview/llpanelsnapshot.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp index a17e3f9e78..c3524a8c87 100644 --- a/indra/newview/llpanelsnapshot.cpp +++ b/indra/newview/llpanelsnapshot.cpp @@ -39,6 +39,8 @@ #include "llsidetraypanelcontainer.h" #include "llviewercontrol.h" // gSavedSettings +#include "llagentbenefits.h" + const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512 S32 power_of_two(S32 sz, S32 upper) @@ -59,6 +61,7 @@ LLPanelSnapshot::LLPanelSnapshot() // virtual BOOL LLPanelSnapshot::postBuild() { + getChild<LLUICtrl>("save_btn")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost())); getChild<LLUICtrl>(getImageSizeComboName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onResolutionComboCommit, this, _1)); if (!getWidthSpinnerName().empty()) { |