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

diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp
index 38272098a3..14ea42e7f4 100644
--- a/indra/newview/llinspecttoast.cpp
+++ b/indra/newview/llinspecttoast.cpp
@@ -1,152 +1,152 @@
-/** 
- * @file llinspecttoast.cpp
- * @brief Toast inspector implementation.
- *
- * $LicenseInfo:firstyear=2003&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" // must be first include
-
-#include "llinspecttoast.h"
-#include "llinspect.h"
-#include "llfloaterreg.h"
-#include "llscreenchannel.h"
-#include "llchannelmanager.h"
-#include "lltransientfloatermgr.h"
-
-using namespace LLNotificationsUI;
-
-/**
- * Represents inspectable toast .
- */
-class LLInspectToast: public LLInspect
-{
-public:
-
-	LLInspectToast(const LLSD& notification_idl);
-	virtual ~LLInspectToast();
-
-	/*virtual*/ void onOpen(const LLSD& notification_id);
-	/*virtual*/ bool handleToolTip(S32 x, S32 y, MASK mask);
-    /*virtual*/ void deleteAllChildren();
-	/*virtual*/ void removeChild(LLView* child);
-private:
-	void onToastDestroy(LLToast * toast);
-
-	boost::signals2::scoped_connection mConnection;
-	LLPanel* mPanel;
-	LLScreenChannel* mScreenChannel;
-};
-
-LLInspectToast::LLInspectToast(const LLSD& notification_id) :
-	LLInspect(LLSD()), mPanel(NULL)
-{
-	LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(
-																LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
-	mScreenChannel = dynamic_cast<LLScreenChannel*>(channel);
-	if(NULL == mScreenChannel)
-	{
-		LL_WARNS() << "Could not get requested screen channel." << LL_ENDL;
-		return;
-	}
-
-	LLTransientFloaterMgr::getInstance()->addControlView(this);
-}
-LLInspectToast::~LLInspectToast()
-{
-	LLTransientFloaterMgr::getInstance()->removeControlView(this);
-
-	mConnection.disconnect();
-}
-
-// virtual
-void LLInspectToast::onOpen(const LLSD& notification_id)
-{
-	LLInspect::onOpen(notification_id);
-	LLToast* toast = mScreenChannel->getToastByNotificationID(notification_id);
-	if (toast == NULL)
-	{
-		LL_WARNS() << "Could not get requested toast  from screen channel." << LL_ENDL;
-		return;
-	}
-	mConnection = toast->setOnToastDestroyedCallback(boost::bind(&LLInspectToast::onToastDestroy, this, _1));
-
-	LLPanel * panel = toast->getPanel();
-	if (panel == NULL)
-	{
-		LL_WARNS() << "Could not get toast's panel." << LL_ENDL;
-		return;
-	}
-	panel->setVisible(true);
-	panel->setMouseOpaque(false);
-	if(mPanel != NULL && mPanel->getParent() == this)
-	{
-		LLInspect::removeChild(mPanel);
-	}
-	addChild(panel);
-	panel->setFocus(true);
-	mPanel = panel;
-
-
-	LLRect panel_rect;
-	panel_rect = panel->getRect();
-	reshape(panel_rect.getWidth(), panel_rect.getHeight());
-
-	LLInspect::repositionInspector(notification_id);
-}
-
-// virtual
-bool LLInspectToast::handleToolTip(S32 x, S32 y, MASK mask)
-{
-	// We don't like the way LLInspect handles tooltips
-	// (black tooltips look weird),
-	// so force using the default implementation (STORM-511).
-	return LLFloater::handleToolTip(x, y, mask);
-}
-
-void LLInspectToast::deleteAllChildren()
-{
-    mPanel = NULL;
-    LLInspect::deleteAllChildren();
-}
-
-// virtual
-void LLInspectToast::removeChild(LLView* child)
-{
-	if (mPanel == child)
-	{
-		mPanel = NULL;
-	}
-	LLInspect::removeChild(child);
-}
-
-void LLInspectToast::onToastDestroy(LLToast * toast)
-{
-	closeFloater(false);
-}
-
-void LLNotificationsUI::registerFloater()
-{
-	LLFloaterReg::add("inspect_toast", "inspect_toast.xml",
-			&LLFloaterReg::build<LLInspectToast>);
-}
-
+/**

+ * @file llinspecttoast.cpp

+ * @brief Toast inspector implementation.

+ *

+ * $LicenseInfo:firstyear=2003&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" // must be first include

+

+#include "llinspecttoast.h"

+#include "llinspect.h"

+#include "llfloaterreg.h"

+#include "llscreenchannel.h"

+#include "llchannelmanager.h"

+#include "lltransientfloatermgr.h"

+

+using namespace LLNotificationsUI;

+

+/**

+ * Represents inspectable toast .

+ */

+class LLInspectToast: public LLInspect

+{

+public:

+

+    LLInspectToast(const LLSD& notification_idl);

+    virtual ~LLInspectToast();

+

+    /*virtual*/ void onOpen(const LLSD& notification_id);

+    /*virtual*/ bool handleToolTip(S32 x, S32 y, MASK mask);

+    /*virtual*/ void deleteAllChildren();

+    /*virtual*/ void removeChild(LLView* child);

+private:

+    void onToastDestroy(LLToast * toast);

+

+    boost::signals2::scoped_connection mConnection;

+    LLPanel* mPanel;

+    LLScreenChannel* mScreenChannel;

+};

+

+LLInspectToast::LLInspectToast(const LLSD& notification_id) :

+    LLInspect(LLSD()), mPanel(NULL)

+{

+    LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(

+        LLNotificationsUI::NOTIFICATION_CHANNEL_UUID);

+    mScreenChannel = dynamic_cast<LLScreenChannel*>(channel);

+    if(NULL == mScreenChannel)

+    {

+        LL_WARNS() << "Could not get requested screen channel." << LL_ENDL;

+        return;

+    }

+

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

+}

+LLInspectToast::~LLInspectToast()

+{

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

+

+    mConnection.disconnect();

+}

+

+// virtual

+void LLInspectToast::onOpen(const LLSD& notification_id)

+{

+    LLInspect::onOpen(notification_id);

+    LLToast* toast = mScreenChannel->getToastByNotificationID(notification_id);

+    if (toast == NULL)

+    {

+        LL_WARNS() << "Could not get requested toast  from screen channel." << LL_ENDL;

+        return;

+    }

+    mConnection = toast->setOnToastDestroyedCallback(boost::bind(&LLInspectToast::onToastDestroy, this, _1));

+

+    LLPanel * panel = toast->getPanel();

+    if (panel == NULL)

+    {

+        LL_WARNS() << "Could not get toast's panel." << LL_ENDL;

+        return;

+    }

+    panel->setVisible(true);

+    panel->setMouseOpaque(false);

+    if(mPanel != NULL && mPanel->getParent() == this)

+    {

+        LLInspect::removeChild(mPanel);

+    }

+    addChild(panel);

+    panel->setFocus(true);

+    mPanel = panel;

+

+

+    LLRect panel_rect;

+    panel_rect = panel->getRect();

+    reshape(panel_rect.getWidth(), panel_rect.getHeight());

+

+    LLInspect::repositionInspector(notification_id);

+}

+

+// virtual

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

+{

+    // We don't like the way LLInspect handles tooltips

+    // (black tooltips look weird),

+    // so force using the default implementation (STORM-511).

+    return LLFloater::handleToolTip(x, y, mask);

+}

+

+void LLInspectToast::deleteAllChildren()

+{

+    mPanel = NULL;

+    LLInspect::deleteAllChildren();

+}

+

+// virtual

+void LLInspectToast::removeChild(LLView* child)

+{

+    if (mPanel == child)

+    {

+        mPanel = NULL;

+    }

+    LLInspect::removeChild(child);

+}

+

+void LLInspectToast::onToastDestroy(LLToast * toast)

+{

+    closeFloater(false);

+}

+

+void LLNotificationsUI::registerFloater()

+{

+    LLFloaterReg::add("inspect_toast", "inspect_toast.xml",

+            &LLFloaterReg::build<LLInspectToast>);

+}

+