From b0db21a8ae93283acc99491b9b14c2e8f1a35395 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 5 Jan 2012 15:40:27 -0800
Subject: EXP-1754 FIX -- Search text shown in Outbox floater after marketplace
 synch if all items removed.

* Added a setting to determine whether or not to display the standard empty inventory message.
  The message is on by default but turned off for the merchant outbox inventory panel.
---
 indra/newview/llfolderview.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llfolderview.h')

diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 8af01e9102..2da70f019c 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -75,6 +75,7 @@ public:
 		Optional<std::string>   title;
 		Optional<bool>			use_label_suffix,
 								allow_multiselect,
+								show_empty_message,
 								show_load_status,
 								use_ellipses;
 
@@ -282,6 +283,7 @@ protected:
 	selected_items_t				mSelectedItems;
 	BOOL							mKeyboardSelection;
 	BOOL							mAllowMultiSelect;
+	BOOL							mShowEmptyMessage;
 	BOOL							mShowFolderHierarchy;
 	LLUUID							mSourceID;
 
-- 
cgit v1.2.3


From 637409950512ac84a7c94c446ac60875757a92ef Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 13 Jan 2012 16:41:54 -0800
Subject: EXP-1770 WIP Drag and drop visual selection can be off across
 hierarchies made shift-selection work consistently across folder boundaries

---
 indra/newview/llfolderview.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfolderview.h')

diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 8af01e9102..d4305a2fe2 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -106,6 +106,8 @@ public:
 	U32 getSortOrder() const;
 	BOOL isFilterModified();
 
+	bool getAllowMultiSelect() { return mAllowMultiSelect; }
+
 	// Close all folders in the view
 	void closeAllFolders();
 	void openTopLevelFolders();
@@ -141,8 +143,6 @@ public:
 	// children, and keeps track of selected objects.
 	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
 
-	virtual void extendSelection(LLFolderViewItem* selection, LLFolderViewItem* last_selected, LLDynamicArray<LLFolderViewItem*>& items);
-
 	virtual std::set<LLUUID> getSelectionList() const;
 
 	// make sure if ancestor is selected, descendents are not
@@ -156,7 +156,6 @@ public:
 	void setDraggingOverItem(LLFolderViewItem* item) { mDraggingOverItem = item; }
 	LLFolderViewItem* getDraggingOverItem() { return mDraggingOverItem; }
 
-
 	// deletion functionality
  	void removeSelectedItems();
 
-- 
cgit v1.2.3