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

diff --git a/indra/newview/llsidetraypanelcontainer.cpp b/indra/newview/llsidetraypanelcontainer.cpp
index 4cec761839..6f29889b06 100644
--- a/indra/newview/llsidetraypanelcontainer.cpp
+++ b/indra/newview/llsidetraypanelcontainer.cpp
@@ -1,93 +1,93 @@
-/** 
-* @file llsidetraypanelcontainer.cpp
-* @brief LLSideTrayPanelContainer implementation
-*
-* $LicenseInfo:firstyear=2001&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 "llsidetraypanelcontainer.h"
-
-static LLDefaultChildRegistry::Register<LLSideTrayPanelContainer> r2("panel_container");
-
-std::string LLSideTrayPanelContainer::PARAM_SUB_PANEL_NAME = "sub_panel_name";
-
-LLSideTrayPanelContainer::Params::Params()
-:	default_panel_name("default_panel_name")
-{
-	// Always hide tabs.
-	changeDefault(hide_tabs, true);
-}
-
-LLSideTrayPanelContainer::LLSideTrayPanelContainer(const Params& p)
- : LLTabContainer(p)
- , mDefaultPanelName(p.default_panel_name)
-{
-}
-
-void LLSideTrayPanelContainer::onOpen(const LLSD& key)
-{
-	// Select specified panel and save navigation history.
-	if(key.has(PARAM_SUB_PANEL_NAME))
-	{
-		//*NOTE dzaporozhan
-		// Navigation history is not used after fix for EXT-3186,
-		// openPreviousPanel() always opens default panel
-
-		// Save panel navigation history
-		std::string panel_name = key[PARAM_SUB_PANEL_NAME];
-
-		selectTabByName(panel_name);
-	}
-	// Will reopen current panel if no panel name was passed.
-	getCurrentPanel()->onOpen(key);
-}
-
-void LLSideTrayPanelContainer::openPanel(const std::string& panel_name, const LLSD& key)
-{
-	LLSD combined_key = key;
-	combined_key[PARAM_SUB_PANEL_NAME] = panel_name;
-	onOpen(combined_key);
-}
-
-void LLSideTrayPanelContainer::openPreviousPanel()
-{
-	if(!mDefaultPanelName.empty())
-	{
-		selectTabByName(mDefaultPanelName);
-	}
-	else
-	{
-		selectTab(0);
-	}
-}
-
-bool LLSideTrayPanelContainer::handleKeyHere(KEY key, MASK mask)
-{
-	// No key press handling code for Panel Container - this disables
-	// Tab Container's Alt + Left/Right Button tab switching.
-	
-	// Let default handler process key presses, don't simply return true or false
-	// as this may brake some functionality as it did with Copy/Paste for 
-	// text_editor (ticket EXT-642).
-	return LLPanel::handleKeyHere(key, mask);
-}
+/**

+* @file llsidetraypanelcontainer.cpp

+* @brief LLSideTrayPanelContainer implementation

+*

+* $LicenseInfo:firstyear=2001&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 "llsidetraypanelcontainer.h"

+

+static LLDefaultChildRegistry::Register<LLSideTrayPanelContainer> r2("panel_container");

+

+std::string LLSideTrayPanelContainer::PARAM_SUB_PANEL_NAME = "sub_panel_name";

+

+LLSideTrayPanelContainer::Params::Params()

+:   default_panel_name("default_panel_name")

+{

+    // Always hide tabs.

+    changeDefault(hide_tabs, true);

+}

+

+LLSideTrayPanelContainer::LLSideTrayPanelContainer(const Params& p)

+ : LLTabContainer(p)

+ , mDefaultPanelName(p.default_panel_name)

+{

+}

+

+void LLSideTrayPanelContainer::onOpen(const LLSD& key)

+{

+    // Select specified panel and save navigation history.

+    if(key.has(PARAM_SUB_PANEL_NAME))

+    {

+        //*NOTE dzaporozhan

+        // Navigation history is not used after fix for EXT-3186,

+        // openPreviousPanel() always opens default panel

+

+        // Save panel navigation history

+        std::string panel_name = key[PARAM_SUB_PANEL_NAME];

+

+        selectTabByName(panel_name);

+    }

+    // Will reopen current panel if no panel name was passed.

+    getCurrentPanel()->onOpen(key);

+}

+

+void LLSideTrayPanelContainer::openPanel(const std::string& panel_name, const LLSD& key)

+{

+    LLSD combined_key = key;

+    combined_key[PARAM_SUB_PANEL_NAME] = panel_name;

+    onOpen(combined_key);

+}

+

+void LLSideTrayPanelContainer::openPreviousPanel()

+{

+    if(!mDefaultPanelName.empty())

+    {

+        selectTabByName(mDefaultPanelName);

+    }

+    else

+    {

+        selectTab(0);

+    }

+}

+

+bool LLSideTrayPanelContainer::handleKeyHere(KEY key, MASK mask)

+{

+    // No key press handling code for Panel Container - this disables

+    // Tab Container's Alt + Left/Right Button tab switching.

+

+    // Let default handler process key presses, don't simply return true or false

+    // as this may brake some functionality as it did with Copy/Paste for

+    // text_editor (ticket EXT-642).

+    return LLPanel::handleKeyHere(key, mask);

+}