diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:58:49 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:58:49 +0000 |
commit | 5da967dc744f35d5270c7cb0b8b23b993ecda3e1 (patch) | |
tree | e345385b5bd2b84d94c59650c3637fb1b347394c /indra/newview/llfloaterland.cpp | |
parent | 65d90e0e8b6a3702f799910eee11a9421e269d3a (diff) |
merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James
ignore-dead-branch
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
-rw-r--r-- | indra/newview/llfloaterland.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 1de656144f..347fe45b82 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -1462,26 +1462,26 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo if (is_group_owned) { - item_params.cells.add().type("icon").value(self->mIconGroup->getName()); - item_params.cells.add().value(OWNER_GROUP).font(FONT); + item_params.cells.add().type("icon").value(self->mIconGroup->getName()).column("type"); + item_params.cells.add().value(OWNER_GROUP).font(FONT).column("online_status"); } else if (is_online) { - item_params.cells.add().type("icon").value(self->mIconAvatarOnline->getName()); - item_params.cells.add().value(OWNER_ONLINE).font(FONT); + item_params.cells.add().type("icon").value(self->mIconAvatarOnline->getName()).column("type"); + item_params.cells.add().value(OWNER_ONLINE).font(FONT).column("online_status"); } else // offline { - item_params.cells.add().type("icon").value(self->mIconAvatarOffline->getName()); - item_params.cells.add().value(OWNER_OFFLINE).font(FONT); + item_params.cells.add().type("icon").value(self->mIconAvatarOffline->getName()).column("type"); + item_params.cells.add().value(OWNER_OFFLINE).font(FONT).column("online_status"); } // Placeholder for name. - item_params.cells.add().font(FONT); + item_params.cells.add().font(FONT).column("name"); object_count_str = llformat("%d", object_count); - item_params.cells.add().value(object_count_str).font(FONT); - item_params.cells.add().value(formatted_time((time_t)most_recent_time)).font(FONT); + item_params.cells.add().value(object_count_str).font(FONT).column("count"); + item_params.cells.add().value(formatted_time((time_t)most_recent_time)).font(FONT).column("mostrecent"); self->mOwnerList->addRow(item_params); |