EXT-7335 WIP Parse Vivox voice font expiry timestamps into ISO 8601 standard dates.

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 49dd6fa4d9..38c419ab24 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -161,7 +161,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 				effect_name += " " + getString("active_voice_effect");
 			}
 
-			std::string expiry_date = effect_properties["expiry_date"].asString();
+			LLDate expiry_date = effect_properties["expiry_date"].asDate();
 			bool is_template_only = effect_properties["template_only"].asBoolean();
 			bool is_new = effect_properties["is_new"].asBoolean();
 
@@ -184,7 +184,13 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			element["columns"][1]["font"]["style"] = font_style;
 
 			element["columns"][2]["column"] = "expires";
-			element["columns"][2]["value"] = !is_template_only ? expiry_date : "";
+			if (!is_template_only)
+			{
+				element["columns"][2]["value"] = expiry_date;
+			}
+			else {
+				element["columns"][2]["value"] = "";
+			}
 			element["columns"][2]["font"]["name"] = "SANSSERIF";
 			element["columns"][2]["font"]["style"] = font_style;