#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed

1 files changed, 116 insertions, 116 deletions

diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 3702226d23..25306d0601 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaterworldmap.h
  * @brief LLFloaterWorldMap class definition
  *
  * $LicenseInfo:firstyear=2003&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$
  */
@@ -49,151 +49,151 @@ class LLWorldMapView;
 class LLFloaterWorldMap : public LLFloater
 {
 public:
-	LLFloaterWorldMap(const LLSD& key);
-	virtual ~LLFloaterWorldMap();
+    LLFloaterWorldMap(const LLSD& key);
+    virtual ~LLFloaterWorldMap();
+
+    // Prefer this to gFloaterWorldMap
+    static LLFloaterWorldMap* getInstance();
 
-	// Prefer this to gFloaterWorldMap
-	static LLFloaterWorldMap* getInstance();
+    static void *createWorldMapView(void* data);
+    BOOL postBuild();
 
-	static void *createWorldMapView(void* data);
-	BOOL postBuild();
+    /*virtual*/ void onOpen(const LLSD& key);
+    /*virtual*/ void onClose(bool app_quitting);
 
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ void onClose(bool app_quitting);
+    static void reloadIcons(void*);
 
-	static void reloadIcons(void*);
+    /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
+    /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+    /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+    /*virtual*/ void draw();
 
-	/*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
-	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
-	/*virtual*/ void draw();
+    /*virtual*/ void onFocusLost();
 
-	/*virtual*/ void onFocusLost();
+    // methods for dealing with inventory. The observe() method is
+    // called during program startup. inventoryUpdated() will be
+    // called by a helper object when an interesting change has
+    // occurred.
+    void observeInventory(LLInventoryModel* inventory);
+    void inventoryChanged();
 
-	// methods for dealing with inventory. The observe() method is
-	// called during program startup. inventoryUpdated() will be
-	// called by a helper object when an interesting change has
-	// occurred.
-	void observeInventory(LLInventoryModel* inventory);
-	void inventoryChanged();
+    // Calls for dealing with changes in friendship
+    void observeFriends();
+    void friendsChanged();
 
-	// Calls for dealing with changes in friendship
-	void observeFriends();
-	void friendsChanged();
+    // tracking methods
+    void            trackAvatar( const LLUUID& avatar_id, const std::string& name );
+    void            trackLandmark( const LLUUID& landmark_item_id );
+    void            trackLocation(const LLVector3d& pos);
+    void            trackEvent(const LLItemInfo &event_info);
+    void            trackGenericItem(const LLItemInfo &item);
+    void            trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord);
 
-	// tracking methods
-	void			trackAvatar( const LLUUID& avatar_id, const std::string& name );
-	void			trackLandmark( const LLUUID& landmark_item_id ); 
-	void			trackLocation(const LLVector3d& pos);
-	void			trackEvent(const LLItemInfo &event_info);
-	void			trackGenericItem(const LLItemInfo &item);
-	void			trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord);
+    static const LLUUID& getHomeID() { return sHomeID; }
 
-	static const LLUUID& getHomeID() { return sHomeID; }
+    // A z_attenuation of 0.0f collapses the distance into the X-Y plane
+    F32             getDistanceToDestination(const LLVector3d& pos_global, F32 z_attenuation = 0.5f) const;
 
-	// A z_attenuation of 0.0f collapses the distance into the X-Y plane
-	F32				getDistanceToDestination(const LLVector3d& pos_global, F32 z_attenuation = 0.5f) const;
+    void            clearLocationSelection(BOOL clear_ui = FALSE, BOOL dest_reached = FALSE);
+    void            clearAvatarSelection(BOOL clear_ui = FALSE);
+    void            clearLandmarkSelection(BOOL clear_ui = FALSE);
 
-	void			clearLocationSelection(BOOL clear_ui = FALSE, BOOL dest_reached = FALSE);
-	void			clearAvatarSelection(BOOL clear_ui = FALSE);
-	void			clearLandmarkSelection(BOOL clear_ui = FALSE);
+    // Adjust the maximally zoomed out limit of the zoom slider so you can
+    // see the whole world, plus a little.
+    void            adjustZoomSliderBounds();
 
-	// Adjust the maximally zoomed out limit of the zoom slider so you can
-	// see the whole world, plus a little.
-	void			adjustZoomSliderBounds();
+    // Catch changes in the sim list
+    void            updateSims(bool found_null_sim);
 
-	// Catch changes in the sim list
-	void			updateSims(bool found_null_sim);
+    // teleport to the tracked item, if there is one
+    void            teleport();
+    void            onChangeMaturity();
 
-	// teleport to the tracked item, if there is one
-	void			teleport();
-	void			onChangeMaturity();
+    void            onClearBtn();
 
-	void			onClearBtn();
-	
-	//Slapp instigated avatar tracking
-	void			avatarTrackFromSlapp( const LLUUID& id ); 
+    //Slapp instigated avatar tracking
+    void            avatarTrackFromSlapp( const LLUUID& id );
 
-protected:	
-	void			onGoHome();
+protected:
+    void            onGoHome();
 
-	void			onLandmarkComboPrearrange();
-	void			onLandmarkComboCommit();
+    void            onLandmarkComboPrearrange();
+    void            onLandmarkComboCommit();
 
-	void			onAvatarComboPrearrange();
-	void		    onAvatarComboCommit();
+    void            onAvatarComboPrearrange();
+    void            onAvatarComboCommit();
 
-	void			onComboTextEntry( );
-	void			onSearchTextEntry( );
+    void            onComboTextEntry( );
+    void            onSearchTextEntry( );
 
-	void			onClickTeleportBtn();
-	void			onShowTargetBtn();
-	void			onShowAgentBtn();
-	void			onCopySLURL();
+    void            onClickTeleportBtn();
+    void            onShowTargetBtn();
+    void            onShowAgentBtn();
+    void            onCopySLURL();
 
     void            onExpandCollapseBtn();
 
-	void			centerOnTarget(BOOL animate);
-	void			updateLocation();
+    void            centerOnTarget(BOOL animate);
+    void            updateLocation();
 
-	// fly to the tracked item, if there is one
-	void			fly();
+    // fly to the tracked item, if there is one
+    void            fly();
 
-	void			buildLandmarkIDLists();
-	void			flyToLandmark();
-	void			teleportToLandmark();
-	void			setLandmarkVisited();
+    void            buildLandmarkIDLists();
+    void            flyToLandmark();
+    void            teleportToLandmark();
+    void            setLandmarkVisited();
 
-	void			buildAvatarIDList();
-	void			flyToAvatar();
-	void			teleportToAvatar();
+    void            buildAvatarIDList();
+    void            flyToAvatar();
+    void            teleportToAvatar();
 
-	void			updateSearchEnabled();
-	void			onLocationFocusChanged( LLFocusableElement* ctrl );
-	void		    onLocationCommit();
-	void			onCoordinatesCommit();
-	void		    onCommitSearchResult();
+    void            updateSearchEnabled();
+    void            onLocationFocusChanged( LLFocusableElement* ctrl );
+    void            onLocationCommit();
+    void            onCoordinatesCommit();
+    void            onCommitSearchResult();
 
     void            onTeleportFinished();
 
 private:
     LLWorldMapView* mMapView; // Panel displaying the map
 
-	// update display of teleport destination coordinates - pos is in global coordinates
-	void updateTeleportCoordsDisplay( const LLVector3d& pos );
+    // update display of teleport destination coordinates - pos is in global coordinates
+    void updateTeleportCoordsDisplay( const LLVector3d& pos );
 
-	// enable/disable teleport destination coordinates 
-	void enableTeleportCoordsDisplay( bool enabled );
+    // enable/disable teleport destination coordinates
+    void enableTeleportCoordsDisplay( bool enabled );
 
-	std::vector<LLUUID>	mLandmarkAssetIDList;
-	std::vector<LLUUID>	mLandmarkItemIDList;
+    std::vector<LLUUID> mLandmarkAssetIDList;
+    std::vector<LLUUID> mLandmarkItemIDList;
 
-	static const LLUUID	sHomeID;
+    static const LLUUID sHomeID;
 
-	LLInventoryModel* mInventory;
-	LLInventoryObserver* mInventoryObserver;
-	LLFriendObserver* mFriendObserver;
+    LLInventoryModel* mInventory;
+    LLInventoryObserver* mInventoryObserver;
+    LLFriendObserver* mFriendObserver;
 
-	std::string				mCompletingRegionName;
-	// Local position from trackURL() request, used to select final
-	// position once region lookup complete.
-	LLVector3				mCompletingRegionPos;
+    std::string             mCompletingRegionName;
+    // Local position from trackURL() request, used to select final
+    // position once region lookup complete.
+    LLVector3               mCompletingRegionPos;
 
-	std::string				mLastRegionName;
-	BOOL					mWaitingForTracker;
+    std::string             mLastRegionName;
+    BOOL                    mWaitingForTracker;
 
-	BOOL					mIsClosing;
-	BOOL					mSetToUserPosition;
+    BOOL                    mIsClosing;
+    BOOL                    mSetToUserPosition;
 
-	LLVector3d				mTrackedLocation;
-	LLTracker::ETrackingStatus mTrackedStatus;
-	std::string				mTrackedSimName;
-	LLUUID					mTrackedAvatarID;
-	LLSLURL  				mSLURL;
+    LLVector3d              mTrackedLocation;
+    LLTracker::ETrackingStatus mTrackedStatus;
+    std::string             mTrackedSimName;
+    LLUUID                  mTrackedAvatarID;
+    LLSLURL                 mSLURL;
 
-	LLCtrlListInterface *	mListFriendCombo;
-	LLCtrlListInterface *	mListLandmarkCombo;
-	LLCtrlListInterface *	mListSearchResults;
+    LLCtrlListInterface *   mListFriendCombo;
+    LLCtrlListInterface *   mListLandmarkCombo;
+    LLCtrlListInterface *   mListSearchResults;
 
     boost::signals2::connection mTeleportFinishConnection;
 };
@@ -204,19 +204,19 @@ extern LLFloaterWorldMap* gFloaterWorldMap;
 class LLPanelHideBeacon : public LLPanel
 {
 public:
-	static LLPanelHideBeacon* getInstance();
+    static LLPanelHideBeacon* getInstance();
 
-	LLPanelHideBeacon();
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void setVisible(BOOL visible);
-	/*virtual*/ void draw();
+    LLPanelHideBeacon();
+    /*virtual*/ BOOL postBuild();
+    /*virtual*/ void setVisible(BOOL visible);
+    /*virtual*/ void draw();
 
 private:
-	static LLPanelHideBeacon* getPanelHideBeacon();
-	void onHideButtonClick();
-	void updatePosition();
+    static LLPanelHideBeacon* getPanelHideBeacon();
+    void onHideButtonClick();
+    void updatePosition();
 
-	LLButton* mHideButton;
+    LLButton* mHideButton;
 
 };