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

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

1 files changed, 19 insertions, 19 deletions

diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp
index bcc22431d0..1c7656ecd2 100644
--- a/indra/llui/llstatview.cpp
+++ b/indra/llui/llstatview.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llstatview.cpp
  * @brief Container for all statistics info.
  *
  * $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$
  */
@@ -37,25 +37,25 @@
 #include "llstatbar.h"
 
 LLStatView::LLStatView(const LLStatView::Params& p)
-:	LLContainerView(p),
-	mSetting(p.setting)
+:   LLContainerView(p),
+    mSetting(p.setting)
 {
-	bool isopen = getDisplayChildren();
-	if (mSetting.length() > 0)
-	{
-		isopen = LLUI::getInstance()->mSettingGroups["config"]->getBOOL(mSetting);
-	}
-	setDisplayChildren(isopen);
+    bool isopen = getDisplayChildren();
+    if (mSetting.length() > 0)
+    {
+        isopen = LLUI::getInstance()->mSettingGroups["config"]->getBOOL(mSetting);
+    }
+    setDisplayChildren(isopen);
 }
 
 LLStatView::~LLStatView()
 {
-	// Children all cleaned up by default view destructor.
-	if (mSetting.length() > 0)
-	{
-		bool isopen = getDisplayChildren();
-		LLUI::getInstance()->mSettingGroups["config"]->setBOOL(mSetting, isopen);
-	}
+    // Children all cleaned up by default view destructor.
+    if (mSetting.length() > 0)
+    {
+        bool isopen = getDisplayChildren();
+        LLUI::getInstance()->mSettingGroups["config"]->setBOOL(mSetting, isopen);
+    }
 }
 
 static StatViewRegistry::Register<LLStatBar> r1("stat_bar");