Skip to content

Commit 85cf1d7

Browse files
AnsarielAnsariel
committed
Remove incorrectly calculated upload fee from snapshot options button based on previously selected snapshot type and not necessarily snapshot to inventory
1 parent 0c380eb commit 85cf1d7

12 files changed

+11
-46
lines changed

‎indra/newview/llpanelsnapshotoptions.cpp

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,8 @@
3030
#include "llsidetraypanelcontainer.h"
3131

3232
#include "llfloatersnapshot.h" // FIXME: create a snapshot model
33-
#include "llsnapshotlivepreview.h"
3433
#include "llfloaterreg.h"
3534

36-
#include "llagentbenefits.h"
37-
38-
3935
/**
4036
* Provides several ways to save a snapshot.
4137
*/
@@ -46,12 +42,9 @@ class LLPanelSnapshotOptions
4642

4743
public:
4844
LLPanelSnapshotOptions();
49-
~LLPanelSnapshotOptions();
5045
bool postBuild() override;
51-
void onOpen(const LLSD& key) override;
5246

5347
private:
54-
void updateUploadCost();
5548
void openPanel(const std::string& panel_name);
5649
void onSaveToProfile();
5750
void onSaveToEmail();
@@ -71,41 +64,13 @@ LLPanelSnapshotOptions::LLPanelSnapshotOptions()
7164
mCommitCallbackRegistrar.add("Snapshot.SaveToComputer", boost::bind(&LLPanelSnapshotOptions::onSaveToComputer, this));
7265
}
7366

74-
LLPanelSnapshotOptions::~LLPanelSnapshotOptions()
75-
{
76-
}
77-
7867
// virtual
7968
bool LLPanelSnapshotOptions::postBuild()
8069
{
8170
mSnapshotFloater = getParentByType<LLFloaterSnapshotBase>();
8271
return LLPanel::postBuild();
8372
}
8473

85-
// virtual
86-
void LLPanelSnapshotOptions::onOpen(const LLSD& key)
87-
{
88-
updateUploadCost();
89-
}
90-
91-
void LLPanelSnapshotOptions::updateUploadCost()
92-
{
93-
S32 w = 0;
94-
S32 h = 0;
95-
96-
if( mSnapshotFloater )
97-
{
98-
LLSnapshotLivePreview* preview = mSnapshotFloater->getPreviewView();
99-
if( preview )
100-
{
101-
preview->getSize(w, h);
102-
}
103-
}
104-
105-
S32 upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(w, h);
106-
getChild<LLUICtrl>("save_to_inventory_btn")->setLabelArg("[AMOUNT]", llformat("%d", upload_cost));
107-
}
108-
10974
void LLPanelSnapshotOptions::openPanel(const std::string& panel_name)
11075
{
11176
LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());

‎indra/newview/skins/default/xui/de/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<panel name="panel_snapshot_options">
33
<button label="Auf Datenträger speichern" name="save_to_computer_btn"/>
4-
<button label="In Inventar speichern ([AMOUNT] L$)" name="save_to_inventory_btn"/>
4+
<button label="In Inventar speichern" name="save_to_inventory_btn"/>
55
<button label="Im Profil-Feed teilen" name="save_to_profile_btn"/>
66
<button label="Auf Facebook teilen" name="send_to_facebook_btn"/>
77
<button label="Auf Twitter teilen" name="send_to_twitter_btn"/>

‎indra/newview/skins/default/xui/en/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
image_overlay_alignment="left"
3232
image_top_pad="-1"
3333
imgoverlay_label_space="10"
34-
label="Save to Inventory (L$[AMOUNT])"
34+
label="Save to Inventory"
3535
layout="topleft"
3636
left_delta="0"
3737
name="save_to_inventory_btn"

‎indra/newview/skins/default/xui/es/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<panel name="panel_snapshot_options">
33
<button label="Guardar en disco" name="save_to_computer_btn"/>
4-
<button label="Guardar en inventario (L$[AMOUNT])" name="save_to_inventory_btn"/>
4+
<button label="Guardar en inventario" name="save_to_inventory_btn"/>
55
<button label="Compartir en los comentarios de Mi perfil" name="save_to_profile_btn"/>
66
<button label="Compartir en Facebook" name="send_to_facebook_btn"/>
77
<button label="Compartir en Twitter" name="send_to_twitter_btn"/>

‎indra/newview/skins/default/xui/fr/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<panel name="panel_snapshot_options">
33
<button label="Enreg. sur le disque" name="save_to_computer_btn"/>
4-
<button label="Enreg. dans l&apos;inventaire ([AMOUNT] L$)" name="save_to_inventory_btn"/>
4+
<button label="Enreg. dans l&apos;inventaire" name="save_to_inventory_btn"/>
55
<button label="Partager sur le flux de profil" name="save_to_profile_btn"/>
66
<button label="Partager sur Facebook" name="send_to_facebook_btn"/>
77
<button label="Partager sur Twitter" name="send_to_twitter_btn"/>

‎indra/newview/skins/default/xui/it/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<panel name="panel_snapshot_options">
33
<button label="Salva sul disco" name="save_to_computer_btn"/>
4-
<button label="Salva nell&apos;inventario (L$[AMOUNT])" name="save_to_inventory_btn"/>
4+
<button label="Salva nell&apos;inventario" name="save_to_inventory_btn"/>
55
<button label="Condividi sul feed del profilo" name="save_to_profile_btn"/>
66
<button label="Condividi su Facebook" name="send_to_facebook_btn"/>
77
<button label="Condividi su Twitter" name="send_to_twitter_btn"/>

‎indra/newview/skins/default/xui/ja/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<panel name="panel_snapshot_options">
33
<button label="ディスクに保存" name="save_to_computer_btn"/>
4-
<button label="インベントリに保存（L$ [AMOUNT]）" name="save_to_inventory_btn"/>
4+
<button label="インベントリに保存" name="save_to_inventory_btn"/>
55
<button label="プロフィールフィードで共有する" name="save_to_profile_btn"/>
66
<button label="メールで送信" name="save_to_email_btn"/>
77
<text name="fee_hint_lbl">

‎indra/newview/skins/default/xui/pl/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
22
<panel name="panel_snapshot_options">
33
<button label="Zapisz na dysku twardym" name="save_to_computer_btn" />
4-
<button label="Zapisz do Szafy ([AMOUNT]L$)" name="save_to_inventory_btn" />
4+
<button label="Zapisz do Szafy" name="save_to_inventory_btn" />
55
<button label="Wyślij na mój Kanał" name="save_to_profile_btn" />
66
<button label="Załaduj na Facebook" name="send_to_facebook_btn" />
77
<button label="Załaduj na Twitter" name="send_to_twitter_btn" />

‎indra/newview/skins/default/xui/pt/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<panel name="panel_snapshot_options">
33
<button label="Salvar no disco" name="save_to_computer_btn"/>
4-
<button label="Salvar em inventário (L$[AMOUNT])" name="save_to_inventory_btn"/>
4+
<button label="Salvar em inventário" name="save_to_inventory_btn"/>
55
<button label="Compartilhar no feed do perfil" name="save_to_profile_btn"/>
66
<button label="Compartilhar no Facebook" name="send_to_facebook_btn"/>
77
<button label="Compartilhar no Twitter" name="send_to_twitter_btn"/>

‎indra/newview/skins/default/xui/ru/panel_snapshot_options.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
22
<panel name="panel_snapshot_options">
33
<button label="Сохранить на диске" name="save_to_computer_btn"/>
4-
<button label="Сохранить в инвентаре (L$[AMOUNT])" name="save_to_inventory_btn"/>
4+
<button label="Сохранить в инвентаре" name="save_to_inventory_btn"/>
55
<button label="Поделиться в профиле" name="save_to_profile_btn"/>
66
<button label="Поделиться в Facebook" name="send_to_facebook_btn"/>
77
<button label="Поделиться в Twitter" name="send_to_twitter_btn"/>

0 commit comments

Comments
 (0)