merging viewer release

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 20eade892d..f32a52e6c6 100755
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1613,7 +1613,7 @@ void LLFolderView::update()
 	{
 		getFolderViewModel()->getFilter().clearModified();
 	}
-    
+
 	// automatically show matching items, and select first one if we had a selection
 	if (mNeedsAutoSelect)
 	{
@@ -1652,14 +1652,14 @@ void LLFolderView::update()
 	}
 
   BOOL is_visible = isInVisibleChain();
-    
-  // Puts folders/items in proper positions
+
+  //Puts folders/items in proper positions
   // arrange() takes the model filter flag into account and call sort() if necessary (CHUI-849)
   // It also handles the open/close folder animation
-  if (is_visible)
+  if ( is_visible )
   {
     sanitizeSelection();
-    if (needsArrange())
+    if( needsArrange() )
     {
       S32 height = 0;
       S32 width = 0;