From 4e80dcfba4e51be8f5a5d51d87390bd86b75ef36 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 30 Jun 2015 09:55:56 +0200 Subject: [PATCH] Properly subst grid name in legacy profile picks intro text --- indra/newview/fspanelprofile.cpp | 3 +++ indra/newview/skins/default/xui/en/panel_profile_picks.xml | 2 +- indra/newview/skins/latency/xui/en/panel_profile_picks.xml | 2 +- indra/newview/skins/vintage/xui/en/panel_profile_picks.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/indra/newview/fspanelprofile.cpp b/indra/newview/fspanelprofile.cpp index 1d14213dbc..a8af91b430 100644 --- a/indra/newview/fspanelprofile.cpp +++ b/indra/newview/fspanelprofile.cpp @@ -1628,6 +1628,9 @@ BOOL FSPanelProfilePicks::postBuild() mRlvBehaviorCallbackConnection = gRlvHandler.setBehaviourCallback(boost::bind(&FSPanelProfilePicks::updateRlvRestrictions, this, _1, _2)); mNewButton->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)); + LLTextBox* intro_txt = getChild("Tell everyone about your favorite places in Second Life."); + intro_txt->setTextArg("[GRID]", LLTrans::getString("SECOND_LIFE")); + return TRUE; } diff --git a/indra/newview/skins/default/xui/en/panel_profile_picks.xml b/indra/newview/skins/default/xui/en/panel_profile_picks.xml index 79dd927287..184bc1f617 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml @@ -33,7 +33,7 @@ layout="topleft" follows="left|top" name="Tell everyone about your favorite places in Second Life."> - Tell everyone about your favorite places in Second Life. + Tell everyone about your favorite places in [GRID].