Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llfloaterhoverheight.h b/indra/newview/llfloaterhoverheight.h
index a643fa2516..778df644ef 100644
--- a/indra/newview/llfloaterhoverheight.h
+++ b/indra/newview/llfloaterhoverheight.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llfloaterhoverheight.h
 * @brief  Controller for self avatar hover height.
 * @author vir@lindenlab.com
@@ -32,21 +32,21 @@
 class LLFloaterHoverHeight: public LLFloater
 {
 public:
-	LLFloaterHoverHeight(const LLSD& key);
-	BOOL postBuild();
+    LLFloaterHoverHeight(const LLSD& key);
+    BOOL postBuild();
 
-	static void onSliderMoved(LLUICtrl* ctrl, void* userData);
+    static void onSliderMoved(LLUICtrl* ctrl, void* userData);
 
-	void onFinalCommit();
+    void onFinalCommit();
 
-	static void syncFromPreferenceSetting(void *user_data, bool update_offset = true);
+    static void syncFromPreferenceSetting(void *user_data, bool update_offset = true);
 
-	void onRegionChanged();
-	void onSimulatorFeaturesReceived(const LLUUID &region_id);
-	void updateEditEnabled();
+    void onRegionChanged();
+    void onSimulatorFeaturesReceived(const LLUUID &region_id);
+    void updateEditEnabled();
 
-	/*virtual*/ void onClose(bool app_quitting);
-	boost::signals2::connection mRegionChangedSlot;
+    /*virtual*/ void onClose(bool app_quitting);
+    boost::signals2::connection mRegionChangedSlot;
 };
 
 #endif