From 7c3ba8bd9a67ab34febcfb14a92bd3af6314b1b8 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 7 Mar 2019 13:37:39 -0500
Subject: [PATCH] Sync? I dunno, not important.

---
 indra/newview/llfolderview.cpp     | 7 +------
 indra/newview/llfolderview.h       | 3 +++
 indra/newview/llinventorypanel.cpp | 7 +++++++
 indra/newview/llinventorypanel.h   | 2 ++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index fd666f496..350ddb439 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -957,12 +957,7 @@ void LLFolderView::draw()
 		}
 		else
 		{
-		//	if(getFilter())
-		//	{
-		//		LLStringUtil::format_map_t args;
-		//		args["[SEARCH_TERM]"] = LLURI::escape(getFilter().getFilterSubStringOrig());
-				mStatusText = LLTrans::getString("InventoryNoMatchingItems"); //, args);
-		//	}
+			mStatusText = LLTrans::getString("InventoryNoMatchingItems"); //, args);
 		}
 		mStatusTextBox->setWrappedText(mStatusText);
 		mStatusTextBox->setVisible( TRUE );
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index a9e5b9f4e..7433e87bb 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -104,6 +104,9 @@ public:
 	void setSelectCallback(const signal_t::slot_type& cb) { mSelectSignal.connect(cb); }
 	void setReshapeCallback(const signal_t::slot_type& cb) { mReshapeSignal.connect(cb); }
 	void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; }
+	void setShowEmptyMessage(bool show) { mShowEmptyMessage = show; }
+	/*void setShowItemLinkOverlays(bool show) { mShowItemLinkOverlays = show; }
+	void setAllowDropOnRoot(bool show) { mAllowDropOnRoot = show; }*/
 
 	LLInventoryFilter& getFilter() { return mFilter; }
 	const std::string getFilterSubString(BOOL trim = FALSE);
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 45c30a55a..48448c951 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -142,6 +142,8 @@ LLInventoryPanel::LLInventoryPanel(const std::string& name,
 	mSortOrderSetting(sort_order_setting),
 	mStartFolder(start_folder),
 	mShowRootFolder(false),
+	mShowEmptyMessage(true),
+	//mShowItemLinkOverlays(false),
 	mAllowDropOnRoot(true),
 	mAllowWear(true),
 	mUseMarketplaceFolders(false),
@@ -351,6 +353,8 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 
 	// Singu TODO: Turn these into mParams like upstream.
 	node->getAttribute_bool("show_root_folder", panel->mShowRootFolder);
+	node->getAttribute_bool("show_empty_message", panel->mShowEmptyMessage);
+	//node->getAttribute_bool("show_item_link_overlays", panel->mShowItemLinkOverlays);
 	node->getAttribute_bool("allow_drop_on_root", panel->mAllowDropOnRoot);
 	node->getAttribute_bool("allow_wear", panel->mAllowWear);
 	node->getAttribute_bool("use_marketplace_folders", panel->mUseMarketplaceFolders);
@@ -803,6 +807,9 @@ LLFolderView * LLInventoryPanel::createFolderView(LLInvFVBridge * bridge, bool u
 	bridge,
 	mGroupedItemBridge);
 	ret->setAllowMultiSelect(mAllowMultiSelect);
+	ret->setShowEmptyMessage(mShowEmptyMessage);
+	/*ret->setShowItemLinkOverlays(mShowItemLinkOverlays);
+	ret->setAllowDropOnRoot(mAllowDropOnRoot);*/
 	return ret;
 }
 
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index a318a6a27..a29b0ea99 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -238,6 +238,8 @@ public:
 private:
 	LLSD					mStartFolder;
 	bool					mShowRootFolder;
+	bool					mShowEmptyMessage;
+	//bool					mShowItemLinkOverlays;
 	bool					mAllowDropOnRoot;
 	bool					mAllowWear;
 	bool					mUseMarketplaceFolders;