merge

4 files changed, 18 insertions, 5 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index b4dac28595..a36aa3dedf 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -70,6 +70,9 @@
 #include "llvoavatarself.h"
 #include "llwearablelist.h"
 
+// Marketplace outbox current disabled
+#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU	0	// keep in sync with ENABLE_INVENTORY_DISPLAY_OUTBOX, ENABLE_MERCHANT_OUTBOX_PANEL
+
 typedef std::pair<LLUUID, LLUUID> two_uuids_t;
 typedef std::list<two_uuids_t> two_uuids_list_t;
 
@@ -1060,6 +1063,7 @@ BOOL LLInvFVBridge::canShare() const
 
 BOOL LLInvFVBridge::canListOnMarketplace() const
 {
+#if ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU
 	LLInventoryModel * model = getInventoryModel();
 	const LLViewerInventoryCategory * cat = model->getCategory(mUUID);
 	if (cat && LLFolderType::lookupIsProtectedType(cat->getPreferredType()))
@@ -1089,10 +1093,14 @@ BOOL LLInvFVBridge::canListOnMarketplace() const
 	}
 
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }
 
 BOOL LLInvFVBridge::canListOnMarketplaceNow() const
 {
+#if ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU
 	if (get_is_item_worn(mUUID))
 	{
 		return FALSE;
@@ -1106,6 +1114,9 @@ BOOL LLInvFVBridge::canListOnMarketplaceNow() const
 	}
 
 	return TRUE;
+#else
+	return FALSE;
+#endif
 }
 
 
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
 	}
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 858639215c..9814e5b81a 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -68,7 +68,7 @@ static LLRegisterPanelClassWrapper<LLSidepanelInventory> t_inventory("sidepanel_
 #define AUTO_EXPAND_INBOX	0
 
 // Temporarily disabling the outbox until we straighten out the API
-#define ENABLE_MERCHANT_OUTBOX_PANEL		0	// keep in sync with ENABLE_INVENTORY_DISPLAY_OUTBOX
+#define ENABLE_MERCHANT_OUTBOX_PANEL		0	// keep in sync with ENABLE_INVENTORY_DISPLAY_OUTBOX, ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU
 
 static const char * const INBOX_BUTTON_NAME = "inbox_btn";
 static const char * const OUTBOX_BUTTON_NAME = "outbox_btn";
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 56ef31fb0b..13dbc5e386 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1368,7 +1368,7 @@ void LLViewerMedia::removeCookie(const std::string &name, const std::string &dom
 
 // This is defined in two files but I don't want to create a dependence between this and llsidepanelinventory
 // just to be able to temporarily disable the outbox.
-#define ENABLE_INVENTORY_DISPLAY_OUTBOX		0	// keep in sync with ENABLE_MERCHANT_OUTBOX_PANEL
+#define ENABLE_INVENTORY_DISPLAY_OUTBOX		0	// keep in sync with ENABLE_MERCHANT_OUTBOX_PANEL, ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU
 
 class LLInventoryUserStatusResponder : public LLHTTPClient::Responder
 {