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

diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp
index e48f5f7854..182b8e9c89 100644
--- a/indra/newview/llinspect.cpp
+++ b/indra/newview/llinspect.cpp
@@ -1,165 +1,165 @@
-/** 
- * @file llinspect.cpp
- *
- * $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$
- */
-#include "llviewerprecompiledheaders.h"
-
-#include "llinspect.h"
-
-#include "lltooltip.h"
-#include "llcontrol.h"	// LLCachedControl
-#include "llui.h"		// LLUI::getInstance()->mSettingsGroups
-#include "llviewermenu.h"
-
-LLInspect::LLInspect(const LLSD& key)
-:	LLFloater(key),
-	mCloseTimer(),
-	mOpenTimer()
-{
-}
-
-LLInspect::~LLInspect()
-{
-}
-
-// virtual
-void LLInspect::draw()
-{
-	static LLCachedControl<F32> FADE_TIME(*LLUI::getInstance()->mSettingGroups["config"], "InspectorFadeTime", 1.f);
-	static LLCachedControl<F32> STAY_TIME(*LLUI::getInstance()->mSettingGroups["config"], "InspectorShowTime", 1.f);
-	if (mOpenTimer.getStarted())
-	{
-		LLFloater::draw();
-		if (mOpenTimer.getElapsedTimeF32() > STAY_TIME)
-		{
-			mOpenTimer.stop();
-			mCloseTimer.start();
-		}
-
-	}
-	else if (mCloseTimer.getStarted())
-	{
-		F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME(), 1.f, 0.f);
-		LLViewDrawContext context(alpha);
-		LLFloater::draw();
-		if (mCloseTimer.getElapsedTimeF32() > FADE_TIME)
-		{
-			closeFloater(false);
-		}
-	}
-	else
-	{
-		LLFloater::draw();
-	}
-}
-
-// virtual
-void LLInspect::onOpen(const LLSD& data)
-{
-	LLFloater::onOpen(data);
-	
-	mCloseTimer.stop();
-	mOpenTimer.start();
-}
-
-// virtual
-void LLInspect::onFocusLost()
-{
-	LLFloater::onFocusLost();
-	
-	// Start closing when we lose focus
-	mCloseTimer.start();
-	mOpenTimer.stop();
-}
-
-// virtual
-bool LLInspect::handleHover(S32 x, S32 y, MASK mask)
-{
-	mOpenTimer.pause();
-	return LLView::handleHover(x, y, mask);
-}
-
-bool LLInspect::handleToolTip(S32 x, S32 y, MASK mask)
-{
-	bool handled = false;
-
-
-	//delegate handling of tooltip to the hovered child
-	LLView* child_handler = childFromPoint(x,y);
-	if (child_handler && !child_handler->getToolTip().empty())// show tooltip if a view has non-empty tooltip message
-	{
-		//build LLInspector params to get correct tooltip setting, etc. background image
-		LLInspector::Params params;
-		params.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
-		params.message = child_handler->getToolTip();
-		//set up delay if there is no visible tooltip at this moment
-		params.delay_time =  LLToolTipMgr::instance().toolTipVisible() ? 0.f : LLUI::getInstance()->mSettingGroups["config"]->getF32( "ToolTipDelay" );
-		LLToolTipMgr::instance().show(params);
-		handled = true;
-	}
-	return handled;
-}
-// virtual
-void LLInspect::onMouseLeave(S32 x, S32 y, MASK mask)
-{
-	mOpenTimer.unpause();
-}
-
-bool LLInspect::childHasVisiblePopupMenu()
-{
-	// Child text-box may spawn a pop-up menu, if mouse is over the menu, Inspector 
-	// will hide(which is not expected).
-	// This is an attempt to find out if child control has spawned a menu.
-
-	LLView* child_menu = gMenuHolder->getVisibleMenu();
-	if(child_menu)
-	{
-		LLRect floater_rc = calcScreenRect();
-		LLRect menu_screen_rc = child_menu->calcScreenRect();
-		S32 mx, my;
-		LLUI::getInstance()->getMousePositionScreen(&mx, &my);
-
-		// This works wrong if we spawn a menu near Inspector and menu overlaps Inspector.
-		if(floater_rc.overlaps(menu_screen_rc) && menu_screen_rc.pointInRect(mx, my))
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-void LLInspect::repositionInspector(const LLSD& data)
-{
-	// Position the inspector relative to the mouse cursor
-	// Similar to how tooltips are positioned
-	// See LLToolTipMgr::createToolTip
-	if (data.has("pos"))
-	{
-		LLUI::getInstance()->positionViewNearMouse(this, data["pos"]["x"].asInteger(), data["pos"]["y"].asInteger());
-	}
-	else
-	{
-		LLUI::getInstance()->positionViewNearMouse(this);
-	}
-	applyRectControl();
-}
+/**

+ * @file llinspect.cpp

+ *

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

+ */

+#include "llviewerprecompiledheaders.h"

+

+#include "llinspect.h"

+

+#include "lltooltip.h"

+#include "llcontrol.h"  // LLCachedControl

+#include "llui.h"       // LLUI::getInstance()->mSettingsGroups

+#include "llviewermenu.h"

+

+LLInspect::LLInspect(const LLSD& key)

+:   LLFloater(key),

+    mCloseTimer(),

+    mOpenTimer()

+{

+}

+

+LLInspect::~LLInspect()

+{

+}

+

+// virtual

+void LLInspect::draw()

+{

+    const F32 FADE_TIME = 0.5f;

+    const F32 STAY_TIME = 3.f;

+    if (mOpenTimer.getStarted())

+    {

+        LLFloater::draw();

+        if (mOpenTimer.getElapsedTimeF32() > STAY_TIME)

+        {

+            mOpenTimer.stop();

+            mCloseTimer.start();

+        }

+

+    }

+    else if (mCloseTimer.getStarted())

+    {

+        F32 alpha = clamp_rescale(mCloseTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 1.f, 0.f);

+        LLViewDrawContext context(alpha);

+        LLFloater::draw();

+        if (mCloseTimer.getElapsedTimeF32() > FADE_TIME)

+        {

+            closeFloater(false);

+        }

+    }

+    else

+    {

+        LLFloater::draw();

+    }

+}

+

+// virtual

+void LLInspect::onOpen(const LLSD& data)

+{

+    LLFloater::onOpen(data);

+

+    mCloseTimer.stop();

+    mOpenTimer.start();

+}

+

+// virtual

+void LLInspect::onFocusLost()

+{

+    LLFloater::onFocusLost();

+

+    // Start closing when we lose focus

+    mCloseTimer.start();

+    mOpenTimer.stop();

+}

+

+// virtual

+bool LLInspect::handleHover(S32 x, S32 y, MASK mask)

+{

+    mOpenTimer.pause();

+    return LLView::handleHover(x, y, mask);

+}

+

+bool LLInspect::handleToolTip(S32 x, S32 y, MASK mask)

+{

+    bool handled = false;

+

+

+    //delegate handling of tooltip to the hovered child

+    LLView* child_handler = childFromPoint(x,y);

+    if (child_handler && !child_handler->getToolTip().empty())// show tooltip if a view has non-empty tooltip message

+    {

+        //build LLInspector params to get correct tooltip setting, etc. background image

+        LLInspector::Params params;

+        params.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());

+        params.message = child_handler->getToolTip();

+        //set up delay if there is no visible tooltip at this moment

+        params.delay_time =  LLToolTipMgr::instance().toolTipVisible() ? 0.f : LLUI::getInstance()->mSettingGroups["config"]->getF32( "ToolTipDelay" );

+        LLToolTipMgr::instance().show(params);

+        handled = true;

+    }

+    return handled;

+}

+// virtual

+void LLInspect::onMouseLeave(S32 x, S32 y, MASK mask)

+{

+    mOpenTimer.unpause();

+}

+

+bool LLInspect::childHasVisiblePopupMenu()

+{

+    // Child text-box may spawn a pop-up menu, if mouse is over the menu, Inspector

+    // will hide(which is not expected).

+    // This is an attempt to find out if child control has spawned a menu.

+

+    LLView* child_menu = gMenuHolder->getVisibleMenu();

+    if(child_menu)

+    {

+        LLRect floater_rc = calcScreenRect();

+        LLRect menu_screen_rc = child_menu->calcScreenRect();

+        S32 mx, my;

+        LLUI::getInstance()->getMousePositionScreen(&mx, &my);

+

+        // This works wrong if we spawn a menu near Inspector and menu overlaps Inspector.

+        if(floater_rc.overlaps(menu_screen_rc) && menu_screen_rc.pointInRect(mx, my))

+        {

+            return true;

+        }

+    }

+    return false;

+}

+

+void LLInspect::repositionInspector(const LLSD& data)

+{

+    // Position the inspector relative to the mouse cursor

+    // Similar to how tooltips are positioned

+    // See LLToolTipMgr::createToolTip

+    if (data.has("pos"))

+    {

+        LLUI::getInstance()->positionViewNearMouse(this, data["pos"]["x"].asInteger(), data["pos"]["y"].asInteger());

+    }

+    else

+    {

+        LLUI::getInstance()->positionViewNearMouse(this);

+    }

+    applyRectControl();

+}