Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 26 insertions, 26 deletions

diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h
index aab1c130c1..b58cd2c3e2 100644
--- a/indra/newview/llpanelplacestab.h
+++ b/indra/newview/llpanelplacestab.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelplacestab.h
  * @brief Tabs interface for Side Bar "Places" panel
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -35,16 +35,16 @@ class LLToggleableMenu;
 class LLPanelPlacesTab : public LLPanel
 {
 public:
-	LLPanelPlacesTab() : LLPanel() {}
-	virtual ~LLPanelPlacesTab() {}
+    LLPanelPlacesTab() : LLPanel() {}
+    virtual ~LLPanelPlacesTab() {}
 
-	virtual void onSearchEdit(const std::string& string) = 0;
-	virtual void updateVerbs() = 0;		// Updates buttons at the bottom of Places panel
-	virtual void onShowOnMap() = 0;
-	virtual void onShowProfile() = 0;
-	virtual void onTeleport() = 0;
-	virtual void onRemoveSelected() = 0;
-	virtual bool isSingleItemSelected() = 0;
+    virtual void onSearchEdit(const std::string& string) = 0;
+    virtual void updateVerbs() = 0;     // Updates buttons at the bottom of Places panel
+    virtual void onShowOnMap() = 0;
+    virtual void onShowProfile() = 0;
+    virtual void onTeleport() = 0;
+    virtual void onRemoveSelected() = 0;
+    virtual bool isSingleItemSelected() = 0;
 
     // returns menu for current selection
     virtual LLToggleableMenu* getSelectionMenu() = 0;
@@ -56,23 +56,23 @@ public:
     */
     virtual bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) = 0;
 
-	bool isTabVisible(); // Check if parent TabContainer is visible.
+    bool isTabVisible(); // Check if parent TabContainer is visible.
 
-	void onRegionResponse(const LLVector3d& landmark_global_pos,
-										U64 region_handle,
-										const std::string& url,
-										const LLUUID& snapshot_id,
-										bool teleport);
+    void onRegionResponse(const LLVector3d& landmark_global_pos,
+                                        U64 region_handle,
+                                        const std::string& url,
+                                        const LLUUID& snapshot_id,
+                                        bool teleport);
 
-	const std::string& getFilterSubString() { return sFilterSubString; }
-	void setFilterSubString(const std::string& string) { sFilterSubString = string; }
+    const std::string& getFilterSubString() { return sFilterSubString; }
+    void setFilterSubString(const std::string& string) { sFilterSubString = string; }
 
-	void setRemoveBtn(LLButton* trash_btn) { sRemoveBtn = trash_btn; }
+    void setRemoveBtn(LLButton* trash_btn) { sRemoveBtn = trash_btn; }
 
 protected:
-	// Search string for filtering landmarks and teleport history locations
-	static std::string		sFilterSubString;
-	static LLButton*		sRemoveBtn;
+    // Search string for filtering landmarks and teleport history locations
+    static std::string      sFilterSubString;
+    static LLButton*        sRemoveBtn;
 };
 
 #endif //LL_LLPANELPLACESTAB_H