Merge main into inventory_favorites

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

1 files changed, 39 insertions, 39 deletions

diff --git a/indra/llmessage/llioutil.cpp b/indra/llmessage/llioutil.cpp
index 850bc2a616..a1bf6332b4 100644
--- a/indra/llmessage/llioutil.cpp
+++ b/indra/llmessage/llioutil.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llioutil.cpp
  * @author Phoenix
  * @date 2005-10-05
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2005&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,65 +34,65 @@
  * LLIOFlush
  */
 LLIOPipe::EStatus LLIOFlush::process_impl(
-	const LLChannelDescriptors& channels,
-	buffer_ptr_t& buffer,
-	bool& eos,
-	LLSD& context,
-	LLPumpIO* pump)
+    const LLChannelDescriptors& channels,
+    buffer_ptr_t& buffer,
+    bool& eos,
+    LLSD& context,
+    LLPumpIO* pump)
 {
-	eos = true;
-	return STATUS_OK;
+    eos = true;
+    return STATUS_OK;
 }
 
 
-/** 
+/**
  * @class LLIOSleep
  */
 LLIOPipe::EStatus LLIOSleep::process_impl(
-	const LLChannelDescriptors& channels,
-	buffer_ptr_t& buffer,
-	bool& eos,
-	LLSD& context,
-	LLPumpIO* pump)
+    const LLChannelDescriptors& channels,
+    buffer_ptr_t& buffer,
+    bool& eos,
+    LLSD& context,
+    LLPumpIO* pump)
 {
     LL_PROFILE_ZONE_SCOPED;
-	if(mSeconds > 0.0)
-	{
-		if(pump) pump->sleepChain(mSeconds);
-		mSeconds = 0.0;
-		return STATUS_BREAK;
-	}
-	return STATUS_DONE;
+    if(mSeconds > 0.0)
+    {
+        if(pump) pump->sleepChain(mSeconds);
+        mSeconds = 0.0;
+        return STATUS_BREAK;
+    }
+    return STATUS_DONE;
 }
 
-/** 
+/**
  * @class LLIOAddChain
  */
 LLIOPipe::EStatus LLIOAddChain::process_impl(
-	const LLChannelDescriptors& channels,
-	buffer_ptr_t& buffer,
-	bool& eos,
-	LLSD& context,
-	LLPumpIO* pump)
+    const LLChannelDescriptors& channels,
+    buffer_ptr_t& buffer,
+    bool& eos,
+    LLSD& context,
+    LLPumpIO* pump)
 {
     LL_PROFILE_ZONE_SCOPED;
-	pump->addChain(mChain, mTimeout);
-	return STATUS_DONE;
+    pump->addChain(mChain, mTimeout);
+    return STATUS_DONE;
 }
 
 /**
  * LLChangeChannel
  */
 LLChangeChannel::LLChangeChannel(S32 is, S32 becomes) :
-	mIs(is),
-	mBecomes(becomes)
+    mIs(is),
+    mBecomes(becomes)
 {
 }
 
 void LLChangeChannel::operator()(LLSegment& segment)
 {
-	if(segment.isOnChannel(mIs))
-	{
-		segment.setChannel(mBecomes);
-	}
+    if(segment.isOnChannel(mIs))
+    {
+        segment.setChannel(mBecomes);
+    }
 }