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

diff --git a/indra/newview/llfloaterwindowsize.cpp b/indra/newview/llfloaterwindowsize.cpp
index 1d17654c53..eed9f71f5b 100644
--- a/indra/newview/llfloaterwindowsize.cpp
+++ b/indra/newview/llfloaterwindowsize.cpp
@@ -1,124 +1,124 @@
-/** 
- * @file llfloaterwindowsize.cpp
- *
- * $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 "llfloaterwindowsize.h"
-
-// Viewer includes
-#include "llviewerwindow.h"
-
-// Linden library includes
-#include "llcombobox.h"
-#include "llfloater.h"
-#include "llfloaterreg.h"
-#include "llregex.h"
-#include "lluictrl.h"
-
-// Extract from strings of the form "<width> x <height>", e.g. "640 x 480".
-bool extractWindowSizeFromString(const std::string& instr, U32 *width, U32 *height)
-{
-	boost::cmatch what;
-	// matches (any number)(any non-number)(any number)
-	const boost::regex expression("([0-9]+)[^0-9]+([0-9]+)");
-	if (ll_regex_match(instr.c_str(), what, expression))
-	{
-		*width = atoi(what[1].first);
-		*height = atoi(what[2].first);
-		return true;
-	}
-	
-	*width = 0;
-	*height = 0;
-	return false;
-}
-
-
-LLFloaterWindowSize::LLFloaterWindowSize(const LLSD& key) 
-:	LLFloater(key)
-{}
-
-LLFloaterWindowSize::~LLFloaterWindowSize()
-{}
-
-bool LLFloaterWindowSize::postBuild()
-{
-	center();
-	initWindowSizeControls();
-	getChild<LLUICtrl>("set_btn")->setCommitCallback(
-		boost::bind(&LLFloaterWindowSize::onClickSet, this));
-	getChild<LLUICtrl>("cancel_btn")->setCommitCallback(
-		boost::bind(&LLFloaterWindowSize::onClickCancel, this));
-	setDefaultBtn("set_btn");
-	return true;
-}
-
-void LLFloaterWindowSize::initWindowSizeControls()
-{
-	LLComboBox* ctrl_window_size = getChild<LLComboBox>("window_size_combo");
-	
-	// Look to see if current window size matches existing window sizes, if so then
-	// just set the selection value...
-	const U32 height = gViewerWindow->getWindowHeightRaw();
-	const U32 width = gViewerWindow->getWindowWidthRaw();
-	for (S32 i=0; i < ctrl_window_size->getItemCount(); i++)
-	{
-		U32 height_test = 0;
-		U32 width_test = 0;
-		ctrl_window_size->setCurrentByIndex(i);
-		std::string resolution = ctrl_window_size->getValue().asString();
-		if (extractWindowSizeFromString(resolution, &width_test, &height_test))
-		{
-			if ((height_test == height) && (width_test == width))
-			{
-				return;
-			}
-		}
-	}
-	// ...otherwise, add a new entry with the current window height/width.
-	LLUIString resolution_label = getString("resolution_format");
-	resolution_label.setArg("[RES_X]", llformat("%d", width));
-	resolution_label.setArg("[RES_Y]", llformat("%d", height));
-	ctrl_window_size->add(resolution_label, ADD_TOP);
-	ctrl_window_size->setCurrentByIndex(0);
-}
-
-void LLFloaterWindowSize::onClickSet()
-{
-	LLComboBox* ctrl_window_size = getChild<LLComboBox>("window_size_combo");
-	U32 width = 0;
-	U32 height = 0;
-	std::string resolution = ctrl_window_size->getValue().asString();
-	if (extractWindowSizeFromString(resolution, &width, &height))
-	{
-		LLViewerWindow::movieSize(width, height);
-	}
-	closeFloater();
-}
-
-void LLFloaterWindowSize::onClickCancel()
-{
-	closeFloater();
-}
+/**

+ * @file llfloaterwindowsize.cpp

+ *

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

+

+// Viewer includes

+#include "llviewerwindow.h"

+

+// Linden library includes

+#include "llcombobox.h"

+#include "llfloater.h"

+#include "llfloaterreg.h"

+#include "llregex.h"

+#include "lluictrl.h"

+

+// Extract from strings of the form "<width> x <height>", e.g. "640 x 480".

+bool extractWindowSizeFromString(const std::string& instr, U32 *width, U32 *height)

+{

+    boost::cmatch what;

+    // matches (any number)(any non-number)(any number)

+    const boost::regex expression("([0-9]+)[^0-9]+([0-9]+)");

+    if (ll_regex_match(instr.c_str(), what, expression))

+    {

+        *width = atoi(what[1].first);

+        *height = atoi(what[2].first);

+        return true;

+    }

+

+    *width = 0;

+    *height = 0;

+    return false;

+}

+

+

+LLFloaterWindowSize::LLFloaterWindowSize(const LLSD& key)

+:   LLFloater(key)

+{}

+

+LLFloaterWindowSize::~LLFloaterWindowSize()

+{}

+

+bool LLFloaterWindowSize::postBuild()

+{

+    center();

+    initWindowSizeControls();

+    getChild<LLUICtrl>("set_btn")->setCommitCallback(

+        boost::bind(&LLFloaterWindowSize::onClickSet, this));

+    getChild<LLUICtrl>("cancel_btn")->setCommitCallback(

+        boost::bind(&LLFloaterWindowSize::onClickCancel, this));

+    setDefaultBtn("set_btn");

+    return true;

+}

+

+void LLFloaterWindowSize::initWindowSizeControls()

+{

+    LLComboBox* ctrl_window_size = getChild<LLComboBox>("window_size_combo");

+

+    // Look to see if current window size matches existing window sizes, if so then

+    // just set the selection value...

+    const U32 height = gViewerWindow->getWindowHeightRaw();

+    const U32 width = gViewerWindow->getWindowWidthRaw();

+    for (S32 i=0; i < ctrl_window_size->getItemCount(); i++)

+    {

+        U32 height_test = 0;

+        U32 width_test = 0;

+        ctrl_window_size->setCurrentByIndex(i);

+        std::string resolution = ctrl_window_size->getValue().asString();

+        if (extractWindowSizeFromString(resolution, &width_test, &height_test))

+        {

+            if ((height_test == height) && (width_test == width))

+            {

+                return;

+            }

+        }

+    }

+    // ...otherwise, add a new entry with the current window height/width.

+    LLUIString resolution_label = getString("resolution_format");

+    resolution_label.setArg("[RES_X]", llformat("%d", width));

+    resolution_label.setArg("[RES_Y]", llformat("%d", height));

+    ctrl_window_size->add(resolution_label, ADD_TOP);

+    ctrl_window_size->setCurrentByIndex(0);

+}

+

+void LLFloaterWindowSize::onClickSet()

+{

+    LLComboBox* ctrl_window_size = getChild<LLComboBox>("window_size_combo");

+    U32 width = 0;

+    U32 height = 0;

+    std::string resolution = ctrl_window_size->getValue().asString();

+    if (extractWindowSizeFromString(resolution, &width, &height))

+    {

+        LLViewerWindow::movieSize(width, height);

+    }

+    closeFloater();

+}

+

+void LLFloaterWindowSize::onClickCancel()

+{

+    closeFloater();

+}