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

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/newview/llpanelvoiceeffect.h b/indra/newview/llpanelvoiceeffect.h
index bba525e1df..4acb8abca2 100644
--- a/indra/newview/llpanelvoiceeffect.h
+++ b/indra/newview/llpanelvoiceeffect.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpanelvoiceeffect.h
  * @author Aimee
  * @brief Panel to select Voice Effects.
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -34,33 +34,33 @@
 class LLComboBox;
 
 class LLPanelVoiceEffect
-	: public LLPanel
-	, public LLVoiceEffectObserver
+    : public LLPanel
+    , public LLVoiceEffectObserver
 {
 public:
-	LOG_CLASS(LLPanelVoiceEffect);
+    LOG_CLASS(LLPanelVoiceEffect);
 
-	LLPanelVoiceEffect();
-	virtual ~LLPanelVoiceEffect();
+    LLPanelVoiceEffect();
+    virtual ~LLPanelVoiceEffect();
 
-	virtual BOOL postBuild();
+    virtual BOOL postBuild();
 
 private:
-	void onCommitVoiceEffect();
-	void update(bool list_updated);
+    void onCommitVoiceEffect();
+    void update(bool list_updated);
 
-	/// Called by voice effect provider when voice effect list is changed.
-	virtual void onVoiceEffectChanged(bool effect_list_updated);
+    /// Called by voice effect provider when voice effect list is changed.
+    virtual void onVoiceEffectChanged(bool effect_list_updated);
 
-	// Fixed entries in the Voice Morph list
-	typedef enum e_voice_effect_combo_items
-	{
-		NO_VOICE_EFFECT = 0,
-		PREVIEW_VOICE_EFFECTS = 1,
-		GET_VOICE_EFFECTS = 2
-	} EVoiceEffectComboItems;
+    // Fixed entries in the Voice Morph list
+    typedef enum e_voice_effect_combo_items
+    {
+        NO_VOICE_EFFECT = 0,
+        PREVIEW_VOICE_EFFECTS = 1,
+        GET_VOICE_EFFECTS = 2
+    } EVoiceEffectComboItems;
 
-	LLComboBox* mVoiceEffectCombo;
+    LLComboBox* mVoiceEffectCombo;
 };