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

Maint X -> Materials Featurette merge

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/llbox.h b/indra/newview/llbox.h
index ff641ad7cf..0817de08cd 100644
--- a/indra/newview/llbox.h
+++ b/indra/newview/llbox.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llbox.h
  * @brief Draws a box using display lists for speed.
  *
  * $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$
  */
@@ -32,17 +32,17 @@
 class LLBox
 {
 protected:
-//	GLuint	mDisplayList;
-	F32		mVertex[8][3];
-	U32		mTriangleCount;
+//  GLuint  mDisplayList;
+    F32     mVertex[8][3];
+    U32     mTriangleCount;
 public:
-	void	prerender();
-	void	cleanupGL();
+    void    prerender();
+    void    cleanupGL();
 
-	void	renderface(S32 which_face);
-	void	render();
+    void    renderface(S32 which_face);
+    void    render();
 
-	U32		getTriangleCount()			{ return mTriangleCount; }
+    U32     getTriangleCount()          { return mTriangleCount; }
 };
 
 extern LLBox gBox;