diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/newview/llpanelgroupnotices.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index acf6bc0dd0..201cf5a023 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -73,8 +73,10 @@ class LLGroupDropTarget : public LLView public: struct Params : public LLInitParam::Block<Params, LLView::Params> { - Mandatory<LLPanelGroupNotices*> panel; - Mandatory<LLUUID> group_id; + // *NOTE: These parameters logically Mandatory, but are not + // specified in XML files, hence Optional + Optional<LLPanelGroupNotices*> panel; + Optional<LLUUID> group_id; Params() : panel("panel"), group_id("group_id") @@ -103,7 +105,7 @@ protected: LLUUID mGroupID; }; -static LLRegisterWidget<LLGroupDropTarget> r("group_drop_target"); +static LLDefaultWidgetRegistry::Register<LLGroupDropTarget> r("group_drop_target"); LLGroupDropTarget::LLGroupDropTarget(const LLGroupDropTarget::Params& p) : LLView(p), @@ -196,8 +198,9 @@ std::string build_notice_date(const U32& the_time) time(&t); } - - std::string dateStr = LLTrans::getString("GroupNotifyDateStr"); + std::string dateStr = "["+LLTrans::getString("LTimeMthNum")+"]/[" + +LLTrans::getString("LTimeDay")+"]/[" + +LLTrans::getString("LTimeYear")+"]"; LLSD substitution; substitution["datetime"] = (S32) t; LLStringUtil::format (dateStr, substitution); |