1 files changed, 89 insertions, 89 deletions

diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index a44c6dd699..a9d0f1a82e 100755
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -47,113 +47,113 @@ class LLSearchComboBox;
 
 class LLPullButton: public LLButton
 {
-	LOG_CLASS(LLPullButton);
+    LOG_CLASS(LLPullButton);
 
 public:
-	struct Params: public LLInitParam::Block<Params, LLButton::Params>
-	{
-		Optional<std::string> direction; // left, right, down, up
+    struct Params: public LLInitParam::Block<Params, LLButton::Params>
+    {
+        Optional<std::string> direction; // left, right, down, up
 
-		Params() 
-		:	direction("direction", "down")
-		{
-		}
-	};
-	
-	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+        Params() 
+        :   direction("direction", "down")
+        {
+        }
+    };
+    
+    /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 
-	/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+    /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
 
-	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
+    /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
 
-	boost::signals2::connection setClickDraggingCallback(const commit_signal_t::slot_type& cb);
+    boost::signals2::connection setClickDraggingCallback(const commit_signal_t::slot_type& cb);
 
 protected:
-	friend class LLUICtrlFactory;
-	// convert string name into direction vector
-	void setDirectionFromName(const std::string& name);
-	LLPullButton(const LLPullButton::Params& params);
-
-	commit_signal_t mClickDraggingSignal;
-	LLVector2 mLastMouseDown;
-	LLVector2 mDraggingDirection;
+    friend class LLUICtrlFactory;
+    // convert string name into direction vector
+    void setDirectionFromName(const std::string& name);
+    LLPullButton(const LLPullButton::Params& params);
+
+    commit_signal_t mClickDraggingSignal;
+    LLVector2 mLastMouseDown;
+    LLVector2 mDraggingDirection;
 };
 
 /**
  * Web browser-like navigation bar.
  */ 
 class LLNavigationBar
-	:	public LLPanel, public LLSingleton<LLNavigationBar>, private LLDestroyClass<LLNavigationBar>
+    :   public LLPanel, public LLSingleton<LLNavigationBar>, private LLDestroyClass<LLNavigationBar>
 {
-	LLSINGLETON(LLNavigationBar);
-	virtual ~LLNavigationBar();
-	LOG_CLASS(LLNavigationBar);
-	friend class LLDestroyClass<LLNavigationBar>;
+    LLSINGLETON(LLNavigationBar);
+    virtual ~LLNavigationBar();
+    LOG_CLASS(LLNavigationBar);
+    friend class LLDestroyClass<LLNavigationBar>;
 
 public:
-	
-	/*virtual*/ void	draw();
-	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL	postBuild();
-	/*virtual*/ void	setVisible(BOOL visible);
-
-	void handleLoginComplete();
-	void clearHistoryCache();
-
-	int getDefNavBarHeight();
-	int getDefFavBarHeight();
-	
+    
+    /*virtual*/ void    draw();
+    /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+    /*virtual*/ BOOL    postBuild();
+    /*virtual*/ void    setVisible(BOOL visible);
+
+    void handleLoginComplete();
+    void clearHistoryCache();
+
+    int getDefNavBarHeight();
+    int getDefFavBarHeight();
+    
 private:
-	// the distance between navigation panel and favorites panel in pixels
-	const static S32 FAVBAR_TOP_PADDING = 10;
-
-	void rebuildTeleportHistoryMenu();
-	void showTeleportHistoryMenu(LLUICtrl* btn_ctrl);
-	void invokeSearch(std::string search_text);
-	void resizeLayoutPanel();
-	// callbacks
-	void onTeleportHistoryMenuItemClicked(const LLSD& userdata);
-	void onTeleportHistoryChanged();
-	void onBackButtonClicked();
-	void onBackOrForwardButtonHeldDown(LLUICtrl* ctrl, const LLSD& param);
-	void onNavigationButtonHeldUp(LLButton* nav_button);
-	void onForwardButtonClicked();
-	void onHomeButtonClicked();
-	void onLocationSelection();
-	void onLocationPrearrange(const LLSD& data);
-	void onTeleportFinished(const LLVector3d& global_agent_pos);
-	void onTeleportFailed();
-	void onNavbarResized();
-	void onRegionNameResponse(
-			std::string typed_location,
-			std::string region_name,
-			LLVector3 local_coords,
-			U64 region_handle, const std::string& url,
-			const LLUUID& snapshot_id, bool teleport);
-
-	static void destroyClass()
-	{
-		if (LLNavigationBar::instanceExists())
-		{
-			LLNavigationBar::getInstance()->setEnabled(FALSE);
-		}
-	}
-
-	S32							mNavPanWidth;
-	LLMenuGL*					mTeleportHistoryMenu;
-	LLPullButton*				mBtnBack;
-	LLPullButton*				mBtnForward;
-	LLButton*					mBtnHome;
-	LLLocationInputCtrl*		mCmbLocation;
-	LLRect						mDefaultNbRect;
-	LLRect						mDefaultFpRect;
-	LLLayoutPanel* 				mNavigationPanel;
-	LLLayoutPanel* 				mFavoritePanel;
-	boost::signals2::connection	mTeleportFailedConnection;
-	boost::signals2::connection	mTeleportFinishConnection;
-	boost::signals2::connection	mHistoryMenuConnection;
-	// if true, save location to location history when teleport finishes
-	bool						mSaveToLocationHistory;
+    // the distance between navigation panel and favorites panel in pixels
+    const static S32 FAVBAR_TOP_PADDING = 10;
+
+    void rebuildTeleportHistoryMenu();
+    void showTeleportHistoryMenu(LLUICtrl* btn_ctrl);
+    void invokeSearch(std::string search_text);
+    void resizeLayoutPanel();
+    // callbacks
+    void onTeleportHistoryMenuItemClicked(const LLSD& userdata);
+    void onTeleportHistoryChanged();
+    void onBackButtonClicked();
+    void onBackOrForwardButtonHeldDown(LLUICtrl* ctrl, const LLSD& param);
+    void onNavigationButtonHeldUp(LLButton* nav_button);
+    void onForwardButtonClicked();
+    void onHomeButtonClicked();
+    void onLocationSelection();
+    void onLocationPrearrange(const LLSD& data);
+    void onTeleportFinished(const LLVector3d& global_agent_pos);
+    void onTeleportFailed();
+    void onNavbarResized();
+    void onRegionNameResponse(
+            std::string typed_location,
+            std::string region_name,
+            LLVector3 local_coords,
+            U64 region_handle, const std::string& url,
+            const LLUUID& snapshot_id, bool teleport);
+
+    static void destroyClass()
+    {
+        if (LLNavigationBar::instanceExists())
+        {
+            LLNavigationBar::getInstance()->setEnabled(FALSE);
+        }
+    }
+
+    S32                         mNavPanWidth;
+    LLMenuGL*                   mTeleportHistoryMenu;
+    LLPullButton*               mBtnBack;
+    LLPullButton*               mBtnForward;
+    LLButton*                   mBtnHome;
+    LLLocationInputCtrl*        mCmbLocation;
+    LLRect                      mDefaultNbRect;
+    LLRect                      mDefaultFpRect;
+    LLLayoutPanel*              mNavigationPanel;
+    LLLayoutPanel*              mFavoritePanel;
+    boost::signals2::connection mTeleportFailedConnection;
+    boost::signals2::connection mTeleportFinishConnection;
+    boost::signals2::connection mHistoryMenuConnection;
+    // if true, save location to location history when teleport finishes
+    bool                        mSaveToLocationHistory;
 };
 
 #endif