Merge main into inventory_favorites

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

1 files changed, 51 insertions, 51 deletions

diff --git a/indra/newview/llrecentpeople.cpp b/indra/newview/llrecentpeople.cpp
index 0faf6bf889..d64dfdfcbc 100644
--- a/indra/newview/llrecentpeople.cpp
+++ b/indra/newview/llrecentpeople.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llrecentpeople.cpp
  * @brief List of people with which the user has recently interacted.
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -35,87 +35,87 @@ using namespace LLOldEvents;
 
 bool LLRecentPeople::add(const LLUUID& id, const LLSD& userdata)
 {
-	if (id == gAgent.getID())
-		return false;
+    if (id == gAgent.getID())
+        return false;
 
-	bool is_not_group_id = LLGroupMgr::getInstance()->getGroupData(id) == NULL;
+    bool is_not_group_id = LLGroupMgr::getInstance()->getGroupData(id) == NULL;
 
-	if (is_not_group_id)
-	{
-		//[] instead of insert to replace existing id->llsd["date"] with new date value
-		mPeople[id] = userdata;
-		mChangedSignal();
-	}
+    if (is_not_group_id)
+    {
+        //[] instead of insert to replace existing id->llsd["date"] with new date value
+        mPeople[id] = userdata;
+        mChangedSignal();
+    }
 
-	return is_not_group_id;
+    return is_not_group_id;
 }
 
 bool LLRecentPeople::contains(const LLUUID& id) const
 {
-	return mPeople.find(id) != mPeople.end();
+    return mPeople.find(id) != mPeople.end();
 }
 
 void LLRecentPeople::get(uuid_vec_t& result) const
 {
-	result.clear();
-	for (recent_people_t::const_iterator pos = mPeople.begin(); pos != mPeople.end(); ++pos)
-		result.push_back((*pos).first);
+    result.clear();
+    for (recent_people_t::const_iterator pos = mPeople.begin(); pos != mPeople.end(); ++pos)
+        result.push_back((*pos).first);
 }
 
 const LLDate LLRecentPeople::getDate(const LLUUID& id) const
 {
-	recent_people_t::const_iterator it = mPeople.find(id);
-	if (it!= mPeople.end()) return it->second["date"].asDate();
+    recent_people_t::const_iterator it = mPeople.find(id);
+    if (it!= mPeople.end()) return it->second["date"].asDate();
 
-	static LLDate no_date = LLDate();
-	return no_date;
+    static LLDate no_date = LLDate();
+    return no_date;
 }
 
 const LLSD& LLRecentPeople::getData(const LLUUID& id) const
 {
-	recent_people_t::const_iterator it = mPeople.find(id);
+    recent_people_t::const_iterator it = mPeople.find(id);
 
-	if (it != mPeople.end())
-		return it->second;
+    if (it != mPeople.end())
+        return it->second;
 
-	static LLSD no_data = LLSD();
-	return no_data;
+    static LLSD no_data = LLSD();
+    return no_data;
 }
 
 // virtual
 bool LLRecentPeople::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
-	(void) userdata;
-	add(event->getValue().asUUID());
-	return true;
+    (void) userdata;
+    add(event->getValue().asUUID());
+    return true;
 }
 
 void LLRecentPeople::updateAvatarsArrivalTime(uuid_vec_t& uuids)
 {
-	id_to_time_map_t buf = mAvatarsArrivalTime;
-	mAvatarsArrivalTime.clear();
-
-	for (uuid_vec_t::const_iterator id_it = uuids.begin(); id_it != uuids.end(); ++id_it)
-	{
-		if (buf.find(*id_it) != buf.end())
-		{
-			mAvatarsArrivalTime[*id_it] = buf[*id_it];
-		}
-		else
-		{
-			mAvatarsArrivalTime[*id_it] = LLDate::now().secondsSinceEpoch();
-		}
-	}
+    id_to_time_map_t buf = mAvatarsArrivalTime;
+    mAvatarsArrivalTime.clear();
+
+    for (uuid_vec_t::const_iterator id_it = uuids.begin(); id_it != uuids.end(); ++id_it)
+    {
+        if (buf.find(*id_it) != buf.end())
+        {
+            mAvatarsArrivalTime[*id_it] = buf[*id_it];
+        }
+        else
+        {
+            mAvatarsArrivalTime[*id_it] = LLDate::now().secondsSinceEpoch();
+        }
+    }
 }
 
 F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id)
 {
-	id_to_time_map_t::const_iterator it = mAvatarsArrivalTime.find(id);
+    id_to_time_map_t::const_iterator it = mAvatarsArrivalTime.find(id);
 
-	if (it != mAvatarsArrivalTime.end())
-	{
-		return it->second;
-	}
-	return LLDate::now().secondsSinceEpoch();
+    if (it != mAvatarsArrivalTime.end())
+    {
+        return it->second;
+    }
+    return LLDate::now().secondsSinceEpoch();
 }