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, 162 insertions, 161 deletions

diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
index 98672b7e7b..8641cdc114 100644
--- a/indra/newview/lluploaddialog.cpp
+++ b/indra/newview/lluploaddialog.cpp
@@ -1,161 +1,162 @@
-/** 
- * @file lluploaddialog.cpp
- * @brief LLUploadDialog class implementation
- *
- * $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 "lluploaddialog.h"
-#include "llviewerwindow.h"
-#include "llfontgl.h"
-#include "llresmgr.h"
-#include "lltextbox.h"
-#include "llbutton.h"
-#include "llkeyboard.h"
-#include "llfocusmgr.h"
-#include "llviewercontrol.h"
-#include "llrootview.h"
-
-// static
-LLUploadDialog*	LLUploadDialog::sDialog = NULL;
-
-// static
-LLUploadDialog* LLUploadDialog::modalUploadDialog(const std::string& msg)
-{
-	// Note: object adds, removes, and destroys itself.
-	return new LLUploadDialog(msg);
-}
-
-// static
-void LLUploadDialog::modalUploadFinished()
-{
-	// Note: object adds, removes, and destroys itself.
-	delete LLUploadDialog::sDialog;
-	LLUploadDialog::sDialog = NULL;
-}
-
-////////////////////////////////////////////////////////////
-// Private methods
-
-LLUploadDialog::LLUploadDialog( const std::string& msg)
-  : LLPanel()
-{
-	setBackgroundVisible( true );
-
-	if( LLUploadDialog::sDialog )
-	{
-		delete LLUploadDialog::sDialog;
-	}
-	LLUploadDialog::sDialog = this;
-
-	const LLFontGL* font = LLFontGL::getFontSansSerif();
-	LLRect msg_rect;
-	for (int line_num=0; line_num<16; ++line_num)
-	{
-		LLTextBox::Params params;
-		params.name("Filename");
-		params.rect(msg_rect);
-		params.initial_value("Filename");
-		params.font(font);
-		mLabelBox[line_num] = LLUICtrlFactory::create<LLTextBox> (params);
-		addChild(mLabelBox[line_num]);
-	}
-
-	setMessage(msg);
-
-	// The dialog view is a root view
-	gViewerWindow->addPopup(this);
-}
-
-void LLUploadDialog::setMessage( const std::string& msg)
-{
-	const LLFontGL* font = LLFontGL::getFontSansSerif();
-
-	const S32 VPAD = 16;
-	const S32 HPAD = 25;
-
-	// Make the text boxes a little wider than the text
-	const S32 TEXT_PAD = 8;
-
-	// Split message into lines, separated by '\n'
-	S32 max_msg_width = 0;
-	std::list<std::string> msg_lines;
-
-	S32 size = msg.size() + 1;
-	std::vector<char> temp_msg(size); // non-const copy to make strtok happy
-	strcpy( &temp_msg[0], msg.c_str());
-	char* token = strtok( &temp_msg[0], "\n" );
-	while( token )
-	{
-		std::string tokstr(token);
-		S32 cur_width = S32(font->getWidth(tokstr) + 0.99f) + TEXT_PAD;
-		max_msg_width = llmax( max_msg_width, cur_width );
-		msg_lines.push_back( tokstr );
-		token = strtok( NULL, "\n" );
-	}
-
-	S32 line_height = font->getLineHeight();
-	S32 dialog_width = max_msg_width + 2 * HPAD;
-	S32 dialog_height = line_height * msg_lines.size() + 2 * VPAD;
-
-	reshape( dialog_width, dialog_height, false );
-
-	// Message
-	S32 msg_x = (getRect().getWidth() - max_msg_width) / 2;
-	S32 msg_y = getRect().getHeight() - VPAD - line_height;
-	int line_num;
-	for (line_num=0; line_num<16; ++line_num)
-	{
-		mLabelBox[line_num]->setVisible(false);
-	}
-	line_num = 0;
-	for (std::list<std::string>::iterator iter = msg_lines.begin();
-		 iter != msg_lines.end(); ++iter)
-	{
-		std::string& cur_line = *iter;
-		LLRect msg_rect;
-		msg_rect.setOriginAndSize( msg_x, msg_y, max_msg_width, line_height );
-		mLabelBox[line_num]->setRect(msg_rect);
-		mLabelBox[line_num]->setText(cur_line);
-		mLabelBox[line_num]->setColor( LLUIColorTable::instance().getColor( "LabelTextColor" ) );
-		mLabelBox[line_num]->setVisible(true);
-		msg_y -= line_height;
-		++line_num;
-	}
-
-	centerWithin(gViewerWindow->getRootView()->getRect());
-}
-
-LLUploadDialog::~LLUploadDialog()
-{
-	gFocusMgr.releaseFocusIfNeeded( this );
-
-//    LLFilePicker::instance().reset();
-
-
-	LLUploadDialog::sDialog = NULL;
-}
-
-
-
+/**

+ * @file lluploaddialog.cpp

+ * @brief LLUploadDialog class implementation

+ *

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

+#include "llviewerwindow.h"

+#include "llfontgl.h"

+#include "llresmgr.h"

+#include "lltextbox.h"

+#include "llbutton.h"

+#include "llkeyboard.h"

+#include "llfocusmgr.h"

+#include "llviewercontrol.h"

+#include "llrootview.h"

+

+// static

+LLUploadDialog* LLUploadDialog::sDialog = NULL;

+

+// static

+LLUploadDialog* LLUploadDialog::modalUploadDialog(const std::string& msg)

+{

+    // Note: object adds, removes, and destroys itself.

+    return new LLUploadDialog(msg);

+}

+

+// static

+void LLUploadDialog::modalUploadFinished()

+{

+    // Note: object adds, removes, and destroys itself.

+    delete LLUploadDialog::sDialog;

+    LLUploadDialog::sDialog = NULL;

+}

+

+////////////////////////////////////////////////////////////

+// Private methods

+

+LLUploadDialog::LLUploadDialog( const std::string& msg)

+  : LLPanel()

+{

+    setBackgroundVisible( true );

+

+    if( LLUploadDialog::sDialog )

+    {

+        delete LLUploadDialog::sDialog;

+    }

+    LLUploadDialog::sDialog = this;

+

+    const LLFontGL* font = LLFontGL::getFontSansSerif();

+    LLRect msg_rect;

+    for (int line_num=0; line_num<16; ++line_num)

+    {

+        LLTextBox::Params params;

+        params.name("Filename");

+        params.rect(msg_rect);

+        params.initial_value("Filename");

+        params.font(font);

+        mLabelBox[line_num] = LLUICtrlFactory::create<LLTextBox> (params);

+        addChild(mLabelBox[line_num]);

+    }

+

+    setMessage(msg);

+

+    // The dialog view is a root view

+    gViewerWindow->addPopup(this);

+}

+

+void LLUploadDialog::setMessage( const std::string& msg)

+{

+    const LLFontGL* font = LLFontGL::getFontSansSerif();

+

+    const S32 VPAD = 16;

+    const S32 HPAD = 25;

+

+    // Make the text boxes a little wider than the text

+    const S32 TEXT_PAD = 8;

+

+    // Split message into lines, separated by '\n'

+    S32 max_msg_width = 0;

+    std::list<std::string> msg_lines;

+

+    S32 size = msg.size() + 1;

+    std::vector<char> temp_msg(size); // non-const copy to make strtok happy

+    strcpy( &temp_msg[0], msg.c_str());

+    char* token = strtok( &temp_msg[0], "\n" );

+    while( token )

+    {

+        std::string tokstr(token);

+        S32 cur_width = S32(font->getWidth(tokstr) + 0.99f) + TEXT_PAD;

+        max_msg_width = llmax( max_msg_width, cur_width );

+        msg_lines.push_back( tokstr );

+        token = strtok( NULL, "\n" );

+    }

+

+    S32 line_height = font->getLineHeight();

+    S32 dialog_width = max_msg_width + 2 * HPAD;

+    S32 dialog_height = line_height * msg_lines.size() + 2 * VPAD;

+

+    reshape( dialog_width, dialog_height, false );

+

+    // Message

+    S32 msg_x = (getRect().getWidth() - max_msg_width) / 2;

+    S32 msg_y = getRect().getHeight() - VPAD - line_height;

+    int line_num;

+    for (line_num=0; line_num<16; ++line_num)

+    {

+        mLabelBox[line_num]->setVisible(false);

+    }

+    line_num = 0;

+    for (std::list<std::string>::iterator iter = msg_lines.begin();

+         iter != msg_lines.end(); ++iter)

+    {

+        std::string& cur_line = *iter;

+        LLRect msg_rect;

+        msg_rect.setOriginAndSize( msg_x, msg_y, max_msg_width, line_height );

+        mLabelBox[line_num]->setRect(msg_rect);

+        mLabelBox[line_num]->setText(cur_line);

+        mLabelBox[line_num]->setColor( LLUIColorTable::instance().getColor( "LabelTextColor" ) );

+        mLabelBox[line_num]->setVisible(true);

+        msg_y -= line_height;

+        ++line_num;

+    }

+

+    centerWithin(gViewerWindow->getRootView()->getRect());

+}

+

+LLUploadDialog::~LLUploadDialog()

+{

+    gViewerWindow->removePopup(this);

+    gFocusMgr.releaseFocusIfNeeded( this );

+

+//    LLFilePicker::instance().reset();

+

+

+    LLUploadDialog::sDialog = NULL;

+}

+

+

+