Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llfloatertestlistview.h b/indra/newview/llfloatertestlistview.h
index 0d4c7eb793..95cb7f25f5 100644
--- a/indra/newview/llfloatertestlistview.h
+++ b/indra/newview/llfloatertestlistview.h
@@ -1,25 +1,25 @@
-/** 
+/**
 * @file llfloatertestlistview.h
 * @brief Tests of programmatic manipulation of LLListView widgets
 *
 * $LicenseInfo:firstyear=2009&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$
 */
@@ -32,12 +32,12 @@ class LLSD;
 
 class LLFloaterTestListView : public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 
 private:
-	// Construction handled by LLFloaterReg
-	LLFloaterTestListView(const LLSD& seed);
-	~LLFloaterTestListView();
+    // Construction handled by LLFloaterReg
+    LLFloaterTestListView(const LLSD& seed);
+    ~LLFloaterTestListView();
 };
 
 #endif