diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-09-14 19:46:16 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-09-14 19:46:16 -0700 |
commit | 254eb365432824bd5121bf9009f8bbb2b6c3ec67 (patch) | |
tree | 8031ed2105e0f4e59e527059b013034ab24f7d4c | |
parent | 2809778bf1a487e2a2786301d7fd651c82290432 (diff) | |
parent | 6a2eda0f34519f0c3d10683f144a21da6edbf220 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
-rw-r--r-- | indra/newview/llpanelmarketplaceinboxinventory.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp index f525dbf434..faba6dc0cf 100644 --- a/indra/newview/llpanelmarketplaceinboxinventory.cpp +++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp @@ -192,10 +192,13 @@ void LLInboxFolderViewFolder::draw() void LLInboxFolderViewFolder::computeFreshness() { - const U32 last_expansion = gSavedPerAccountSettings.getU32("LastInventoryInboxActivity"); + const U32 last_expansion_utc = gSavedPerAccountSettings.getU32("LastInventoryInboxActivity"); - if (last_expansion > 0) + if (last_expansion_utc > 0) { + const U32 time_offset_for_pdt = 7 * 60 * 60; + const U32 last_expansion = last_expansion_utc - time_offset_for_pdt; + mFresh = (mCreationDate > last_expansion); #if DEBUGGING_FRESHNESS |