merge

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index 92bf429031..230ea200d8 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -351,6 +351,8 @@ protected:
 
 	virtual bool removeItemPair(item_pair_t* item_pair, bool rearrange);
 
+	bool addItemPairs(pairs_list_t panel_list, bool rearrange = true);
+
 	/**
 	 * Notify parent about changed size of internal controls with "size_changes" action
 	 * 
@@ -480,6 +482,7 @@ public:
 	 * Sets up new filter string and filters the list.
 	 */
 	void setFilterSubString(const std::string& filter_str);
+	std::string getFilterSubString() { return mFilterSubString; }
 	
 	/**
 	 * Filters the list, rearranges and notifies parent about shape changes.
@@ -503,6 +506,14 @@ protected:
 	 */
 	void updateNoItemsMessage(const std::string& filter_string);
 
+	/**
+	* Applies visibility acording to action and LLFlatListView settings.
+	*
+	* @param item - item we are changing
+	* @param item - action - parameters to determin visibility from
+	*/
+	void updateItemVisibility(LLPanel* item, const LLSD &action);
+
 private:
 	std::string mNoFilteredItemsMsg;
 	std::string mNoItemsMsg;