Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 124 insertions, 124 deletions

diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp
index d5fa4d1a73..2f06794e65 100644
--- a/indra/newview/llpanelgroupexperiences.cpp
+++ b/indra/newview/llpanelgroupexperiences.cpp
@@ -1,124 +1,124 @@
-/** 
- * @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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llpanelgroupexperiences.h"
-
-#include "lluictrlfactory.h"
-#include "roles_constants.h"
-#include "llappviewer.h"
-#include "llagent.h"
-#include "llviewerregion.h"
-#include "llflatlistview.h"
-#include "llpanelexperiences.h"
-#include "llsd.h"
-#include "llexperiencecache.h"
-
-static LLPanelInjector<LLPanelGroupExperiences> t_panel_group_experiences("panel_group_experiences");
-
-
-LLPanelGroupExperiences::LLPanelGroupExperiences()
-:	LLPanelGroupTab(), mExperiencesList(NULL)
-{
-}
-
-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();
-}
-
-void LLPanelGroupExperiences::activate()
-{
-	if ((getGroupID() == LLUUID::null) || gDisconnected)
-	{
-		return;
-	}
-
-    LLExperienceCache::instance().getGroupExperiences(getGroupID(),
-        boost::bind(&LLPanelGroupExperiences::groupExperiencesResults, getDerivedHandle<LLPanelGroupExperiences>(), _1));
-}
-
-void LLPanelGroupExperiences::setGroupID(const LLUUID& id)
-{
-	LLPanelGroupTab::setGroupID(id);
-
-	if(id == LLUUID::null)
-	{
-		return;
-	}
-
-	activate();
-}
-
-void LLPanelGroupExperiences::setExperienceList(const LLSD& experiences)
-{
-	if (hasString("no_experiences"))
-	{
-		mExperiencesList->setNoItemsCommentText(getString("no_experiences"));
-	}
-    mExperiencesList->clear();
-
-    LLSD::array_const_iterator it = experiences.beginArray();
-    for ( /**/ ; it != experiences.endArray(); ++it)
-    {
-        LLUUID public_key = it->asUUID();
-        LLExperienceItem* item = new LLExperienceItem();
-
-        item->init(public_key);
-        mExperiencesList->addItem(item, public_key);
-    }
-}
-
-/*static*/
-void LLPanelGroupExperiences::groupExperiencesResults(LLHandle<LLPanelGroupExperiences> handle, const LLSD &experiences)
-{
-    if (handle.isDead())
-    {
-        return;
-    }
-
-    LLPanelGroupExperiences* panel = handle.get();
-    if (panel)
-    {
-        panel->setExperienceList(experiences);
-    }
-
-}
+/**

+ * @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$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llpanelgroupexperiences.h"

+

+#include "lluictrlfactory.h"

+#include "roles_constants.h"

+#include "llappviewer.h"

+#include "llagent.h"

+#include "llviewerregion.h"

+#include "llflatlistview.h"

+#include "llpanelexperiences.h"

+#include "llsd.h"

+#include "llexperiencecache.h"

+

+static LLPanelInjector<LLPanelGroupExperiences> t_panel_group_experiences("panel_group_experiences");

+

+

+LLPanelGroupExperiences::LLPanelGroupExperiences()

+:   LLPanelGroupTab(), mExperiencesList(NULL)

+{

+}

+

+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();

+}

+

+void LLPanelGroupExperiences::activate()

+{

+    if ((getGroupID() == LLUUID::null) || gDisconnected)

+    {

+        return;

+    }

+

+    LLExperienceCache::instance().getGroupExperiences(getGroupID(),

+        boost::bind(&LLPanelGroupExperiences::groupExperiencesResults, getDerivedHandle<LLPanelGroupExperiences>(), _1));

+}

+

+void LLPanelGroupExperiences::setGroupID(const LLUUID& id)

+{

+    LLPanelGroupTab::setGroupID(id);

+

+    if(id == LLUUID::null)

+    {

+        return;

+    }

+

+    activate();

+}

+

+void LLPanelGroupExperiences::setExperienceList(const LLSD& experiences)

+{

+    if (hasString("no_experiences"))

+    {

+        mExperiencesList->setNoItemsCommentText(getString("no_experiences"));

+    }

+    mExperiencesList->clear();

+

+    LLSD::array_const_iterator it = experiences.beginArray();

+    for ( /**/ ; it != experiences.endArray(); ++it)

+    {

+        LLUUID public_key = it->asUUID();

+        LLExperienceItem* item = new LLExperienceItem();

+

+        item->init(public_key);

+        mExperiencesList->addItem(item, public_key);

+    }

+}

+

+/*static*/

+void LLPanelGroupExperiences::groupExperiencesResults(LLHandle<LLPanelGroupExperiences> handle, const LLSD &experiences)

+{

+    if (handle.isDead())

+    {

+        return;

+    }

+

+    LLPanelGroupExperiences* panel = handle.get();

+    if (panel)

+    {

+        panel->setExperienceList(experiences);

+    }

+

+}