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

diff --git a/indra/newview/llsidetraypanelcontainer.h b/indra/newview/llsidetraypanelcontainer.h
index 1e6e6dd487..f35aa08042 100644
--- a/indra/newview/llsidetraypanelcontainer.h
+++ b/indra/newview/llsidetraypanelcontainer.h
@@ -1,96 +1,96 @@
-/** 
-* @file llsidetraypanelcontainer.h
-* @brief LLSideTrayPanelContainer class declaration
-*
-* $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$
-*/
-
-#ifndef LL_LLSIDETRAY_PANEL_CONTAINER_H
-#define LL_LLSIDETRAY_PANEL_CONTAINER_H
-
-#include "lltabcontainer.h"
-
-/**
-* LLSideTrayPanelContainer class acts like LLTabContainer with invisible tabs.
-* It is designed to make panel switching easier, avoid setVisible(true) setVisible(false)
-* calls and related workarounds.
-* use onOpen to open sub panel, pass the name of panel to open
-* in key[PARAM_SUB_PANEL_NAME].
-* LLSideTrayPanelContainer also implements panel navigation history - it allows to 
-* open previous or next panel if navigation history is available(after user 
-* has opened two or more panels). *NOTE - only back navigation is implemented so far.
-*/
-class LLSideTrayPanelContainer : public LLTabContainer
-{
-public:
-
-	struct Params :	public LLInitParam::Block<Params, LLTabContainer::Params>
-	{
-		Optional<std::string> default_panel_name;
-		Params();
-	};
-
-	/**
-	* Opens sub panel
-	* @param key - params to be passed to panel, use key[PARAM_SUB_PANEL_NAME]
-	* to specify panel name to be opened.
-	*/
-	/*virtual*/ void onOpen(const LLSD& key);
-
-	/**
-	 * Opens given subpanel.
-	 */
-	void openPanel(const std::string& panel_name, const LLSD& key = LLSD::emptyMap());
-
-	/**
-	* Opens previous panel from panel navigation history.
-	*/
-	void openPreviousPanel();
-
-	/**
-	* Overrides LLTabContainer::handleKeyHere to disable panel switch on 
-	* Alt + Left/Right button press.
-	*/
-	bool handleKeyHere(KEY key, MASK mask);
-
-	/**
-	* Name of parameter that stores panel name to open.
-	*/
-	static std::string PARAM_SUB_PANEL_NAME;
-
-protected:
-	LLSideTrayPanelContainer(const Params& p);
-	friend class LLUICtrlFactory;
-
-	/**
-	* std::string - name of panel
-	* S32 - index of previous panel
-	* *NOTE - no forward navigation implemented yet
-	*/
-	typedef std::map<std::string, S32> panel_navigation_history_t;
-
-	// Navigation history
-	panel_navigation_history_t mPanelHistory;
-	std::string mDefaultPanelName;
-};
-
-#endif //LL_LLSIDETRAY_PANEL_CONTAINER_H
+/**

+* @file llsidetraypanelcontainer.h

+* @brief LLSideTrayPanelContainer class declaration

+*

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

+*/

+

+#ifndef LL_LLSIDETRAY_PANEL_CONTAINER_H

+#define LL_LLSIDETRAY_PANEL_CONTAINER_H

+

+#include "lltabcontainer.h"

+

+/**

+* LLSideTrayPanelContainer class acts like LLTabContainer with invisible tabs.

+* It is designed to make panel switching easier, avoid setVisible(true) setVisible(false)

+* calls and related workarounds.

+* use onOpen to open sub panel, pass the name of panel to open

+* in key[PARAM_SUB_PANEL_NAME].

+* LLSideTrayPanelContainer also implements panel navigation history - it allows to

+* open previous or next panel if navigation history is available(after user

+* has opened two or more panels). *NOTE - only back navigation is implemented so far.

+*/

+class LLSideTrayPanelContainer : public LLTabContainer

+{

+public:

+

+    struct Params : public LLInitParam::Block<Params, LLTabContainer::Params>

+    {

+        Optional<std::string> default_panel_name;

+        Params();

+    };

+

+    /**

+    * Opens sub panel

+    * @param key - params to be passed to panel, use key[PARAM_SUB_PANEL_NAME]

+    * to specify panel name to be opened.

+    */

+    /*virtual*/ void onOpen(const LLSD& key);

+

+    /**

+     * Opens given subpanel.

+     */

+    void openPanel(const std::string& panel_name, const LLSD& key = LLSD::emptyMap());

+

+    /**

+    * Opens previous panel from panel navigation history.

+    */

+    void openPreviousPanel();

+

+    /**

+    * Overrides LLTabContainer::handleKeyHere to disable panel switch on

+    * Alt + Left/Right button press.

+    */

+    bool handleKeyHere(KEY key, MASK mask);

+

+    /**

+    * Name of parameter that stores panel name to open.

+    */

+    static std::string PARAM_SUB_PANEL_NAME;

+

+protected:

+    LLSideTrayPanelContainer(const Params& p);

+    friend class LLUICtrlFactory;

+

+    /**

+    * std::string - name of panel

+    * S32 - index of previous panel

+    * *NOTE - no forward navigation implemented yet

+    */

+    typedef std::map<std::string, S32> panel_navigation_history_t;

+

+    // Navigation history

+    panel_navigation_history_t mPanelHistory;

+    std::string mDefaultPanelName;

+};

+

+#endif //LL_LLSIDETRAY_PANEL_CONTAINER_H