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

diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp
index 129c7e1b6d..52a049764c 100644
--- a/indra/newview/lltransientfloatermgr.cpp
+++ b/indra/newview/lltransientfloatermgr.cpp
@@ -1,169 +1,169 @@
-/** 
- * @file lltransientfloatermgr.cpp
- * @brief LLFocusMgr base class
- *
- * $LicenseInfo:firstyear=2002&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 "lltransientfloatermgr.h"
-#include "llfocusmgr.h"
-#include "llrootview.h"
-#include "llviewerwindow.h"
-#include "lldockablefloater.h"
-#include "llmenugl.h"
-
-
-LLTransientFloaterMgr::LLTransientFloaterMgr()
-{
-	if(gViewerWindow)
-	{
-		gViewerWindow->getRootView()->getChild<LLUICtrl>("popup_holder")->setMouseDownCallback(boost::bind(
-			&LLTransientFloaterMgr::leftMouseClickCallback, this, _2, _3, _4));
-	}
-
-	mGroupControls.insert(std::pair<ETransientGroup, controls_set_t >(GLOBAL, controls_set_t()));
-	mGroupControls.insert(std::pair<ETransientGroup, controls_set_t >(DOCKED, controls_set_t()));
-	mGroupControls.insert(std::pair<ETransientGroup, controls_set_t >(IM, controls_set_t()));
-}
-
-void LLTransientFloaterMgr::registerTransientFloater(LLTransientFloater* floater)
-{
-	mTransSet.insert(floater);
-}
-
-void LLTransientFloaterMgr::unregisterTransientFloater(LLTransientFloater* floater)
-{
-	mTransSet.erase(floater);
-}
-
-void LLTransientFloaterMgr::addControlView(ETransientGroup group, LLView* view)
-{
-	if (!view) return;
-
-	mGroupControls.find(group)->second.insert(view->getHandle());
-}
-
-void LLTransientFloaterMgr::removeControlView(ETransientGroup group, LLView* view)
-{
-	if (!view) return;
-
-	mGroupControls.find(group)->second.erase(view->getHandle());
-}
-
-void LLTransientFloaterMgr::addControlView(LLView* view)
-{
-	addControlView(GLOBAL, view);
-}
-
-void LLTransientFloaterMgr::removeControlView(LLView* view)
-{
-	// we will still get focus lost callbacks on this view, but that's ok
-	// since we run sanity checking logic every time
-	removeControlView(GLOBAL, view);
-}
-
-void LLTransientFloaterMgr::hideTransientFloaters(S32 x, S32 y)
-{
-	for (std::set<LLTransientFloater*>::iterator it = mTransSet.begin(); it
-			!= mTransSet.end(); it++)
-	{
-		LLTransientFloater* floater = *it;
-		if (floater->isTransientDocked())
-		{
-			ETransientGroup group = floater->getGroup();
-
-			bool hide = isControlClicked(group, mGroupControls.find(group)->second, x, y);
-			if (hide)
-			{
-				floater->setTransientVisible(false);
-			}
-		}
-	}
-}
-
-bool LLTransientFloaterMgr::isControlClicked(ETransientGroup group, controls_set_t& set, S32 x, S32 y)
-{
-	std::list< LLHandle<LLView> > dead_handles;
-	
-	bool res = true;
-	for (controls_set_t::iterator it = set.begin(); it
-			!= set.end(); it++)
-	{
-		LLView* control_view = NULL;
-
-		LLHandle<LLView> handle = *it;
-		if (handle.isDead())
-		{
-			dead_handles.push_back(handle);
-			continue;
-		}
-
-		control_view = handle.get();
-
-		if (!control_view->getVisible())
-		{
-			continue;
-		}
-
-		LLRect rect = control_view->calcScreenRect();
-		// if click inside view rect
-		if (rect.pointInRect(x, y))
-		{
-			res = false;
-			break;
-		}
-	}
-
-	for (std::list< LLHandle<LLView> >::iterator it = dead_handles.begin(); it != dead_handles.end(); ++it)
-	{
-		LLHandle<LLView> handle = *it;
-		mGroupControls.find(group)->second.erase(handle);
-	}
-	
-	return res;
-}
-
-void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y,
-		MASK mask)
-{
-	// don't hide transient floater if any context menu opened
-	if (LLMenuGL::sMenuContainer->getVisibleMenu() != NULL)
-	{
-		return;
-	}
-
-	bool hide = isControlClicked(DOCKED, mGroupControls.find(DOCKED)->second, x, y)
-			&& isControlClicked(GLOBAL, mGroupControls.find(GLOBAL)->second, x, y);
-	if (hide)
-	{
-		hideTransientFloaters(x, y);
-	}
-}
-
-void LLTransientFloater::init(LLFloater* thiz)
-{
-	// used since LLTransientFloater(this) can't be used in descendant constructor parameter initialization.
-	mFloater = thiz;
-}
-
+/**

+ * @file lltransientfloatermgr.cpp

+ * @brief LLFocusMgr base class

+ *

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

+#include "llfocusmgr.h"

+#include "llrootview.h"

+#include "llviewerwindow.h"

+#include "lldockablefloater.h"

+#include "llmenugl.h"

+

+

+LLTransientFloaterMgr::LLTransientFloaterMgr()

+{

+    if(gViewerWindow)

+    {

+        gViewerWindow->getRootView()->getChild<LLUICtrl>("popup_holder")->setMouseDownCallback(boost::bind(

+            &LLTransientFloaterMgr::leftMouseClickCallback, this, _2, _3, _4));

+    }

+

+    mGroupControls.insert(std::pair<ETransientGroup, controls_set_t >(GLOBAL, controls_set_t()));

+    mGroupControls.insert(std::pair<ETransientGroup, controls_set_t >(DOCKED, controls_set_t()));

+    mGroupControls.insert(std::pair<ETransientGroup, controls_set_t >(IM, controls_set_t()));

+}

+

+void LLTransientFloaterMgr::registerTransientFloater(LLTransientFloater* floater)

+{

+    mTransSet.insert(floater);

+}

+

+void LLTransientFloaterMgr::unregisterTransientFloater(LLTransientFloater* floater)

+{

+    mTransSet.erase(floater);

+}

+

+void LLTransientFloaterMgr::addControlView(ETransientGroup group, LLView* view)

+{

+    if (!view) return;

+

+    mGroupControls.find(group)->second.insert(view->getHandle());

+}

+

+void LLTransientFloaterMgr::removeControlView(ETransientGroup group, LLView* view)

+{

+    if (!view) return;

+

+    mGroupControls.find(group)->second.erase(view->getHandle());

+}

+

+void LLTransientFloaterMgr::addControlView(LLView* view)

+{

+    addControlView(GLOBAL, view);

+}

+

+void LLTransientFloaterMgr::removeControlView(LLView* view)

+{

+    // we will still get focus lost callbacks on this view, but that's ok

+    // since we run sanity checking logic every time

+    removeControlView(GLOBAL, view);

+}

+

+void LLTransientFloaterMgr::hideTransientFloaters(S32 x, S32 y)

+{

+    for (std::set<LLTransientFloater*>::iterator it = mTransSet.begin(); it

+            != mTransSet.end(); it++)

+    {

+        LLTransientFloater* floater = *it;

+        if (floater->isTransientDocked())

+        {

+            ETransientGroup group = floater->getGroup();

+

+            bool hide = isControlClicked(group, mGroupControls.find(group)->second, x, y);

+            if (hide)

+            {

+                floater->setTransientVisible(false);

+            }

+        }

+    }

+}

+

+bool LLTransientFloaterMgr::isControlClicked(ETransientGroup group, controls_set_t& set, S32 x, S32 y)

+{

+    std::list< LLHandle<LLView> > dead_handles;

+

+    bool res = true;

+    for (controls_set_t::iterator it = set.begin(); it

+            != set.end(); it++)

+    {

+        LLView* control_view = NULL;

+

+        LLHandle<LLView> handle = *it;

+        if (handle.isDead())

+        {

+            dead_handles.push_back(handle);

+            continue;

+        }

+

+        control_view = handle.get();

+

+        if (!control_view->getVisible())

+        {

+            continue;

+        }

+

+        LLRect rect = control_view->calcScreenRect();

+        // if click inside view rect

+        if (rect.pointInRect(x, y))

+        {

+            res = false;

+            break;

+        }

+    }

+

+    for (std::list< LLHandle<LLView> >::iterator it = dead_handles.begin(); it != dead_handles.end(); ++it)

+    {

+        LLHandle<LLView> handle = *it;

+        mGroupControls.find(group)->second.erase(handle);

+    }

+

+    return res;

+}

+

+void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y,

+        MASK mask)

+{

+    // don't hide transient floater if any context menu opened

+    if (LLMenuGL::sMenuContainer->getVisibleMenu() != NULL)

+    {

+        return;

+    }

+

+    bool hide = isControlClicked(DOCKED, mGroupControls.find(DOCKED)->second, x, y)

+            && isControlClicked(GLOBAL, mGroupControls.find(GLOBAL)->second, x, y);

+    if (hide)

+    {

+        hideTransientFloaters(x, y);

+    }

+}

+

+void LLTransientFloater::init(LLFloater* thiz)

+{

+    // used since LLTransientFloater(this) can't be used in descendant constructor parameter initialization.

+    mFloater = thiz;

+}

+