Merge main into inventory_favorites

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

1 files changed, 31 insertions, 31 deletions

diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp
index 6c40499208..5f564fc870 100644
--- a/indra/newview/llpanelgroupexperiences.cpp
+++ b/indra/newview/llpanelgroupexperiences.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelgroupexperiences.cpp
  * @brief List of experiences owned by a group.
  *
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -42,7 +42,7 @@ static LLPanelInjector<LLPanelGroupExperiences> t_panel_group_experiences("panel
 
 
 LLPanelGroupExperiences::LLPanelGroupExperiences()
-:	LLPanelGroupTab(), mExperiencesList(NULL)
+:   LLPanelGroupTab(), mExperiencesList(NULL)
 {
 }
 
@@ -52,25 +52,25 @@ LLPanelGroupExperiences::~LLPanelGroupExperiences()
 
 BOOL LLPanelGroupExperiences::postBuild()
 {
-	mExperiencesList = getChild<LLFlatListView>("experiences_list");
-	if (hasString("loading_experiences"))
-	{
-		mExperiencesList->setNoItemsCommentText(getString("loading_experiences"));
-	}
-	else if (hasString("no_experiences"))
-	{
-		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
-	}
-
-	return LLPanelGroupTab::postBuild();
+    mExperiencesList = getChild<LLFlatListView>("experiences_list");
+    if (hasString("loading_experiences"))
+    {
+        mExperiencesList->setNoItemsCommentText(getString("loading_experiences"));
+    }
+    else if (hasString("no_experiences"))
+    {
+        mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
+    }
+
+    return LLPanelGroupTab::postBuild();
 }
 
 void LLPanelGroupExperiences::activate()
 {
-	if ((getGroupID() == LLUUID::null) || gDisconnected)
-	{
-		return;
-	}
+    if ((getGroupID() == LLUUID::null) || gDisconnected)
+    {
+        return;
+    }
 
     LLExperienceCache::instance().getGroupExperiences(getGroupID(),
         boost::bind(&LLPanelGroupExperiences::groupExperiencesResults, getDerivedHandle<LLPanelGroupExperiences>(), _1));
@@ -78,22 +78,22 @@ void LLPanelGroupExperiences::activate()
 
 void LLPanelGroupExperiences::setGroupID(const LLUUID& id)
 {
-	LLPanelGroupTab::setGroupID(id);
+    LLPanelGroupTab::setGroupID(id);
 
-	if(id == LLUUID::null)
-	{
-		return;
-	}
+    if(id == LLUUID::null)
+    {
+        return;
+    }
 
-	activate();
+    activate();
 }
 
 void LLPanelGroupExperiences::setExperienceList(const LLSD& experiences)
 {
-	if (hasString("no_experiences"))
-	{
-		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
-	}
+    if (hasString("no_experiences"))
+    {
+        mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
+    }
     mExperiencesList->clear();
 
     LLSD::array_const_iterator it = experiences.beginArray();