Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X

1 files changed, 49 insertions, 49 deletions

diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index 07f0437656..59bdd1b6a6 100644
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelblockedlist.h
  * @brief Container for blocked Residents & Objects list
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -37,48 +37,48 @@ class LLBlockList;
 class LLPanelBlockedList : public LLPanel
 {
 public:
-	LLPanelBlockedList();
-	~LLPanelBlockedList(){};
-
-	virtual BOOL postBuild();
-	virtual void draw();
-	virtual void onOpen(const LLSD& key);
-	
-	void selectBlocked(const LLUUID& id);
-
-	/**
-	 *	Shows current Panel in side tray and select passed blocked item.
-	 * 
-	 *	@param idToSelect - LLUUID of blocked Resident or Object to be selected. 
-	 *			If it is LLUUID::null, nothing will be selected.
-	 */
-	static void showPanelAndSelect(const LLUUID& idToSelect);
-	
+    LLPanelBlockedList();
+    ~LLPanelBlockedList(){};
+
+    virtual BOOL postBuild();
+    virtual void draw();
+    virtual void onOpen(const LLSD& key);
+
+    void selectBlocked(const LLUUID& id);
+
+    /**
+     *  Shows current Panel in side tray and select passed blocked item.
+     *
+     *  @param idToSelect - LLUUID of blocked Resident or Object to be selected.
+     *          If it is LLUUID::null, nothing will be selected.
+     */
+    static void showPanelAndSelect(const LLUUID& idToSelect);
+
 private:
 
-	typedef enum e_sort_oder{
-		E_SORT_BY_NAME = 0,
-		E_SORT_BY_TYPE = 1,
-	} ESortOrder;
+    typedef enum e_sort_oder{
+        E_SORT_BY_NAME = 0,
+        E_SORT_BY_TYPE = 1,
+    } ESortOrder;
 
     void removePicker();
-	void updateButtons();
+    void updateButtons();
 
-	// UI callbacks
-	void unblockItem();
-	void blockResidentByName();
-	void blockObjectByName();
-	void onFilterEdit(const std::string& search_string);
+    // UI callbacks
+    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);
+    // 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);
+    void callbackBlockPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
+    static void callbackBlockByName(const std::string& text);
 
 private:
-	LLBlockList* mBlockedList;
+    LLBlockList* mBlockedList;
     LLHandle<LLFloater> mPicker;
 };
 
@@ -88,25 +88,25 @@ private:
 // Class for handling mute object by name floater.
 class LLFloaterGetBlockedObjectName : public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 public:
-	typedef boost::function<void (const std::string&)> get_object_name_callback_t;
+    typedef boost::function<void (const std::string&)> get_object_name_callback_t;
 
-	virtual BOOL postBuild();
+    virtual BOOL postBuild();
 
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
+    virtual BOOL handleKeyHere(KEY key, MASK mask);
 
-	static LLFloaterGetBlockedObjectName* show(get_object_name_callback_t callback);
+    static LLFloaterGetBlockedObjectName* show(get_object_name_callback_t callback);
 
 private:
-	LLFloaterGetBlockedObjectName(const LLSD& key);
-	virtual ~LLFloaterGetBlockedObjectName();
+    LLFloaterGetBlockedObjectName(const LLSD& key);
+    virtual ~LLFloaterGetBlockedObjectName();
 
-	// UI Callbacks
-	void applyBlocking();
-	void cancelBlocking();
+    // UI Callbacks
+    void applyBlocking();
+    void cancelBlocking();
 
-	get_object_name_callback_t mGetObjectNameCallback;
+    get_object_name_callback_t mGetObjectNameCallback;
 };