Merge main into inventory_favorites

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

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/llmessage/llmessagereader.cpp b/indra/llmessage/llmessagereader.cpp
index 1d1bee7f59..bed8655cf7 100644
--- a/indra/llmessage/llmessagereader.cpp
+++ b/indra/llmessage/llmessagereader.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmessagereader.cpp
  * @brief LLMessageReader class implementation
  *
  * $LicenseInfo:firstyear=2007&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$
  */
@@ -34,29 +34,29 @@ static F32 sTimeDecodesSpamThreshold = 0.05f;
 //virtual
 LLMessageReader::~LLMessageReader()
 {
-	// even abstract base classes need a concrete destructor
+    // even abstract base classes need a concrete destructor
 }
 
-//static 
+//static
 void LLMessageReader::setTimeDecodes(BOOL b)
 {
-	sTimeDecodes = b;
+    sTimeDecodes = b;
 }
 
-//static 
+//static
 void LLMessageReader::setTimeDecodesSpamThreshold(F32 seconds)
 {
-	sTimeDecodesSpamThreshold = seconds;
+    sTimeDecodesSpamThreshold = seconds;
 }
 
-//static 
+//static
 BOOL LLMessageReader::getTimeDecodes()
 {
-	return sTimeDecodes;
+    return sTimeDecodes;
 }
 
-//static 
+//static
 F32 LLMessageReader::getTimeDecodesSpamThreshold()
 {
-	return sTimeDecodesSpamThreshold;
+    return sTimeDecodesSpamThreshold;
 }