Merge main into inventory_favorites

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

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h
index a3a5dfec3a..a7b003a6cf 100644
--- a/indra/llrender/llrendernavprim.h
+++ b/indra/llrender/llrendernavprim.h
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file   llrendernavprim.h
 * @brief  Header file for llrendernavprim
 * @author Prep@lindenlab.com
@@ -37,10 +37,10 @@ class LLVertexBuffer;
 class LLRenderNavPrim
 {
 public:
-	//Draw simple tri
-	void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const;
-	//Draw the contents of vertex buffer
-	void renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertCnt );
+    //Draw simple tri
+    void renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const;
+    //Draw the contents of vertex buffer
+    void renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertCnt );
 private:
 };