No ticket, added comments to split-by-date code.
--HG-- branch : product-enginemaster
parent
dae2e04f19
commit
a9653b37ec
|
|
@ -406,6 +406,7 @@ void LLTeleportHistoryPanel::getNextTab(const LLDate& item_date, S32& tab_idx, L
|
|||
|
||||
if (tab_idx <= tabs_cnt - 4)
|
||||
{
|
||||
// All tabs, except last three, are tabs for one day, so just push tab_date back by one day
|
||||
tab_date.secondsSinceEpoch(tab_date.secondsSinceEpoch() - seconds_in_day);
|
||||
}
|
||||
else if (tab_idx == tabs_cnt - 3) // 6 day and older, low boundary is 1 month
|
||||
|
|
@ -442,6 +443,7 @@ void LLTeleportHistoryPanel::getNextTab(const LLDate& item_date, S32& tab_idx, L
|
|||
}
|
||||
}
|
||||
|
||||
// Called to add items, no more, than ADD_LIMIT at time
|
||||
void LLTeleportHistoryPanel::refresh()
|
||||
{
|
||||
if (!mHistoryAccordion)
|
||||
|
|
@ -452,12 +454,16 @@ void LLTeleportHistoryPanel::refresh()
|
|||
|
||||
const LLTeleportHistoryStorage::slurl_list_t& items = mTeleportHistory->getItems();
|
||||
|
||||
// Setting tab_boundary_date to "now", so date from any item would be earlier, than boundary.
|
||||
// That leads to call to getNextTab to get right tab_idx in first pass
|
||||
LLDate tab_boundary_date = LLDate::now();
|
||||
|
||||
LLFlatListView* curr_flat_view = NULL;
|
||||
|
||||
U32 added_items = 0;
|
||||
while (mCurrentItem >= 0)
|
||||
{
|
||||
// Filtering
|
||||
std::string landmark_title = items[mCurrentItem].mTitle;
|
||||
LLStringUtil::toUpper(landmark_title);
|
||||
|
||||
|
|
@ -470,10 +476,14 @@ void LLTeleportHistoryPanel::refresh()
|
|||
continue;
|
||||
}
|
||||
|
||||
// Checking whether date of item is earlier, than tab_boundary_date.
|
||||
// In that case, item should be added to another tab
|
||||
const LLDate &date = items[mCurrentItem].mDate;
|
||||
|
||||
if (date < tab_boundary_date)
|
||||
{
|
||||
// Getting apropriate tab_idx for this and subsequent items,
|
||||
// tab_boundary_date would be earliest possible date for this tab
|
||||
S32 tab_idx = 0;
|
||||
getNextTab(date, tab_idx, tab_boundary_date);
|
||||
|
||||
|
|
@ -580,6 +590,9 @@ void LLTeleportHistoryPanel::replaceItem(S32 removed_index)
|
|||
void LLTeleportHistoryPanel::showTeleportHistory()
|
||||
{
|
||||
mDirty = true;
|
||||
|
||||
// Starting to add items from last one, in reverse order,
|
||||
// since TeleportHistory keeps most recent item at the end
|
||||
mCurrentItem = mTeleportHistory->getItems().size() - 1;
|
||||
|
||||
for (S32 n = mItemContainers.size() - 1; n >= 0; --n)
|
||||
|
|
|
|||
Loading…
Reference in New Issue