From 744e6c63b611ba6dbc713670aeff669fcf7d4f3d Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sun, 2 Feb 2014 16:29:06 -0500 Subject: [PATCH] Fix Issue 1237: Last online says 01/01/1970 for group members For real this time! --- indra/newview/llgroupmgr.cpp | 2 +- indra/newview/llpanelgroupgeneral.cpp | 5 +++-- indra/newview/llpanelgrouproles.cpp | 11 +++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index eaef2534b..cc42294fd 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -2049,7 +2049,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content) for ( ; member_iter_start != member_iter_end; ++member_iter_start) { // Reset defaults - online_status = "unknown"; + online_status = LLTrans::getString("group_member_status_unknown"); title = titles[0].asString(); contribution = 0; member_powers = default_powers; diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 2b1bbf804..5b58e6b76 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -828,6 +828,8 @@ void LLPanelGroupGeneral::updateMembers() } } +bool is_online_status_string(const std::string& status); + void LLPanelGroupGeneral::addMember(LLGroupMemberData* member) { // Owners show up in bold. @@ -845,9 +847,8 @@ void LLPanelGroupGeneral::addMember(LLGroupMemberData* member) item_params.columns.add().column("title").value(member->getTitle()).font/*.name*/("SANSSERIF_SMALL").font_style(style); static const LLCachedControl format(gSavedSettings, "ShortDateFormat"); - static const std::string online(LLTrans::getString("group_member_status_online")); item_params.columns.add().column("online").value(member->getOnlineStatus()) - .format(format).type(member->getOnlineStatus() == online ? "text" : "date") + .format(format).type(is_online_status_string(member->getOnlineStatus()) ? "text" : "date") .font/*.name*/("SANSSERIF_SMALL").font_style(style); /*LLScrollListItem* member_row =*/ mListVisibleMembers->addNameItemRow(item_params); diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index d713ff9e8..e38bda37b 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1523,6 +1523,14 @@ void LLPanelGroupMembersSubTab::update(LLGroupChange gc) } } +bool is_online_status_string(const std::string& status) +{ + static const std::string online(LLTrans::getString("group_member_status_online")); + if (status == online) return true; + static const std::string unknown(LLTrans::getString("group_member_status_unknown")); + return status == unknown; +} + void LLPanelGroupMembersSubTab::addMemberToList(LLGroupMemberData* data) { if (!data) return; @@ -1538,9 +1546,8 @@ void LLPanelGroupMembersSubTab::addMemberToList(LLGroupMemberData* data) .font/*.name*/("SANSSERIF_SMALL")/*.style("NORMAL")*/; static const LLCachedControl format(gSavedSettings, "ShortDateFormat"); - static const std::string online(LLTrans::getString("group_member_status_online")); item_params.columns.add().column("online").value(data->getOnlineStatus()) - .format(format).type(data->getOnlineStatus() == online ? "text" : "date") + .format(format).type(is_online_status_string(data->getOnlineStatus()) ? "text" : "date") .font/*.name*/("SANSSERIF_SMALL")/*.style("NORMAL")*/; mMembersList->addNameItemRow(item_params);