From 6c3c9c249304d03b86bf703d27b510f6bcc16189 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 27 May 2010 16:45:29 +0100 Subject: EXT-7138 WIP Indicate unsubscribed Voice Morphs with (Unsubscribed) in the expiry date column. --- indra/newview/llfloatervoiceeffect.cpp | 2 +- indra/newview/skins/default/xui/en/floater_voice_effect.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp index 2243f0bf9a..ca1f142760 100644 --- a/indra/newview/llfloatervoiceeffect.cpp +++ b/indra/newview/llfloatervoiceeffect.cpp @@ -190,7 +190,7 @@ void LLFloaterVoiceEffect::refreshEffectList() element["columns"][DATE_COLUMN]["type"] = "date"; } else { - element["columns"][DATE_COLUMN]["value"] = ""; + element["columns"][DATE_COLUMN]["value"] = getString("unsubscribed_voice_effect"); } // element["columns"][DATE_COLUMN]["font"]["style"] = "NORMAL"; diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml index 207397d3dc..edc25348e4 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml @@ -19,6 +19,9 @@ (Active) + + (Unsubscribed) + (New!) -- cgit v1.2.3