diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 3523271ae7a6167e39ffebf4cc65903b37699c1a..934df2e21b5072ca4131c3aed3229611ab24af4f 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -338,10 +338,10 @@ void LLInventoryPanel::initFolderRoot()
     }
 
     // hide inbox
-    if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible"))
-    {
-        getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
-    }
+    //if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible"))
+    //{
+    //    getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() & ~(1ULL << LLFolderType::FT_INBOX));
+    //}
     // hide marketplace listing box, unless we are a marketplace panel
     if (!gSavedSettings.getBOOL("InventoryOutboxMakeVisible") && !mParams.use_marketplace_folders)
     {
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index aa225fa0ec32432fe08e874d653e52bdfa19574e..fb480270c3389f65440c3bfe5dc6073ac7403b53 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -98,7 +98,7 @@ class LLInboxAddedObserver : public LLInventoryCategoryAddedObserver
 			switch (added_category_type)
 			{
 				case LLFolderType::FT_INBOX:
-					mSidepanelInventory->enableInbox(true);
+					mSidepanelInventory->enableInbox(gSavedSettings.getBOOL("InventoryDisplayInbox"));
 					mSidepanelInventory->observeInboxModifications(added_category->getUUID());
 					break;
 				default:
@@ -248,7 +248,7 @@ void LLSidepanelInventory::updateInbox()
         gInventory.consolidateForType(inbox_id, LLFolderType::FT_INBOX);
         
 		// Enable the display of the inbox if it exists
-		enableInbox(true);
+		enableInbox(gSavedSettings.getBOOL("InventoryDisplayInbox"));
 
 		observeInboxModifications(inbox_id);
 	}
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index df0b68a2cd8e40e2777c9dcb619c9b77ee9fbc2c..56a12c3794d72a9a743e8bba9660425f41e6162a 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -213,6 +213,7 @@ BOOL LLStatusBar::postBuild()
 	gSavedPerAccountSettings.getControl("AlchemyAOEnable")->getCommitSignal()->connect(boost::bind(&LLStatusBar::onAOStateChanged, this));
 
 	mTextFPS = getChild<LLTextBox>("FPSText");
+	mTextFPS->setClickedCallback([](void*) { LLFloaterReg::showInstance("stats"); });
 
 	static LLCachedControl<bool> show_fps(gSavedSettings, "ShowStatusBarFPS", false);
 	mTextFPS->setVisible(show_fps);
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 91fadb095a74ead1f4bfccd3adde7c97c387a20b..77e4be1941644c7ceeed63a09cca65b2b7db0599 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -929,9 +929,6 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
 
                     vsize /= min_scale;
 
-#if LL_DARWIN
-                    vsize /= 1.f + LLViewerTexture::sDesiredDiscardBias*(1.f+face->getDrawable()->mDistanceWRTCamera*bias_distance_scale);
-#else
                     vsize /= LLViewerTexture::sDesiredDiscardBias;
                     vsize /= llmax(1.f, (LLViewerTexture::sDesiredDiscardBias-1.f) * (1.f + face->getDrawable()->mDistanceWRTCamera * bias_distance_scale));
 
@@ -942,7 +939,7 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
                     { // further reduce by discard bias when off screen or occluded
                         vsize /= LLViewerTexture::sDesiredDiscardBias;
                     }
-#endif
+
                     // if a GLTF material is present, ignore that face
                     // as far as this texture stats go, but update the GLTF material 
                     // stats
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index c7f9822e41b5e0260e683a3056592bfa62a4ec50..2b795fe8aa499d1701beef2bce75f9a227c1239d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -53,6 +53,25 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_check>
+    <menu_item_separator>
+        <menu_item_separator.on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+    </menu_item_separator>
+	<menu_item_check
+     label="Show Inbox panel"
+     layout="topleft"
+     name="show_inbox_panel">
+		<on_click
+         function="ToggleControl"
+         parameter="InventoryDisplayInbox" />
+		<on_check
+         function="CheckControl"
+         parameter="InventoryDisplayInbox" />
+		<on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+	</menu_item_check>
     <menu_item_separator>
         <menu_item_separator.on_visible
          function="Inventory.GearDefault.Visible"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 2dbb28ccfa6ab7470ca86444b5ad6567c3e1efae..95503b6af3e64fcb71ee9982e8dba6d71d45739a 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -135,6 +135,25 @@
               function="Button.SetFloaterToggle"
 	          parameter="about_land" />
 		     </button>
+			<button
+			follows="left|top"
+			height="23"
+			image_bottom_pad="1"
+			image_overlay="Command_PersonalLighting_Icon"
+			image_hover_unselected="PushButton_Over"
+			layout="topleft"
+			left_pad="5"
+			name="about_land"
+			tool_tip="Opens the About Land floater"
+			top_delta="0"
+			width="32" >
+			<button.init_callback
+			function="Button.SetFloaterToggle"
+			parameter="env_adjust_snapshot" />
+			<button.validate_callback
+			function="RLV.EnableIfNot"
+			parameter="setenv" />
+			</button>
 	        <location_input
                        follows="all"
 	         halign="right"