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

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/llpanelpresetscamerapulldown.h b/indra/newview/llpanelpresetscamerapulldown.h
index c49bab042e..231a269436 100644
--- a/indra/newview/llpanelpresetscamerapulldown.h
+++ b/indra/newview/llpanelpresetscamerapulldown.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelpresetscamerapulldown.h
  * @brief A panel showing a quick way to pick camera presets
  *
  * $LicenseInfo:firstyear=2017&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2017, 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,15 +34,15 @@
 class LLPanelPresetsCameraPulldown : public LLPanelPulldown
 {
  public:
-	LLPanelPresetsCameraPulldown();
-	/*virtual*/ BOOL postBuild();
-	void populatePanel();
-	
+    LLPanelPresetsCameraPulldown();
+    /*virtual*/ BOOL postBuild();
+    void populatePanel();
+
  private:
-	void onViewButtonClick(const LLSD& user_data);
-	void onRowClick(const LLSD& user_data);
+    void onViewButtonClick(const LLSD& user_data);
+    void onRowClick(const LLSD& user_data);
 
-	std::list<std::string> mPresetNames;
+    std::list<std::string> mPresetNames;
     LOG_CLASS(LLPanelPresetsCameraPulldown);
 };