From 829ad710e11f5f3c08237b69aefdb952eeb01002 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 1 Aug 2015 03:37:33 +0200
Subject: [PATCH] FIRE-16547: Merchant Outbox options are not hidden in FS-VMM
 for migrated users

---
 indra/newview/llviewermenu.cpp                     | 9 +++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c29f4c0654..81d9f4ece1 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -487,6 +487,15 @@ void set_merchant_outbox_menu(U32 status, const LLSD& content)
 
 void check_merchant_status()
 {
+	// <FS:Ansariel> FIRE-16547: Merchant Outbox options are not hidden in FS-VMM for migrated users
+	if (!LLGridManager::getInstance()->isInSecondLife())
+	{
+		gMenuHolder->getChild<LLView>("MerchantOutbox")->setVisible(FALSE);
+		gMenuHolder->getChild<LLView>("MarketplaceListings")->setVisible(FALSE);
+		return;
+	}
+	// </FS:Ansariel>
+
     if (!gSavedSettings.getBOOL("InventoryOutboxDisplayBoth"))
     {
         // Reset the SLM status: we actually want to check again, that's the point of calling check_merchant_status()
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2fd3513493..4bad99e0a5 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -28,9 +28,6 @@
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="outbox" />
-            <menu_item_call.on_visible
-             function="GridCheck"
-             parameter="secondlife"/>
         </menu_item_call>
         <menu_item_call
             label="Marketplace listings..."