diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index 6c3d385811ee1958cd34ebe253eadff42142424e..53416036c95b1efa5dc099336d889e9c40a16e2e 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -910,6 +910,7 @@ bool LLOutfitGalleryContextMenu::onEnable(LLSD::String param) bool LLOutfitGalleryContextMenu::onVisible(LLSD::String param) { + mMenuHandle.get()->getChild<LLUICtrl>("upload_photo")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost())); if ("remove_photo" == param) { LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList); diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index f2a284a5618406c8584d9706b1863c93e3a48115..71ab826e1cfc96b49f40378bfb22c8affb720067 100644 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -35,6 +35,7 @@ #include "llaccordionctrltab.h" #include "llagentwearables.h" #include "llappearancemgr.h" +#include "llagentbenefits.h" #include "llfloatersidepanelcontainer.h" #include "llinventoryfunctions.h" #include "llinventorymodel.h" @@ -1235,6 +1236,7 @@ bool LLOutfitListGearMenuBase::onEnable(LLSD::String param) bool LLOutfitListGearMenuBase::onVisible(LLSD::String param) { + getMenu()->getChild<LLUICtrl>("upload_photo")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost())); const LLUUID& selected_outfit_id = getSelectedOutfitID(); if (selected_outfit_id.isNull()) // no selection or invalid outfit selected { diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp index a17e3f9e78abe86b45e92f03dd0929c6a9f77ed4..c3524a8c879822d1698235eeaf5a2d57b63e6f85 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()) { diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml index 1b08767edc16bc38da743d06fd17c6d58e946dcc..99ca910062c8cffb7b92793a5f5a075e5462b2d3 100755 --- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml +++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml @@ -42,7 +42,7 @@ parameter="take_off" /> </menu_item_call> <menu_item_call - label="Upload Photo (L$10)" + label="Upload Photo (L$[UPLOAD_COST])" layout="topleft" name="upload_photo"> <on_click diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml index 61cb74f2304c9de6a139ae8191e5973463e25307..32d9d28434a1b418fd6b0fc485a478e2e48dda43 100644 --- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml @@ -40,7 +40,7 @@ parameter="take_off" /> </menu_item_call> <menu_item_call - label="Upload Photo (L$10)" + label="Upload Photo (L$[UPLOAD_COST])" layout="topleft" name="upload_photo"> <on_click diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml index 800faabc2abe701a954e1ffe423c0175251f01f5..ace0ee01e2b58d7921fed51f5f4350b846a91f71 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml @@ -67,7 +67,7 @@ <button follows="left|bottom" height="23" - label="UPLOAD L$10" + label="UPLOAD L$[UPLOAD_COST]" layout="topleft" left="10" name="save_btn" @@ -76,4 +76,4 @@ <button.commit_callback function="Inventory.SaveOutfitPhoto" /> </button> -</panel> \ No newline at end of file +</panel>