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

diff --git a/indra/newview/lltoastscripttextbox.cpp b/indra/newview/lltoastscripttextbox.cpp
index b5f18f7502..9956962e49 100644
--- a/indra/newview/lltoastscripttextbox.cpp
+++ b/indra/newview/lltoastscripttextbox.cpp
@@ -1,132 +1,132 @@
-/**
- * @file lltoastscripttextbox.cpp
- * @brief Panel for script llTextBox dialogs
- *
- * $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 "lltoastscripttextbox.h"
-
-#include "lldbstrings.h"
-#include "lllslconstants.h"
-#include "llnotifications.h"
-#include "llstyle.h"
-#include "lluiconstants.h"
-#include "llviewertexteditor.h"
-
-const S32 LLToastScriptTextbox::DEFAULT_MESSAGE_MAX_LINE_COUNT= 14;
-
-LLToastScriptTextbox::LLToastScriptTextbox(const LLNotificationPtr& notification)
-:	LLToastPanel(notification)
-{
-	buildFromFile( "panel_notify_textbox.xml");
-
-	mInfoText = getChild<LLTextEditor>("text_editor_box");
-	mInfoText->setMaxTextLength(LLToastPanel::MAX_TEXT_LENGTH);
-	mInfoText->setValue(notification->getMessage());
-
-	getChild<LLButton>("ignore_btn")->setClickedCallback(boost::bind(&LLToastScriptTextbox::onClickIgnore, this));
-
-	const LLSD& payload = notification->getPayload();
-
-	//message body
-	const std::string& message = payload["message"].asString();
-
-	LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");
-	pMessageText->clear();
-
-	LLStyle::Params style;
-	style.font = pMessageText->getFont();
-	pMessageText->appendText(message, true, style);
-
-	//submit button
-	LLButton* pSubmitBtn = getChild<LLButton>("btn_submit");
-	pSubmitBtn->setClickedCallback((boost::bind(&LLToastScriptTextbox::onClickSubmit, this)));
-	setDefaultBtn(pSubmitBtn);
-
-	snapToMessageHeight();
-}
-
-// virtual
-LLToastScriptTextbox::~LLToastScriptTextbox()
-{
-}
-
-void LLToastScriptTextbox::close()
-{
-	die();
-}
-
-void LLToastScriptTextbox::onClickSubmit()
-{
-	LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");
-
-	if (pMessageText)
-	{
-		LLSD response = mNotification->getResponseTemplate();
-		response[TEXTBOX_MAGIC_TOKEN] = pMessageText->getText();
-		if (response[TEXTBOX_MAGIC_TOKEN].asString().empty())
-		{
-			// so we can distinguish between a successfully
-			// submitted blank textbox, and an ignored toast
-			response[TEXTBOX_MAGIC_TOKEN] = true;
-		}
-		mNotification->respond(response);
-		close();
-		LL_WARNS() << response << LL_ENDL;
-	}
-}
-
-void LLToastScriptTextbox::onClickIgnore()
-{
-	LLSD response = mNotification->getResponseTemplate();
-	mNotification->respond(response);
-	close();
-}
-
-void LLToastScriptTextbox::snapToMessageHeight()
-{
-	LLPanel* info_pan = getChild<LLPanel>("info_panel");
-	if (!info_pan)
-	{
-		return;
-	}
-
-	S32 maxLinesCount;
-	std::istringstream ss( getString("message_max_lines_count") );
-	if (!(ss >> maxLinesCount))
-	{
-		maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT;
-	}
-
-
-	S32 maxTextHeight = (mInfoText->getFont()->getLineHeight() * maxLinesCount);
-	S32 oldTextHeight = mInfoText->getRect().getHeight();
-	S32 newTextHeight = llmin(mInfoText->getTextBoundingRect().getHeight(), maxTextHeight);
-
-	S32 heightDelta = newTextHeight - oldTextHeight;
-
-	reshape( getRect().getWidth(), llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT));
-	info_pan->reshape(info_pan->getRect().getWidth(),newTextHeight);
-}
+/**

+ * @file lltoastscripttextbox.cpp

+ * @brief Panel for script llTextBox dialogs

+ *

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

+

+#include "lldbstrings.h"

+#include "lllslconstants.h"

+#include "llnotifications.h"

+#include "llstyle.h"

+#include "lluiconstants.h"

+#include "llviewertexteditor.h"

+

+const S32 LLToastScriptTextbox::DEFAULT_MESSAGE_MAX_LINE_COUNT= 14;

+

+LLToastScriptTextbox::LLToastScriptTextbox(const LLNotificationPtr& notification)

+:   LLToastPanel(notification)

+{

+    buildFromFile( "panel_notify_textbox.xml");

+

+    mInfoText = getChild<LLTextEditor>("text_editor_box");

+    mInfoText->setMaxTextLength(LLToastPanel::MAX_TEXT_LENGTH);

+    mInfoText->setValue(notification->getMessage());

+

+    getChild<LLButton>("ignore_btn")->setClickedCallback(boost::bind(&LLToastScriptTextbox::onClickIgnore, this));

+

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

+

+    //message body

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

+

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

+    pMessageText->clear();

+

+    LLStyle::Params style;

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

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

+

+    //submit button

+    LLButton* pSubmitBtn = getChild<LLButton>("btn_submit");

+    pSubmitBtn->setClickedCallback((boost::bind(&LLToastScriptTextbox::onClickSubmit, this)));

+    setDefaultBtn(pSubmitBtn);

+

+    snapToMessageHeight();

+}

+

+// virtual

+LLToastScriptTextbox::~LLToastScriptTextbox()

+{

+}

+

+void LLToastScriptTextbox::close()

+{

+    die();

+}

+

+void LLToastScriptTextbox::onClickSubmit()

+{

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

+

+    if (pMessageText)

+    {

+        LLSD response = mNotification->getResponseTemplate();

+        response[TEXTBOX_MAGIC_TOKEN] = pMessageText->getText();

+        if (response[TEXTBOX_MAGIC_TOKEN].asString().empty())

+        {

+            // so we can distinguish between a successfully

+            // submitted blank textbox, and an ignored toast

+            response[TEXTBOX_MAGIC_TOKEN] = true;

+        }

+        mNotification->respond(response);

+        close();

+        LL_WARNS() << response << LL_ENDL;

+    }

+}

+

+void LLToastScriptTextbox::onClickIgnore()

+{

+    LLSD response = mNotification->getResponseTemplate();

+    mNotification->respond(response);

+    close();

+}

+

+void LLToastScriptTextbox::snapToMessageHeight()

+{

+    LLPanel* info_pan = getChild<LLPanel>("info_panel");

+    if (!info_pan)

+    {

+        return;

+    }

+

+    S32 maxLinesCount;

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

+    if (!(ss >> maxLinesCount))

+    {

+        maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT;

+    }

+

+

+    S32 maxTextHeight = (mInfoText->getFont()->getLineHeight() * maxLinesCount);

+    S32 oldTextHeight = mInfoText->getRect().getHeight();

+    S32 newTextHeight = llmin(mInfoText->getTextBoundingRect().getHeight(), maxTextHeight);

+

+    S32 heightDelta = newTextHeight - oldTextHeight;

+

+    reshape( getRect().getWidth(), llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT));

+    info_pan->reshape(info_pan->getRect().getWidth(),newTextHeight);

+}