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

diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp
index 22c9b191a3..153aa19c1a 100644
--- a/indra/newview/llpopupview.cpp
+++ b/indra/newview/llpopupview.cpp
@@ -1,271 +1,271 @@
-/** 
- * @file llpopupview.cpp
- * @brief Holds transient popups
- *
- * $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 "llpopupview.h"
-
-static LLPanelInjector<LLPopupView> r("popup_holder");
-
-bool view_visible_and_enabled(LLView* viewp)
-{
-	return viewp->getVisible() && viewp->getEnabled();
-}
-
-bool view_visible(LLView* viewp)
-{
-	return viewp->getVisible();
-}
-
-
-LLPopupView::LLPopupView(const LLPopupView::Params& p)
-: LLPanel(p)
-{
-	// register ourself as handler of UI popups
-	LLUI::getInstance()->setPopupFuncs(boost::bind(&LLPopupView::addPopup, this, _1), boost::bind(&LLPopupView::removePopup, this, _1), boost::bind(&LLPopupView::clearPopups, this));
-}
-
-LLPopupView::~LLPopupView()
-{
-	// set empty callback function so we can't handle popups anymore
-	LLUI::getInstance()->setPopupFuncs(LLUI::add_popup_t(), LLUI::remove_popup_t(), LLUI::clear_popups_t());
-}
-
-void LLPopupView::draw()
-{
-	S32 screen_x, screen_y;
-
-	// remove dead popups
-	for (popup_list_t::iterator popup_it = mPopups.begin();
-		popup_it != mPopups.end();)
-	{
-		if (!popup_it->get())
-		{
-			mPopups.erase(popup_it++);
-		}
-		else
-		{
-			popup_it++;
-		}
-	}
-
-	// draw in reverse order (most recent is on top)
-	for (popup_list_t::reverse_iterator popup_it = mPopups.rbegin();
-		popup_it != mPopups.rend();)
-	{
-		LLView* popup = popup_it->get();
-
-		if (popup->getVisible())
-		{
-			popup->localPointToScreen(0, 0, &screen_x, &screen_y);
-
-			LLUI::pushMatrix();
-			{
-				LLUI::translate( (F32) screen_x, (F32) screen_y);
-				popup->draw();
-			}
-			LLUI::popMatrix();
-		}
-		++popup_it;
-	}
-
-	LLPanel::draw();
-}
-
-bool LLPopupView::handleMouseEvent(boost::function<bool(LLView*, S32, S32)> func, 
-								   boost::function<bool(LLView*)> predicate, 
-								   S32 x, S32 y,
-								   bool close_popups)
-{
-	bool handled = false;
-
-	// make a copy of list of popups, in case list is modified during mouse event handling
-	popup_list_t popups(mPopups);
-	for (popup_list_t::iterator popup_it = popups.begin(), popup_end = popups.end();
-		popup_it != popup_end;
-		++popup_it)
-	{
-		LLView* popup = popup_it->get();
-		if (!popup 
-			|| !predicate(popup))
-		{
-			continue;
-		}
-
-		S32 popup_x, popup_y;
-		if (localPointToOtherView(x, y, &popup_x, &popup_y, popup) 
-			&& popup->pointInView(popup_x, popup_y))
-		{
-			if (func(popup, popup_x, popup_y))
-			{
-				handled = true;
-				break;
-			}
-		}
-
-		if (close_popups)
-		{
-			mPopups.remove(*popup_it);
-			popup->onTopLost();
-		}
-	}
-
-	return handled;
-}
-
-
-bool LLPopupView::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true);
-	if (!handled)
-	{
-		handled = LLPanel::handleMouseDown(x, y, mask);
-	}
-	return handled;
-}
-
-bool LLPopupView::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
-	if (!handled)
-	{
-		handled = LLPanel::handleMouseUp(x, y, mask);
-	}
-	return handled;
-}
-
-bool LLPopupView::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true);
-	if (!handled)
-	{
-		handled = LLPanel::handleMiddleMouseDown(x, y, mask);
-	}
-	return handled;	
-}
-
-bool LLPopupView::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
-	if (!handled)
-	{
-		handled = LLPanel::handleMiddleMouseUp(x, y, mask);
-	}
-	return handled;	
-}
-
-bool LLPopupView::handleRightMouseDown(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true);
-	if (!handled)
-	{
-		handled = LLPanel::handleRightMouseDown(x, y, mask);
-	}
-	return handled;	
-}
-
-bool LLPopupView::handleRightMouseUp(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
-	if (!handled)
-	{
-		handled = LLPanel::handleRightMouseUp(x, y, mask);
-	}
-	return handled;	
-}
-
-bool LLPopupView::handleDoubleClick(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleDoubleClick, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
-	if (!handled)
-	{
-		handled = LLPanel::handleDoubleClick(x, y, mask);
-	}
-	return handled;	
-}
-
-bool LLPopupView::handleHover(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleHover, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);
-	if (!handled)
-	{
-		handled = LLPanel::handleHover(x, y, mask);
-	}
-	return handled;	
-}
-
-bool LLPopupView::handleScrollWheel(S32 x, S32 y, S32 clicks)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleScrollWheel, _1, _2, _3, clicks), view_visible_and_enabled, x, y, false);
-	if (!handled)
-	{
-		handled = LLPanel::handleScrollWheel(x, y, clicks);
-	}
-	return handled;	
-}
-
-bool LLPopupView::handleToolTip(S32 x, S32 y, MASK mask)
-{
-	bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleToolTip, _1, _2, _3, mask), view_visible, x, y, false);
-	if (!handled)
-	{
-		handled = LLPanel::handleToolTip(x, y, mask);
-	}
-	return handled;
-}
-
-void LLPopupView::addPopup(LLView* popup)
-{
-	if (popup)
-	{
-		mPopups.remove(popup->getHandle());
-		mPopups.push_front(popup->getHandle());
-	}
-}
-
-void LLPopupView::removePopup(LLView* popup)
-{
-	if (popup)
-	{
-		mPopups.remove(popup->getHandle());
-		popup->onTopLost();
-	}
-}
-
-void LLPopupView::clearPopups()
-{
-	for (popup_list_t::iterator popup_it = mPopups.begin();
-		popup_it != mPopups.end();)
-	{
-		LLView* popup = popup_it->get();
-
-		popup_list_t::iterator cur_popup_it = popup_it;
-		++popup_it;
-
-		mPopups.erase(cur_popup_it);
-		popup->onTopLost();
-	}
-}
-
+/**

+ * @file llpopupview.cpp

+ * @brief Holds transient popups

+ *

+ * $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 "llpopupview.h"

+

+static LLPanelInjector<LLPopupView> r("popup_holder");

+

+bool view_visible_and_enabled(LLView* viewp)

+{

+    return viewp->getVisible() && viewp->getEnabled();

+}

+

+bool view_visible(LLView* viewp)

+{

+    return viewp->getVisible();

+}

+

+

+LLPopupView::LLPopupView(const LLPopupView::Params& p)

+: LLPanel(p)

+{

+    // register ourself as handler of UI popups

+    LLUI::getInstance()->setPopupFuncs(boost::bind(&LLPopupView::addPopup, this, _1), boost::bind(&LLPopupView::removePopup, this, _1), boost::bind(&LLPopupView::clearPopups, this));

+}

+

+LLPopupView::~LLPopupView()

+{

+    // set empty callback function so we can't handle popups anymore

+    LLUI::getInstance()->setPopupFuncs(LLUI::add_popup_t(), LLUI::remove_popup_t(), LLUI::clear_popups_t());

+}

+

+void LLPopupView::draw()

+{

+    S32 screen_x, screen_y;

+

+    // remove dead popups

+    for (popup_list_t::iterator popup_it = mPopups.begin();

+        popup_it != mPopups.end();)

+    {

+        if (!popup_it->get())

+        {

+            mPopups.erase(popup_it++);

+        }

+        else

+        {

+            popup_it++;

+        }

+    }

+

+    // draw in reverse order (most recent is on top)

+    for (popup_list_t::reverse_iterator popup_it = mPopups.rbegin();

+        popup_it != mPopups.rend();)

+    {

+        LLView* popup = popup_it->get();

+

+        if (popup->getVisible())

+        {

+            popup->localPointToScreen(0, 0, &screen_x, &screen_y);

+

+            LLUI::pushMatrix();

+            {

+                LLUI::translate( (F32) screen_x, (F32) screen_y);

+                popup->draw();

+            }

+            LLUI::popMatrix();

+        }

+        ++popup_it;

+    }

+

+    LLPanel::draw();

+}

+

+bool LLPopupView::handleMouseEvent(boost::function<bool(LLView*, S32, S32)> func,

+                                   boost::function<bool(LLView*)> predicate,

+                                   S32 x, S32 y,

+                                   bool close_popups)

+{

+    bool handled = false;

+

+    // make a copy of list of popups, in case list is modified during mouse event handling

+    popup_list_t popups(mPopups);

+    for (popup_list_t::iterator popup_it = popups.begin(), popup_end = popups.end();

+        popup_it != popup_end;

+        ++popup_it)

+    {

+        LLView* popup = popup_it->get();

+        if (!popup

+            || !predicate(popup))

+        {

+            continue;

+        }

+

+        S32 popup_x, popup_y;

+        if (localPointToOtherView(x, y, &popup_x, &popup_y, popup)

+            && popup->pointInView(popup_x, popup_y))

+        {

+            if (func(popup, popup_x, popup_y))

+            {

+                handled = true;

+                break;

+            }

+        }

+

+        if (close_popups)

+        {

+            mPopups.remove(*popup_it);

+            popup->onTopLost();

+        }

+    }

+

+    return handled;

+}

+

+

+bool LLPopupView::handleMouseDown(S32 x, S32 y, MASK mask)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true);

+    if (!handled)

+    {

+        handled = LLPanel::handleMouseDown(x, y, mask);

+    }

+    return handled;

+}

+

+bool LLPopupView::handleMouseUp(S32 x, S32 y, MASK mask)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);

+    if (!handled)

+    {

+        handled = LLPanel::handleMouseUp(x, y, mask);

+    }

+    return handled;

+}

+

+bool LLPopupView::handleMiddleMouseDown(S32 x, S32 y, MASK mask)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true);

+    if (!handled)

+    {

+        handled = LLPanel::handleMiddleMouseDown(x, y, mask);

+    }

+    return handled;

+}

+

+bool LLPopupView::handleMiddleMouseUp(S32 x, S32 y, MASK mask)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleMiddleMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);

+    if (!handled)

+    {

+        handled = LLPanel::handleMiddleMouseUp(x, y, mask);

+    }

+    return handled;

+}

+

+bool LLPopupView::handleRightMouseDown(S32 x, S32 y, MASK mask)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseDown, _1, _2, _3, mask), view_visible_and_enabled, x, y, true);

+    if (!handled)

+    {

+        handled = LLPanel::handleRightMouseDown(x, y, mask);

+    }

+    return handled;

+}

+

+bool LLPopupView::handleRightMouseUp(S32 x, S32 y, MASK mask)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleRightMouseUp, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);

+    if (!handled)

+    {

+        handled = LLPanel::handleRightMouseUp(x, y, mask);

+    }

+    return handled;

+}

+

+bool LLPopupView::handleDoubleClick(S32 x, S32 y, MASK mask)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleDoubleClick, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);

+    if (!handled)

+    {

+        handled = LLPanel::handleDoubleClick(x, y, mask);

+    }

+    return handled;

+}

+

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

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleHover, _1, _2, _3, mask), view_visible_and_enabled, x, y, false);

+    if (!handled)

+    {

+        handled = LLPanel::handleHover(x, y, mask);

+    }

+    return handled;

+}

+

+bool LLPopupView::handleScrollWheel(S32 x, S32 y, S32 clicks)

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleScrollWheel, _1, _2, _3, clicks), view_visible_and_enabled, x, y, false);

+    if (!handled)

+    {

+        handled = LLPanel::handleScrollWheel(x, y, clicks);

+    }

+    return handled;

+}

+

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

+{

+    bool handled = handleMouseEvent(boost::bind(&LLMouseHandler::handleToolTip, _1, _2, _3, mask), view_visible, x, y, false);

+    if (!handled)

+    {

+        handled = LLPanel::handleToolTip(x, y, mask);

+    }

+    return handled;

+}

+

+void LLPopupView::addPopup(LLView* popup)

+{

+    if (popup)

+    {

+        mPopups.remove(popup->getHandle());

+        mPopups.push_front(popup->getHandle());

+    }

+}

+

+void LLPopupView::removePopup(LLView* popup)

+{

+    if (popup)

+    {

+        mPopups.remove(popup->getHandle());

+        popup->onTopLost();

+    }

+}

+

+void LLPopupView::clearPopups()

+{

+    while (!mPopups.empty())

+    {

+        popup_list_t::iterator popup_it = mPopups.begin();

+        LLView* popup = popup_it->get();

+        // Remove before notifying in case it will cause removePopup

+        mPopups.erase(popup_it);

+        if (popup)

+        {

+        popup->onTopLost();

+    }

+}

+}

+