From 3fdcb8751a1f36dbce9d7a3fd1d785160d356d3a Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 13 Apr 2012 23:31:01 +0300
Subject: CHUI-91 FIXED Moved block list to a separate People floater tab.

---
 indra/newview/llpanelblockedlist.h | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index 74ad82e32d..97236ecdbf 100644
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -68,7 +68,6 @@ private:
 	void updateButtons();
 
 	// UI callbacks
-	void onBackBtnClick();
 	void onRemoveBtnClick();
 	void onPickBtnClick();
 	void onBlockByNameClick();
-- 
cgit v1.2.3


From 3807f97facc79960c579793376412a0baf6b9de3 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 22 Jun 2012 18:13:34 +0300
Subject: CHUI-136 FIXED (Implement new design for blocked list on the people
 floater)

- Created new LLBlockList class and replaced LLScrollContainer with it
- Also created new LLBlockedListItem class which represents blocked objects and blocked avatars
---
 indra/newview/llpanelblockedlist.h | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index 97236ecdbf..332349dfc0 100644
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -30,21 +30,15 @@
 #include "llpanel.h"
 #include "llmutelist.h"
 #include "llfloater.h"
-// #include <vector>
 
-// class LLButton;
-// class LLLineEditor;
-// class LLMessageSystem;
-// class LLUUID;
 class LLAvatarName;
-class LLScrollListCtrl;
+class LLBlockList;
 
-class LLPanelBlockedList
-	:	public LLPanel, public LLMuteListObserver
+class LLPanelBlockedList : public LLPanel
 {
 public:
 	LLPanelBlockedList();
-	~LLPanelBlockedList();
+	~LLPanelBlockedList(){};
 
 	virtual BOOL postBuild();
 	virtual void draw();
@@ -59,24 +53,31 @@ public:
 	 *			If it is LLUUID::null, nothing will be selected.
 	 */
 	static void showPanelAndSelect(const LLUUID& idToSelect);
-
-	// LLMuteListObserver callback interface implementation.
-	/* virtual */ void onChange() {	refreshBlockedList();}
 	
 private:
-	void refreshBlockedList();
+
+	typedef enum e_sort_oder{
+		E_SORT_BY_NAME = 0,
+		E_SORT_BY_TYPE = 1,
+	} ESortOrder;
+
 	void updateButtons();
 
 	// UI callbacks
-	void onRemoveBtnClick();
-	void onPickBtnClick();
-	void onBlockByNameClick();
+	void unblockItem();
+	void blockResidentByName();
+	void blockObjectByName();
+	void onFilterEdit(const std::string& search_string);
+
+	// List commnads
+	void onCustomAction(const LLSD& userdata);
+	BOOL isActionChecked(const LLSD& userdata);
 
 	void callbackBlockPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
 	static void callbackBlockByName(const std::string& text);
 
 private:
-	LLScrollListCtrl* mBlockedList;
+	LLBlockList* mBlockedList;
 };
 
 //-----------------------------------------------------------------------------
-- 
cgit v1.2.3


From be61b5be2f4089e12ca25ca1ece13bd0fdaea543 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 29 Aug 2012 19:18:25 -0700
Subject: CHUI-305: Problem: The 'resident picker' had multiple parents and due
 to the design of the resident picker it can have only one parent. Having
 multiple parents caused both parents to fight for depth ordering...which
 caused the flickering. Resolution: Now multiple 'resident pickers' can exist
 and they are coupled to the floater that spawned then. Meaning that when the
 parent floater closes, the 'resident picker' floater will also close. In
 addition, a shadow frustum eminates from the button that opened the 'resident
 picker'.

---
 indra/newview/llpanelblockedlist.h | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index 332349dfc0..07f0437656 100644
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -61,6 +61,7 @@ private:
 		E_SORT_BY_TYPE = 1,
 	} ESortOrder;
 
+    void removePicker();
 	void updateButtons();
 
 	// UI callbacks
@@ -78,6 +79,7 @@ private:
 
 private:
 	LLBlockList* mBlockedList;
+    LLHandle<LLFloater> mPicker;
 };
 
 //-----------------------------------------------------------------------------
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/llpanelblockedlist.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/llpanelblockedlist.h

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

diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
old mode 100644
new mode 100755
-- 
cgit v1.2.3