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

diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp
index 4ec56cb092..6a9d15325a 100644
--- a/indra/newview/llfloaterhelpbrowser.cpp
+++ b/indra/newview/llfloaterhelpbrowser.cpp
@@ -1,154 +1,154 @@
-/** 
- * @file llfloaterhelpbrowser.cpp
- * @brief HTML Help floater - uses embedded web browser control
- *
- * $LicenseInfo:firstyear=2006&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 "llfloaterhelpbrowser.h"
-
-#include "llfloaterreg.h"
-#include "llhttpconstants.h"
-#include "llpluginclassmedia.h"
-#include "llmediactrl.h"
-#include "llviewerwindow.h"
-#include "llviewercontrol.h"
-#include "llweb.h"
-#include "llui.h"
-
-#include "llurlhistory.h"
-#include "llviewermedia.h"
-#include "llviewerhelp.h"
-
-
-LLFloaterHelpBrowser::LLFloaterHelpBrowser(const LLSD& key)
-	: LLFloater(key)
-{
-}
-
-bool LLFloaterHelpBrowser::postBuild()
-{
-	mBrowser = getChild<LLMediaCtrl>("browser");
-	mBrowser->addObserver(this);
-	mBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
-
-	childSetAction("open_browser", onClickOpenWebBrowser, this);
-
-	buildURLHistory();
-	return true;
-}
-
-void LLFloaterHelpBrowser::buildURLHistory()
-{
-	// Get all of the entries in the "browser" collection
-	LLSD browser_history = LLURLHistory::getURLHistory("browser");
-
-	// initialize URL history in the plugin
-	LLPluginClassMedia *plugin = mBrowser->getMediaPlugin();
-	if (plugin)
-	{
-		plugin->initializeUrlHistory(browser_history);
-	}
-}
-
-void LLFloaterHelpBrowser::onOpen(const LLSD& key)
-{
-	gSavedSettings.setBOOL("HelpFloaterOpen", true);
-
-	std::string topic = key.asString();
-	mBrowser->navigateTo(LLViewerHelp::instance().getURL(topic));
-}
-
-//virtual
-void LLFloaterHelpBrowser::onClose(bool app_quitting)
-{
-	if (!app_quitting)
-	{
-		gSavedSettings.setBOOL("HelpFloaterOpen", false);
-	}
-	// really really destroy the help browser when it's closed, it'll be recreated.
-	destroy(); // really destroy this dialog on closure, it's relatively heavyweight.
-}
-
-void LLFloaterHelpBrowser::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
-{
-	switch (event) 
-	{
-	case MEDIA_EVENT_LOCATION_CHANGED:
-		setCurrentURL(self->getLocation());
-		break;
-
-	case MEDIA_EVENT_NAVIGATE_BEGIN:
-		getChild<LLUICtrl>("status_text")->setValue(getString("loading_text"));
-		break;
-		
-	case MEDIA_EVENT_NAVIGATE_COMPLETE:
-		getChild<LLUICtrl>("status_text")->setValue(getString("done_text"));
-		break;
-
-	default:
-		break;
-	}
-}
-
-void LLFloaterHelpBrowser::setCurrentURL(const std::string& url)
-{
-	mCurrentURL = url;
-
-	// redirects will navigate momentarily to about:blank, don't add to history
-	if (mCurrentURL != "about:blank")
-	{
-		// Serialize url history
-		LLURLHistory::removeURL("browser", mCurrentURL);
-		LLURLHistory::addURL("browser", mCurrentURL);
-	}
-}
-
-//static 
-void LLFloaterHelpBrowser::onClickClose(void* user_data)
-{
-	LLFloaterHelpBrowser* self = (LLFloaterHelpBrowser*)user_data;
-
-	self->closeFloater();
-}
-
-//static 
-void LLFloaterHelpBrowser::onClickOpenWebBrowser(void* user_data)
-{
-	LLFloaterHelpBrowser* self = (LLFloaterHelpBrowser*)user_data;
-
-	std::string url = self->mCurrentURL.empty() ? 
-		self->mBrowser->getHomePageUrl() :
-		self->mCurrentURL;
-	LLWeb::loadURLExternal(url);
-}
-
-void LLFloaterHelpBrowser::openMedia(const std::string& media_url)
-{
-	// explicitly make the media mime type for this floater since it will
-	// only ever display one type of content (Web).
-	mBrowser->setHomePageUrl(media_url, HTTP_CONTENT_TEXT_HTML);
-	mBrowser->navigateTo(media_url, HTTP_CONTENT_TEXT_HTML);
-	setCurrentURL(media_url);
-}
+/**

+ * @file llfloaterhelpbrowser.cpp

+ * @brief HTML Help floater - uses embedded web browser control

+ *

+ * $LicenseInfo:firstyear=2006&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 "llfloaterhelpbrowser.h"

+

+#include "llfloaterreg.h"

+#include "llhttpconstants.h"

+#include "llpluginclassmedia.h"

+#include "llmediactrl.h"

+#include "llviewerwindow.h"

+#include "llviewercontrol.h"

+#include "llweb.h"

+#include "llui.h"

+

+#include "llurlhistory.h"

+#include "llviewermedia.h"

+#include "llviewerhelp.h"

+

+

+LLFloaterHelpBrowser::LLFloaterHelpBrowser(const LLSD& key)

+    : LLFloater(key)

+{

+}

+

+bool LLFloaterHelpBrowser::postBuild()

+{

+    mBrowser = getChild<LLMediaCtrl>("browser");

+    mBrowser->addObserver(this);

+    mBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));

+

+    childSetAction("open_browser", onClickOpenWebBrowser, this);

+

+    buildURLHistory();

+    return true;

+}

+

+void LLFloaterHelpBrowser::buildURLHistory()

+{

+    // Get all of the entries in the "browser" collection

+    LLSD browser_history = LLURLHistory::getURLHistory("browser");

+

+    // initialize URL history in the plugin

+    LLPluginClassMedia *plugin = mBrowser->getMediaPlugin();

+    if (plugin)

+    {

+        plugin->initializeUrlHistory(browser_history);

+    }

+}

+

+void LLFloaterHelpBrowser::onOpen(const LLSD& key)

+{

+    gSavedSettings.setBOOL("HelpFloaterOpen", true);

+

+    std::string topic = key.asString();

+    mBrowser->navigateTo(LLViewerHelp::instance().getURL(topic));

+}

+

+//virtual

+void LLFloaterHelpBrowser::onClose(bool app_quitting)

+{

+    if (!app_quitting)

+    {

+        gSavedSettings.setBOOL("HelpFloaterOpen", false);

+    }

+    // really really destroy the help browser when it's closed, it'll be recreated.

+    destroy(); // really destroy this dialog on closure, it's relatively heavyweight.

+}

+

+void LLFloaterHelpBrowser::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)

+{

+    switch (event)

+    {

+    case MEDIA_EVENT_LOCATION_CHANGED:

+        setCurrentURL(self->getLocation());

+        break;

+

+    case MEDIA_EVENT_NAVIGATE_BEGIN:

+        getChild<LLUICtrl>("status_text")->setValue(getString("loading_text"));

+        break;

+

+    case MEDIA_EVENT_NAVIGATE_COMPLETE:

+        getChild<LLUICtrl>("status_text")->setValue(getString("done_text"));

+        break;

+

+    default:

+        break;

+    }

+}

+

+void LLFloaterHelpBrowser::setCurrentURL(const std::string& url)

+{

+    mCurrentURL = url;

+

+    // redirects will navigate momentarily to about:blank, don't add to history

+    if (mCurrentURL != "about:blank")

+    {

+        // Serialize url history

+        LLURLHistory::removeURL("browser", mCurrentURL);

+        LLURLHistory::addURL("browser", mCurrentURL);

+    }

+}

+

+//static

+void LLFloaterHelpBrowser::onClickClose(void* user_data)

+{

+    LLFloaterHelpBrowser* self = (LLFloaterHelpBrowser*)user_data;

+

+    self->closeFloater();

+}

+

+//static

+void LLFloaterHelpBrowser::onClickOpenWebBrowser(void* user_data)

+{

+    LLFloaterHelpBrowser* self = (LLFloaterHelpBrowser*)user_data;

+

+    std::string url = self->mCurrentURL.empty() ?

+        self->mBrowser->getHomePageUrl() :

+        self->mCurrentURL;

+    LLWeb::loadURLExternal(url);

+}

+

+void LLFloaterHelpBrowser::openMedia(const std::string& media_url)

+{

+    // explicitly make the media mime type for this floater since it will

+    // only ever display one type of content (Web).

+    mBrowser->setHomePageUrl(media_url, HTTP_CONTENT_TEXT_HTML);

+    mBrowser->navigateTo(media_url, HTTP_CONTENT_TEXT_HTML);

+    setCurrentURL(media_url);

+}