Merge main into inventory_favorites

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

1 files changed, 30 insertions, 30 deletions

diff --git a/indra/llcommon/tests/llprocinfo_test.cpp b/indra/llcommon/tests/llprocinfo_test.cpp
index 12d5a695ee..6a151048c2 100644
--- a/indra/llcommon/tests/llprocinfo_test.cpp
+++ b/indra/llcommon/tests/llprocinfo_test.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llprocinfo_test.cpp
  * @brief Tests for the LLProcInfo class.
  *
  * $LicenseInfo:firstyear=2013&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2013, 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$
  */
@@ -40,9 +40,9 @@ namespace tut
 
 struct procinfo_test
 {
-	procinfo_test()
-		{
-		}
+    procinfo_test()
+        {
+        }
 };
 
 typedef test_group<procinfo_test> procinfo_group_t;
@@ -54,14 +54,14 @@ tut::procinfo_group_t procinfo_instance("LLProcInfo");
 template<> template<>
 void procinfo_object_t::test<1>()
 {
-	LLProcInfo::time_type user(bad_user), system(bad_system);
+    LLProcInfo::time_type user(bad_user), system(bad_system);
+
+    set_test_name("getCPUUsage() basic function");
 
-	set_test_name("getCPUUsage() basic function");
+    LLProcInfo::getCPUUsage(user, system);
 
-	LLProcInfo::getCPUUsage(user, system);
-	
-	ensure_not_equals("getCPUUsage() writes to its user argument", user, bad_user);
-	ensure_not_equals("getCPUUsage() writes to its system argument", system, bad_system);
+    ensure_not_equals("getCPUUsage() writes to its user argument", user, bad_user);
+    ensure_not_equals("getCPUUsage() writes to its system argument", system, bad_system);
 }
 
 
@@ -69,22 +69,22 @@ void procinfo_object_t::test<1>()
 template<> template<>
 void procinfo_object_t::test<2>()
 {
-	LLProcInfo::time_type user(bad_user), system(bad_system);
-	LLProcInfo::time_type user2(bad_user), system2(bad_system);
-
-	set_test_name("getCPUUsage() increases over time");
-
-	LLProcInfo::getCPUUsage(user, system);
-	
-	for (int i(0); i < 100000; ++i)
-	{
-		ms_sleep(0);
-	}
-	
-	LLProcInfo::getCPUUsage(user2, system2);
-
-	ensure_equals("getCPUUsage() user value doesn't decrease over time", user2 >= user, true);
-	ensure_equals("getCPUUsage() system value doesn't decrease over time", system2 >= system, true);
+    LLProcInfo::time_type user(bad_user), system(bad_system);
+    LLProcInfo::time_type user2(bad_user), system2(bad_system);
+
+    set_test_name("getCPUUsage() increases over time");
+
+    LLProcInfo::getCPUUsage(user, system);
+
+    for (int i(0); i < 100000; ++i)
+    {
+        ms_sleep(0);
+    }
+
+    LLProcInfo::getCPUUsage(user2, system2);
+
+    ensure_equals("getCPUUsage() user value doesn't decrease over time", user2 >= user, true);
+    ensure_equals("getCPUUsage() system value doesn't decrease over time", system2 >= system, true);
 }