Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Issue 1237: Last online says 01/01/1970 for group members

Browse Source 
For real this time!
This commit is contained in:
Inusaito Sayori
2014-02-02 16:29:06 -05:00
parent 31aa30e3d0
commit 744e6c63b6
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llgroupmgr.cpp
View File

@@ -2049,7 +2049,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
for ( ; member_iter_start != member_iter_end; ++member_iter_start) for ( ; member_iter_start != member_iter_end; ++member_iter_start)
{ {
// Reset defaults // Reset defaults
online_status = "unknown"; online_status = LLTrans::getString("group_member_status_unknown");
title = titles[0].asString(); title = titles[0].asString();
contribution = 0; contribution = 0;
member_powers = default_powers; member_powers = default_powers;

5
indra/newview/llpanelgroupgeneral.cpp
View File

@@ -828,6 +828,8 @@ void LLPanelGroupGeneral::updateMembers()
} }
} }
bool is_online_status_string(const std::string& status);
void LLPanelGroupGeneral::addMember(LLGroupMemberData* member) void LLPanelGroupGeneral::addMember(LLGroupMemberData* member)
{ {
// Owners show up in bold. // 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); item_params.columns.add().column("title").value(member->getTitle()).font/*.name*/("SANSSERIF_SMALL").font_style(style);
static const LLCachedControl<std::string> format(gSavedSettings, "ShortDateFormat"); static const LLCachedControl<std::string> format(gSavedSettings, "ShortDateFormat");
static const std::string online(LLTrans::getString("group_member_status_online"));
item_params.columns.add().column("online").value(member->getOnlineStatus()) 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); .font/*.name*/("SANSSERIF_SMALL").font_style(style);
/*LLScrollListItem* member_row =*/ mListVisibleMembers->addNameItemRow(item_params); /*LLScrollListItem* member_row =*/ mListVisibleMembers->addNameItemRow(item_params);

11
indra/newview/llpanelgrouproles.cpp
View File

@@ -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) void LLPanelGroupMembersSubTab::addMemberToList(LLGroupMemberData* data)
{ {
if (!data) return; if (!data) return;
@@ -1538,9 +1546,8 @@ void LLPanelGroupMembersSubTab::addMemberToList(LLGroupMemberData* data)
.font/*.name*/("SANSSERIF_SMALL")/*.style("NORMAL")*/; .font/*.name*/("SANSSERIF_SMALL")/*.style("NORMAL")*/;
static const LLCachedControl<std::string> format(gSavedSettings, "ShortDateFormat"); static const LLCachedControl<std::string> format(gSavedSettings, "ShortDateFormat");
static const std::string online(LLTrans::getString("group_member_status_online"));
item_params.columns.add().column("online").value(data->getOnlineStatus()) 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")*/; .font/*.name*/("SANSSERIF_SMALL")/*.style("NORMAL")*/;
mMembersList->addNameItemRow(item_params); mMembersList->addNameItemRow(item_params);