diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp index 8ebf6bc04..dba472842 100644 --- a/indra/llui/llscrolllistcell.cpp +++ b/indra/llui/llscrolllistcell.cpp @@ -438,13 +438,14 @@ void LLScrollListCheck::setEnabled(BOOL enable) LLScrollListDate::LLScrollListDate( const LLScrollListCell::Params& p) : LLScrollListText(p), + mFormat(p.format), mDate(p.value().asDate()) {} void LLScrollListDate::setValue(const LLSD& value) { mDate = value.asDate(); - LLScrollListText::setValue(mDate.asRFC1123()); + LLScrollListText::setValue(mFormat.empty() ? mDate.asRFC1123() : mDate.toHTTPDateString(mFormat)); } const LLSD LLScrollListDate::getValue() const diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h index 3e4a9cd06..84c196a05 100644 --- a/indra/llui/llscrolllistcell.h +++ b/indra/llui/llscrolllistcell.h @@ -61,6 +61,7 @@ public: Optional userdata; Optional value; Optional tool_tip; + Optional format; Optional font; Optional font_color; @@ -77,6 +78,7 @@ public: visible("visible", true), value("value"), tool_tip("tool_tip", ""), + format("format", ""), font("font"/*, LLFontGL::getFontSansSerifSmall()*/), font_color("font_color", LLColor4::black), font_style("font-style"), @@ -230,6 +232,7 @@ public: virtual const LLSD getValue() const; private: + std::string mFormat; LLDate mDate; };