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

diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index 2305764914..8e4c853ec3 100644
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -1,187 +1,187 @@
-/** 
- * @file llfloatersidepanelcontainer.cpp
- * @brief LLFloaterSidePanelContainer class definition
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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 "llfloaterreg.h"
-#include "llfloatersidepanelcontainer.h"
-#include "llpaneleditwearable.h"
-
-// newview includes
-#include "llsidetraypanelcontainer.h"
-#include "lltransientfloatermgr.h"
-#include "llpaneloutfitedit.h"
-#include "llsidepanelappearance.h"
-
-//static
-const std::string LLFloaterSidePanelContainer::sMainPanelName("main_panel");
-
-LLFloaterSidePanelContainer::LLFloaterSidePanelContainer(const LLSD& key, const Params& params)
-:	LLFloater(key, params)
-{
-	// Prevent transient floaters (e.g. IM windows) from hiding
-	// when this floater is clicked.
-	LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::GLOBAL, this);
-}
-
-LLFloaterSidePanelContainer::~LLFloaterSidePanelContainer()
-{
-	LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::GLOBAL, this);
-}
-
-void LLFloaterSidePanelContainer::onOpen(const LLSD& key)
-{
-	getChild<LLPanel>(sMainPanelName)->onOpen(key);
-}
-
-void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
-{
-	LLPanelOutfitEdit* panel_outfit_edit =
-		dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::findPanel("appearance", "panel_outfit_edit"));
-	if (panel_outfit_edit)
-	{
-		LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);
-		if (parent == this )
-		{
-			LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
-			if (panel_appearance)
-			{
-				LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
-				if (edit_wearable_ptr)
-				{
-					edit_wearable_ptr->onClose();
-				}
-				if (!app_quitting)
-				{
-					panel_appearance->showOutfitsInventoryPanel();
-				}
-			}
-		}
-	}
-	
-	LLFloater::closeFloater(app_quitting);
-
-	if (getInstanceName() == "inventory" && !getKey().isUndefined())
-	{
-		destroy();
-	}
-}
-
-LLFloater* LLFloaterSidePanelContainer::getTopmostInventoryFloater()
-{
-    LLFloater* topmost_floater = NULL;
-    S32 z_min = S32_MAX;
-    
-    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
-    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
-    {
-        LLFloater* inventory_floater = (*iter);
-
-        if (inventory_floater && inventory_floater->getVisible())
-        {
-            S32 z_order = gFloaterView->getZOrder(inventory_floater);
-            if (z_order < z_min)
-            {
-                z_min = z_order;
-                topmost_floater = inventory_floater;
-            }
-        }
-    }
-    return topmost_floater;
-}
-
-LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)
-{
-	LLView* view = findChildView(panel_name, true);
-	if (!view)
-		return NULL;
-
-	if (!getVisible())
-	{
-		openFloater();
-	}
-	else if (!hasFocus())
-	{
-		setFocus(true);
-	}
-
-	LLPanel* panel = NULL;
-
-	LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent());
-	if (container)
-	{
-		container->openPanel(panel_name, params);
-		panel = container->getCurrentPanel();
-	}
-	else if ((panel = dynamic_cast<LLPanel*>(view)) != NULL)
-	{
-		panel->onOpen(params);
-	}
-
-	return panel;
-}
-
-void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const LLSD& key)
-{
-	LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-	if (floaterp)
-	{
-		floaterp->openChildPanel(sMainPanelName, key);
-	}
-}
-
-void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key)
-{
-	LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-	if (floaterp)
-	{
-		floaterp->openChildPanel(panel_name, key);
-	}
-}
-
-LLPanel* LLFloaterSidePanelContainer::getPanel(const std::string& floater_name, const std::string& panel_name)
-{
-	LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-
-	if (floaterp)
-	{
-		return floaterp->findChild<LLPanel>(panel_name, true);
-	}
-
-	return NULL;
-}
-
-LLPanel* LLFloaterSidePanelContainer::findPanel(const std::string& floater_name, const std::string& panel_name)
-{
-	LLFloaterSidePanelContainer* floaterp = LLFloaterReg::findTypedInstance<LLFloaterSidePanelContainer>(floater_name);
-
-	if (floaterp)
-	{
-		return floaterp->findChild<LLPanel>(panel_name, true);
-	}
-
-	return NULL;
-}
+/**

+ * @file llfloatersidepanelcontainer.cpp

+ * @brief LLFloaterSidePanelContainer class definition

+ *

+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2011, 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 "llfloaterreg.h"

+#include "llfloatersidepanelcontainer.h"

+#include "llpaneleditwearable.h"

+

+// newview includes

+#include "llsidetraypanelcontainer.h"

+#include "lltransientfloatermgr.h"

+#include "llpaneloutfitedit.h"

+#include "llsidepanelappearance.h"

+

+//static

+const std::string LLFloaterSidePanelContainer::sMainPanelName("main_panel");

+

+LLFloaterSidePanelContainer::LLFloaterSidePanelContainer(const LLSD& key, const Params& params)

+:   LLFloater(key, params)

+{

+    // Prevent transient floaters (e.g. IM windows) from hiding

+    // when this floater is clicked.

+    LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::GLOBAL, this);

+}

+

+LLFloaterSidePanelContainer::~LLFloaterSidePanelContainer()

+{

+    LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::GLOBAL, this);

+}

+

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

+{

+    getChild<LLPanel>(sMainPanelName)->onOpen(key);

+}

+

+void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)

+{

+    LLPanelOutfitEdit* panel_outfit_edit =

+        dynamic_cast<LLPanelOutfitEdit*>(LLFloaterSidePanelContainer::findPanel("appearance", "panel_outfit_edit"));

+    if (panel_outfit_edit)

+    {

+        LLFloater *parent = gFloaterView->getParentFloater(panel_outfit_edit);

+        if (parent == this )

+        {

+            LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));

+            if (panel_appearance)

+            {

+                LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();

+                if (edit_wearable_ptr)

+                {

+                    edit_wearable_ptr->onClose();

+                }

+                if (!app_quitting)

+                {

+                    panel_appearance->showOutfitsInventoryPanel();

+                }

+            }

+        }

+    }

+

+    LLFloater::closeFloater(app_quitting);

+

+    if (getInstanceName() == "inventory" && !getKey().isUndefined())

+    {

+        destroy();

+    }

+}

+

+LLFloater* LLFloaterSidePanelContainer::getTopmostInventoryFloater()

+{

+    LLFloater* topmost_floater = NULL;

+    S32 z_min = S32_MAX;

+

+    LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");

+    for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)

+    {

+        LLFloater* inventory_floater = (*iter);

+

+        if (inventory_floater && inventory_floater->getVisible())

+        {

+            S32 z_order = gFloaterView->getZOrder(inventory_floater);

+            if (z_order < z_min)

+            {

+                z_min = z_order;

+                topmost_floater = inventory_floater;

+            }

+        }

+    }

+    return topmost_floater;

+}

+

+LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)

+{

+    LLView* view = findChildView(panel_name, true);

+    if (!view)

+        return NULL;

+

+    if (!getVisible())

+    {

+        openFloater();

+    }

+    else if (!hasFocus())

+    {

+        setFocus(true);

+    }

+

+    LLPanel* panel = NULL;

+

+    LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent());

+    if (container)

+    {

+        container->openPanel(panel_name, params);

+        panel = container->getCurrentPanel();

+    }

+    else if ((panel = dynamic_cast<LLPanel*>(view)) != NULL)

+    {

+        panel->onOpen(params);

+    }

+

+    return panel;

+}

+

+void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const LLSD& key)

+{

+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);

+    if (floaterp)

+    {

+        floaterp->openChildPanel(sMainPanelName, key);

+    }

+}

+

+void LLFloaterSidePanelContainer::showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key)

+{

+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);

+    if (floaterp)

+    {

+        floaterp->openChildPanel(panel_name, key);

+    }

+}

+

+LLPanel* LLFloaterSidePanelContainer::getPanel(const std::string& floater_name, const std::string& panel_name)

+{

+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>(floater_name);

+

+    if (floaterp)

+    {

+        return floaterp->findChild<LLPanel>(panel_name, true);

+    }

+

+    return NULL;

+}

+

+LLPanel* LLFloaterSidePanelContainer::findPanel(const std::string& floater_name, const std::string& panel_name)

+{

+    LLFloaterSidePanelContainer* floaterp = LLFloaterReg::findTypedInstance<LLFloaterSidePanelContainer>(floater_name);

+

+    if (floaterp)

+    {

+        return floaterp->findChild<LLPanel>(panel_name, true);

+    }

+

+    return NULL;

+}