Merge commit 'e7eced3' into nat/releaseos for whitespace fix.

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/tests/llviewershadermgr_stub.cpp b/indra/newview/tests/llviewershadermgr_stub.cpp
index 18eff72f3c..5d6cb33019 100644
--- a/indra/newview/tests/llviewershadermgr_stub.cpp
+++ b/indra/newview/tests/llviewershadermgr_stub.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llglslshader_stub.cpp
  * @brief  stub class to allow unit testing
  *
  * $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$
  */
@@ -35,12 +35,12 @@ LLViewerShaderMgr::~LLViewerShaderMgr() {}
 LLViewerShaderMgr* stub_instance = NULL;
 
 LLViewerShaderMgr* LLViewerShaderMgr::instance() {
-	if(NULL == stub_instance)
-	{
-		stub_instance = new LLViewerShaderMgr();
-	}
+    if(NULL == stub_instance)
+    {
+        stub_instance = new LLViewerShaderMgr();
+    }
 
-	return stub_instance;
+    return stub_instance;
 }
 LLViewerShaderMgr::shader_iter fake_iter;
 LLViewerShaderMgr::shader_iter LLViewerShaderMgr::beginShaders() const {return fake_iter;}