Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev

merge maint-a (including maint-x) into gltf_development

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/tests/llsky_stub.cpp b/indra/newview/tests/llsky_stub.cpp
index 241d740635..8faca2665a 100644
--- a/indra/newview/tests/llsky_stub.cpp
+++ b/indra/newview/tests/llsky_stub.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2009&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, 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$
  */
@@ -27,8 +27,8 @@
 class LLSky
 {
 public:
-	void setOverrideSun(BOOL override);
-	void setSunDirection(const LLVector3 &sun_direction, const LLVector3 &sun_ang_velocity);
+    void setOverrideSun(BOOL override);
+    void setSunDirection(const LLVector3 &sun_direction, const LLVector3 &sun_ang_velocity);
 };
 
 void LLSky::setOverrideSun(BOOL override) {}