From 220c0e9479b8d4eea92eb0483a59068631eaebbf Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 16 Mar 2010 17:36:44 +0200 Subject: Fixed normal task EXT-6025 - [HARD CODED] Side Bar : "Save Pick" - "Pick" is in EN (Save [WHAT]) Removed unused hardcoded strings, replaced "Save [WHAT]" with simple "Save Pick" as it's the only label needed for this button. Reviewer by Kent Quirk https://codereview.productengine.com/secondlife/r/28/ --HG-- branch : product-engine --- indra/newview/llpanelpick.cpp | 6 ------ indra/newview/skins/default/xui/en/panel_edit_pick.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 82bbcaf38b..f0dc493ebe 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -72,10 +72,6 @@ #define XML_BTN_ON_TXTR "edit_icon" #define XML_BTN_SAVE "save_changes_btn" -#define SAVE_BTN_LABEL "[WHAT]" -#define LABEL_PICK = "Pick" -#define LABEL_CHANGES = "Changes" - ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// @@ -148,8 +144,6 @@ BOOL LLPanelPickInfo::postBuild() { mSnapshotCtrl = getChild(XML_SNAPSHOT); - childSetLabelArg(XML_BTN_SAVE, SAVE_BTN_LABEL, std::string("Pick")); - childSetAction("teleport_btn", boost::bind(&LLPanelPickInfo::onClickTeleport, this)); childSetAction("show_on_map_btn", boost::bind(&LLPanelPickInfo::onClickMap, this)); childSetAction("back_btn", boost::bind(&LLPanelPickInfo::onClickBack, this)); diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml index 15517fb805..08ee0306dd 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml @@ -183,7 +183,7 @@