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, 79 insertions, 79 deletions

diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h
index 421d0b3f91..90a0601a90 100644
--- a/indra/newview/llfloaterbump.h
+++ b/indra/newview/llfloaterbump.h
@@ -1,79 +1,79 @@
-/** 
- * @file llfloaterbump.h
- * @brief Floater showing recent bumps, hits with objects, pushes, etc.
- * @author Cory Ondrejka, James Cook
- *
- * $LicenseInfo:firstyear=2003&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$
- */
-
-#ifndef LL_LLFLOATERBUMP_H
-#define LL_LLFLOATERBUMP_H
-
-#include "llfloater.h"
-#include "llmenugl.h"
-
-class LLMeanCollisionData;
-class LLScrollListCtrl;
-
-class LLFloaterBump 
-: public LLFloater
-{
-	friend class LLFloaterReg;
-protected:
-	void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd);
-	void onScrollListRightClicked(LLUICtrl* ctrl, S32 x, S32 y);
-
-public:
-	bool postBuild() override;
-	void onOpen(const LLSD& key) override;
-	
-	static LLFloaterBump* getInstance();
-
-	void populateCollisionList();
-
-	void startIM();
-	void startCall();
-	void reportAbuse();
-	void showProfile();
-	void addFriend();
-	void inviteToGroup();
-	bool enableAddFriend();
-	void muteAvatar();
-	void payAvatar();
-	void zoomInAvatar();
-	bool enableMute();
-
-private:
-	
-	LLFloaterBump(const LLSD& key);
-	virtual ~LLFloaterBump();
-
-	LLScrollListCtrl* mList;
-	LLHandle<LLContextMenu> mPopupMenuHandle;
-	LLUUID mItemUUID;
-
-	typedef std::map<LLUUID, std::string> uuid_map_t;
-	uuid_map_t mNames;
-
-};
-
-#endif
+/**

+ * @file llfloaterbump.h

+ * @brief Floater showing recent bumps, hits with objects, pushes, etc.

+ * @author Cory Ondrejka, James Cook

+ *

+ * $LicenseInfo:firstyear=2003&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$

+ */

+

+#ifndef LL_LLFLOATERBUMP_H

+#define LL_LLFLOATERBUMP_H

+

+#include "llfloater.h"

+#include "llmenugl.h"

+

+class LLMeanCollisionData;

+class LLScrollListCtrl;

+

+class LLFloaterBump

+: public LLFloater

+{

+    friend class LLFloaterReg;

+protected:

+    void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd);

+    void onScrollListRightClicked(LLUICtrl* ctrl, S32 x, S32 y);

+

+public:

+    bool postBuild() override;

+    void onOpen(const LLSD& key) override;

+

+    static LLFloaterBump* getInstance();

+

+    void populateCollisionList();

+

+    void startIM();

+    void startCall();

+    void reportAbuse();

+    void showProfile();

+    void addFriend();

+    void inviteToGroup();

+    bool enableAddFriend();

+    void muteAvatar();

+    void payAvatar();

+    void zoomInAvatar();

+    bool enableMute();

+

+private:

+

+    LLFloaterBump(const LLSD& key);

+    virtual ~LLFloaterBump();

+

+    LLScrollListCtrl* mList;

+    LLHandle<LLContextMenu> mPopupMenuHandle;

+    LLUUID mItemUUID;

+

+    typedef std::map<LLUUID, std::string> uuid_map_t;

+    uuid_map_t mNames;

+

+};

+

+#endif