From 3f96aeff8c84e55164ce5d652e38041b4e1db82b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 10 Mar 2020 16:33:55 +0200
Subject: [PATCH] SL-12817 New text for snapshot upload
---
indra/newview/llpanelsnapshotinventory.cpp | 1 -
.../xui/en/panel_outfit_snapshot_inventory.xml | 6 ++++--
.../default/xui/en/panel_snapshot_inventory.xml | 2 +-
.../default/xui/en/panel_snapshot_options.xml | 14 ++++++++++++++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llpanelsnapshotinventory.cpp b/indra/newview/llpanelsnapshotinventory.cpp
index 594cbed7adf..9e56a04b3b4 100644
--- a/indra/newview/llpanelsnapshotinventory.cpp
+++ b/indra/newview/llpanelsnapshotinventory.cpp
@@ -136,7 +136,6 @@ BOOL LLPanelSnapshotInventory::postBuild()
// virtual
void LLPanelSnapshotInventory::onOpen(const LLSD& key)
{
- getChild<LLUICtrl>("hint_lbl")->setTextArg("[UPLOAD_COST]", llformat("%d", LLAgentBenefitsMgr::current().getTextureUploadCost()));
LLPanelSnapshot::onOpen(key);
}
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 ace0ee01e2b..441cf97e870 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
@@ -41,7 +41,7 @@
<text
follows="top|left"
font="SansSerif"
- height="56"
+ height="126"
layout="topleft"
left="10"
length="1"
@@ -50,7 +50,9 @@
width="200"
type="string"
word_wrap="true">
- Uploading an image to your inventory costs L$[UPLOAD_COST].
+Uploading an image to your inventory costs L$[UPLOAD_COST].
+
+Fee is based on your subscription level. Higher levels are charged lower fees.
</text>
<button
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index d019a0a3109..8cc27d9eef1 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -118,7 +118,7 @@
width="200"
type="string"
word_wrap="true">
- Saving an image to your inventory costs L$[UPLOAD_COST]. To save your image as a texture select one of the square formats.
+ To save your image as a texture select one of the square formats.
</text>
<button
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 2fe4cf8183c..8fc5cd7e63b 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -73,4 +73,18 @@
<button.commit_callback
function="Snapshot.SaveToEmail" />
</button>
+ <text
+ follows="top|left"
+ font="SansSerif"
+ height="56"
+ layout="topleft"
+ left="10"
+ length="1"
+ name="fee_hint_lbl"
+ top_pad="7"
+ width="200"
+ type="string"
+ word_wrap="true">
+ Fee is based on your subscription level. Higher levels are charged lower fees.
+ </text>
</panel>
\ No newline at end of file
--
GitLab