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

diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index 047aa5192c..b6e912bd84 100644
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -1,221 +1,221 @@
-/**
- * @file lltoastgroupnotifypanel.cpp
- * @brief Panel for group notify toasts.
- *
- * $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 "lltoastgroupnotifypanel.h"
-
-#include "llfocusmgr.h"
-
-#include "llbutton.h"
-#include "llgroupiconctrl.h"
-#include "llinventoryfunctions.h"
-#include "llinventoryicon.h"
-#include "llnotifications.h"
-#include "llviewertexteditor.h"
-
-#include "llavatarnamecache.h"
-#include "lluiconstants.h"
-#include "llui.h"
-#include "llviewercontrol.h"
-#include "lltrans.h"
-#include "llstyle.h"
-
-#include "llglheaders.h"
-#include "llagent.h"
-#include "llavatariconctrl.h"
-#include "llinventorytype.h"
-
-const S32 LLToastGroupNotifyPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT	= 7;
-
-LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notification)
-:	LLToastPanel(notification),
-	mInventoryOffer(NULL)
-{
-	buildFromFile( "panel_group_notify.xml");
-	const LLSD& payload = notification->getPayload();
-	LLGroupData groupData;
-	if (!gAgent.getGroupData(payload["group_id"].asUUID(),groupData))
-	{
-		LL_WARNS() << "Group notice for unknown group: " << payload["group_id"].asUUID() << LL_ENDL;
-	}
-
-	//group icon
-	LLGroupIconCtrl* pGroupIcon = getChild<LLGroupIconCtrl>("group_icon", true);
-
-	// We should already have this data preloaded, so no sense in setting icon through setValue(group_id)
-	pGroupIcon->setIconId(groupData.mInsigniaID);
-
-	//header title
-	std::string from_name = payload["sender_name"].asString();
-	from_name = LLCacheName::buildUsername(from_name);
-
-	std::stringstream from;
-	from << from_name << "/" << groupData.mName;
-	LLTextBox* pTitleText = getChild<LLTextBox>("title");
-	pTitleText->setValue(from.str());
-	pTitleText->setToolTip(from.str());
-
-	//message subject
-	const std::string& subject = payload["subject"].asString();
-	//message body
-	const std::string& message = payload["message"].asString();
-
-	std::string timeStr = "[" + LLTrans::getString("TimeWeek") + "], ["
-							  + LLTrans::getString("TimeMonth") + "]/["
-							  + LLTrans::getString("TimeDay") + "]/["
-							  + LLTrans::getString("TimeYear") + "] ["
-							  + LLTrans::getString("TimeHour") + "]:["
-							  + LLTrans::getString("TimeMin") + "] ["
-							  + LLTrans::getString("TimeTimezone") + "]";
-
-	const LLDate timeStamp = notification->getDate();
-	LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate();
-	LLSD substitution;
-	substitution["datetime"] = (S32) notice_date.secondsSinceEpoch();
-	LLStringUtil::format(timeStr, substitution);
-
-	LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");
-	pMessageText->setContentTrusted(false);
-	pMessageText->clear();
-
-	LLStyle::Params style;
-	LLFontGL* subject_font = LLFontGL::getFontByName(getString("subject_font"));
-	if (subject_font) 
-		style.font = subject_font;
-	pMessageText->appendText(subject, false, style);
-
-	LLFontGL* date_font = LLFontGL::getFontByName(getString("date_font"));
-	if (date_font)
-		style.font = date_font;
-	pMessageText->appendText(timeStr + "\n", true, style);
-	
-	style.font = pMessageText->getFont();
-	pMessageText->appendText(message, true, style);
-
-	//attachment
-	bool hasInventory = payload["inventory_offer"].isDefined();
-
-	//attachment text
-	LLTextBox * pAttachLink = getChild<LLTextBox>("attachment");
-	//attachment icon
-	LLIconCtrl* pAttachIcon = getChild<LLIconCtrl>("attachment_icon", true);
-
-	//If attachment is empty let it be invisible and not take place at the panel
-	pAttachLink->setVisible(hasInventory);
-	pAttachIcon->setVisible(hasInventory);
-	if (hasInventory) {
-		pAttachLink->setValue(payload["inventory_name"]);
-
-		mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]);
-		getChild<LLTextBox>("attachment")->setClickedCallback(boost::bind(
-				&LLToastGroupNotifyPanel::onClickAttachment, this));
-
-		LLUIImagePtr attachIconImg = LLInventoryIcon::getIcon(mInventoryOffer->mType,
-												LLInventoryType::IT_TEXTURE);
-		pAttachIcon->setValue(attachIconImg->getName());
-	}
-
-	//ok button
-	LLButton* pOkBtn = getChild<LLButton>("btn_ok");
-	pOkBtn->setClickedCallback((boost::bind(&LLToastGroupNotifyPanel::onClickOk, this)));
-	setDefaultBtn(pOkBtn);
-
-	S32 maxLinesCount;
-	std::istringstream ss( getString("message_max_lines_count") );
-	if (!(ss >> maxLinesCount))
-	{
-		maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT;
-	}
-	snapToMessageHeight(pMessageText, maxLinesCount);
-}
-
-// virtual
-LLToastGroupNotifyPanel::~LLToastGroupNotifyPanel()
-{
-}
-
-void LLToastGroupNotifyPanel::close()
-{
-	// The group notice dialog may be an inventory offer.
-	// If it has an inventory save button and that button is still enabled
-	// Then we need to send the inventory declined message
-	if(mInventoryOffer != NULL)
-	{
-		mInventoryOffer->forceResponse(IOR_DECLINE);
-		mInventoryOffer = NULL;
-	}
-
-	die();
-}
-
-void LLToastGroupNotifyPanel::onClickOk()
-{
-	LLSD response = mNotification->getResponseTemplate();
-	mNotification->respond(response);
-	close();
-}
-
-void LLToastGroupNotifyPanel::onClickAttachment()
-{
-	if (mInventoryOffer != NULL) {
-		mInventoryOffer->forceResponse(IOR_ACCEPT);
-
-		LLTextBox * pAttachLink = getChild<LLTextBox> ("attachment");
-		static const LLUIColor textColor = LLUIColorTable::instance().getColor(
-				"GroupNotifyDimmedTextColor");
-		pAttachLink->setColor(textColor);
-
-		LLIconCtrl* pAttachIcon =
-				getChild<LLIconCtrl> ("attachment_icon", true);
-		pAttachIcon->setEnabled(false);
-
-		//if attachment isn't openable - notify about saving
-		if (!isAttachmentOpenable(mInventoryOffer->mType)) {
-			LLNotifications::instance().add("AttachmentSaved", LLSD(), LLSD());
-		}
-
-		mInventoryOffer = NULL;
-	}
-}
-
-//static
-bool LLToastGroupNotifyPanel::isAttachmentOpenable(LLAssetType::EType type)
-{
-	switch(type)
-	{
-	case LLAssetType::AT_LANDMARK:
-	case LLAssetType::AT_NOTECARD:
-	case LLAssetType::AT_IMAGE_JPEG:
-	case LLAssetType::AT_IMAGE_TGA:
-	case LLAssetType::AT_TEXTURE:
-	case LLAssetType::AT_TEXTURE_TGA:
-		return true;
-	default:
-		return false;
-	}
-}
-
+/**

+ * @file lltoastgroupnotifypanel.cpp

+ * @brief Panel for group notify toasts.

+ *

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

+

+#include "llfocusmgr.h"

+

+#include "llbutton.h"

+#include "llgroupiconctrl.h"

+#include "llinventoryfunctions.h"

+#include "llinventoryicon.h"

+#include "llnotifications.h"

+#include "llviewertexteditor.h"

+

+#include "llavatarnamecache.h"

+#include "lluiconstants.h"

+#include "llui.h"

+#include "llviewercontrol.h"

+#include "lltrans.h"

+#include "llstyle.h"

+

+#include "llglheaders.h"

+#include "llagent.h"

+#include "llavatariconctrl.h"

+#include "llinventorytype.h"

+

+const S32 LLToastGroupNotifyPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT   = 7;

+

+LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notification)

+:   LLToastPanel(notification),

+    mInventoryOffer(NULL)

+{

+    buildFromFile( "panel_group_notify.xml");

+    const LLSD& payload = notification->getPayload();

+    LLGroupData groupData;

+    if (!gAgent.getGroupData(payload["group_id"].asUUID(),groupData))

+    {

+        LL_WARNS() << "Group notice for unknown group: " << payload["group_id"].asUUID() << LL_ENDL;

+    }

+

+    //group icon

+    LLGroupIconCtrl* pGroupIcon = getChild<LLGroupIconCtrl>("group_icon", true);

+

+    // We should already have this data preloaded, so no sense in setting icon through setValue(group_id)

+    pGroupIcon->setIconId(groupData.mInsigniaID);

+

+    //header title

+    std::string from_name = payload["sender_name"].asString();

+    from_name = LLCacheName::buildUsername(from_name);

+

+    std::stringstream from;

+    from << from_name << "/" << groupData.mName;

+    LLTextBox* pTitleText = getChild<LLTextBox>("title");

+    pTitleText->setValue(from.str());

+    pTitleText->setToolTip(from.str());

+

+    //message subject

+    const std::string& subject = payload["subject"].asString();

+    //message body

+    const std::string& message = payload["message"].asString();

+

+    std::string timeStr = "[" + LLTrans::getString("TimeWeek") + "], ["

+                              + LLTrans::getString("TimeMonth") + "]/["

+                              + LLTrans::getString("TimeDay") + "]/["

+                              + LLTrans::getString("TimeYear") + "] ["

+                              + LLTrans::getString("TimeHour") + "]:["

+                              + LLTrans::getString("TimeMin") + "] ["

+                              + LLTrans::getString("TimeTimezone") + "]";

+

+    const LLDate timeStamp = notification->getDate();

+    LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate();

+    LLSD substitution;

+    substitution["datetime"] = (S32) notice_date.secondsSinceEpoch();

+    LLStringUtil::format(timeStr, substitution);

+

+    LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");

+    pMessageText->setContentTrusted(false);

+    pMessageText->clear();

+

+    LLStyle::Params style;

+    LLFontGL* subject_font = LLFontGL::getFontByName(getString("subject_font"));

+    if (subject_font)

+        style.font = subject_font;

+    pMessageText->appendText(subject, false, style);

+

+    LLFontGL* date_font = LLFontGL::getFontByName(getString("date_font"));

+    if (date_font)

+        style.font = date_font;

+    pMessageText->appendText(timeStr + "\n", true, style);

+

+    style.font = pMessageText->getFont();

+    pMessageText->appendText(message, true, style);

+

+    //attachment

+    bool hasInventory = payload["inventory_offer"].isDefined();

+

+    //attachment text

+    LLTextBox * pAttachLink = getChild<LLTextBox>("attachment");

+    //attachment icon

+    LLIconCtrl* pAttachIcon = getChild<LLIconCtrl>("attachment_icon", true);

+

+    //If attachment is empty let it be invisible and not take place at the panel

+    pAttachLink->setVisible(hasInventory);

+    pAttachIcon->setVisible(hasInventory);

+    if (hasInventory) {

+        pAttachLink->setValue(payload["inventory_name"]);

+

+        mInventoryOffer = new LLOfferInfo(payload["inventory_offer"]);

+        getChild<LLTextBox>("attachment")->setClickedCallback(boost::bind(

+                &LLToastGroupNotifyPanel::onClickAttachment, this));

+

+        LLUIImagePtr attachIconImg = LLInventoryIcon::getIcon(mInventoryOffer->mType,

+                                                LLInventoryType::IT_TEXTURE);

+        pAttachIcon->setValue(attachIconImg->getName());

+    }

+

+    //ok button

+    LLButton* pOkBtn = getChild<LLButton>("btn_ok");

+    pOkBtn->setClickedCallback((boost::bind(&LLToastGroupNotifyPanel::onClickOk, this)));

+    setDefaultBtn(pOkBtn);

+

+    S32 maxLinesCount;

+    std::istringstream ss( getString("message_max_lines_count") );

+    if (!(ss >> maxLinesCount))

+    {

+        maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT;

+    }

+    snapToMessageHeight(pMessageText, maxLinesCount);

+}

+

+// virtual

+LLToastGroupNotifyPanel::~LLToastGroupNotifyPanel()

+{

+}

+

+void LLToastGroupNotifyPanel::close()

+{

+    // The group notice dialog may be an inventory offer.

+    // If it has an inventory save button and that button is still enabled

+    // Then we need to send the inventory declined message

+    if(mInventoryOffer != NULL)

+    {

+        mInventoryOffer->forceResponse(IOR_DECLINE);

+        mInventoryOffer = NULL;

+    }

+

+    die();

+}

+

+void LLToastGroupNotifyPanel::onClickOk()

+{

+    LLSD response = mNotification->getResponseTemplate();

+    mNotification->respond(response);

+    close();

+}

+

+void LLToastGroupNotifyPanel::onClickAttachment()

+{

+    if (mInventoryOffer != NULL) {

+        mInventoryOffer->forceResponse(IOR_ACCEPT);

+

+        LLTextBox * pAttachLink = getChild<LLTextBox> ("attachment");

+        static const LLUIColor textColor = LLUIColorTable::instance().getColor(

+                "GroupNotifyDimmedTextColor");

+        pAttachLink->setColor(textColor);

+

+        LLIconCtrl* pAttachIcon =

+                getChild<LLIconCtrl> ("attachment_icon", true);

+        pAttachIcon->setEnabled(false);

+

+        //if attachment isn't openable - notify about saving

+        if (!isAttachmentOpenable(mInventoryOffer->mType)) {

+            LLNotifications::instance().add("AttachmentSaved", LLSD(), LLSD());

+        }

+

+        mInventoryOffer = NULL;

+    }

+}

+

+//static

+bool LLToastGroupNotifyPanel::isAttachmentOpenable(LLAssetType::EType type)

+{

+    switch(type)

+    {

+    case LLAssetType::AT_LANDMARK:

+    case LLAssetType::AT_NOTECARD:

+    case LLAssetType::AT_IMAGE_JPEG:

+    case LLAssetType::AT_IMAGE_TGA:

+    case LLAssetType::AT_TEXTURE:

+    case LLAssetType::AT_TEXTURE_TGA:

+        return true;

+    default:

+        return false;

+    }

+}

+