merge

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index 47f34434db..ac517f3f3e 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -196,14 +196,16 @@ void LLInboxFolderViewFolder::computeFreshness()
 
 	if (!last_expansion.empty())
 	{
-		LLDate saved_freshness_date = LLDate(last_expansion);
+		// Inventory DB timezone is hardcoded to PDT or GMT-7, which is 7 hours behind GMT
+		const time_t SEVEN_HOURS_IN_SECONDS = 7 * 60 * 60;
+		const time_t saved_freshness_inventory_db_timezone = LLDate(last_expansion).secondsSinceEpoch() - SEVEN_HOURS_IN_SECONDS;
 
-		mFresh = (mCreationDate > saved_freshness_date.secondsSinceEpoch());
+		mFresh = (mCreationDate > saved_freshness_inventory_db_timezone);
 
 #if DEBUGGING_FRESHNESS
 		if (mFresh)
 		{
-			llinfos << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << saved_freshness_date.secondsSinceEpoch() << llendl;
+			llinfos << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << saved_freshness_inventory_db_timezone << llendl;
 		}
 #endif
 	}