Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 28 insertions, 28 deletions

diff --git a/indra/newview/llcylinder.cpp b/indra/newview/llcylinder.cpp
index f353851a25..6e1fd41b87 100644
--- a/indra/newview/llcylinder.cpp
+++ b/indra/newview/llcylinder.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcylinder.cpp
  * @brief Draws a cylinder 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$
  */
@@ -37,7 +37,7 @@
 #include "llgl.h"
 #include "llglheaders.h"
 
-LLCone		gCone;
+LLCone      gCone;
 
 //
 // Cones
@@ -45,31 +45,31 @@ LLCone		gCone;
 
 void LLCone::render(S32 sides)
 {
-	gGL.begin(LLRender::TRIANGLE_FAN);
-	gGL.vertex3f(0,0,0);
+    gGL.begin(LLRender::TRIANGLE_FAN);
+    gGL.vertex3f(0,0,0);
 
-	for (U32 i = 0; i < sides; i++)
-	{
-		F32 a = (F32) i/sides * F_PI*2.f;
-		F32 x = cosf(a)*0.5f;
-		F32 y = sinf(a)*0.5f;
-		gGL.vertex3f(x,y,-.5f);
-	}
-	gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, -0.5f);
+    for (U32 i = 0; i < sides; i++)
+    {
+        F32 a = (F32) i/sides * F_PI*2.f;
+        F32 x = cosf(a)*0.5f;
+        F32 y = sinf(a)*0.5f;
+        gGL.vertex3f(x,y,-.5f);
+    }
+    gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, -0.5f);
 
-	gGL.end();
+    gGL.end();
 
-	gGL.begin(LLRender::TRIANGLE_FAN);
-	gGL.vertex3f(0.f, 0.f, 0.5f);
-	for (U32 i = 0; i < sides; i++)
-	{
-		F32 a = (F32) i/sides * F_PI*2.f;
-		F32 x = cosf(a)*0.5f;
-		F32 y = sinf(a)*0.5f;
-		gGL.vertex3f(x,y,-0.5f);
-	}
-	gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, -0.5f);
+    gGL.begin(LLRender::TRIANGLE_FAN);
+    gGL.vertex3f(0.f, 0.f, 0.5f);
+    for (U32 i = 0; i < sides; i++)
+    {
+        F32 a = (F32) i/sides * F_PI*2.f;
+        F32 x = cosf(a)*0.5f;
+        F32 y = sinf(a)*0.5f;
+        gGL.vertex3f(x,y,-0.5f);
+    }
+    gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, -0.5f);
 
-	gGL.end();
+    gGL.end();
 }