Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.

1 files changed, 30 insertions, 30 deletions

diff --git a/indra/newview/llpanelvoicedevicesettings.h b/indra/newview/llpanelvoicedevicesettings.h
index e704394d4a..1c170b135c 100644
--- a/indra/newview/llpanelvoicedevicesettings.h
+++ b/indra/newview/llpanelvoicedevicesettings.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpanelvoicedevicesettings.h
  * @author Richard Nelson
  * @brief Voice communication set-up wizard
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -33,39 +33,39 @@
 class LLPanelVoiceDeviceSettings : public LLPanel
 {
 public:
-	LLPanelVoiceDeviceSettings();
-	~LLPanelVoiceDeviceSettings();
+    LLPanelVoiceDeviceSettings();
+    ~LLPanelVoiceDeviceSettings();
+
+    /*virtual*/ void draw();
+    /*virtual*/ BOOL postBuild();
+    void apply();
+    void cancel();
+    void refresh();
+    void initialize();
+    void cleanup();
 
-	/*virtual*/ void draw();
-	/*virtual*/ BOOL postBuild();
-	void apply();
-	void cancel();
-	void refresh();
-	void initialize();
-	void cleanup();
+    /*virtual*/ void onVisibilityChange ( BOOL new_visibility );
 
-	/*virtual*/ void onVisibilityChange ( BOOL new_visibility );
+    void setUseTuningMode(bool use) { mUseTuningMode = use; };
 
-	void setUseTuningMode(bool use) { mUseTuningMode = use; };
-	
 protected:
-	std::string getLocalizedDeviceName(const std::string& en_dev_name);
+    std::string getLocalizedDeviceName(const std::string& en_dev_name);
 
-	void onCommitInputDevice();
-	void onCommitOutputDevice();
-	void onOutputDevicesClicked();
-	void onInputDevicesClicked();
+    void onCommitInputDevice();
+    void onCommitOutputDevice();
+    void onOutputDevicesClicked();
+    void onInputDevicesClicked();
     void onCommitUnmute();
 
-	F32 mMicVolume;
-	std::string mInputDevice;
-	std::string mOutputDevice;
-	class LLComboBox		*mCtrlInputDevices;
-	class LLComboBox		*mCtrlOutputDevices;
+    F32 mMicVolume;
+    std::string mInputDevice;
+    std::string mOutputDevice;
+    class LLComboBox        *mCtrlInputDevices;
+    class LLComboBox        *mCtrlOutputDevices;
     class LLButton          *mUnmuteBtn;
-	BOOL mDevicesUpdated;
-	bool mUseTuningMode;
-	std::map<std::string, std::string> mLocalizedDeviceNames;
+    BOOL mDevicesUpdated;
+    bool mUseTuningMode;
+    std::map<std::string, std::string> mLocalizedDeviceNames;
 };
 
 #endif // LL_LLPANELVOICEDEVICESETTINGS_H