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

diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
index 996f4757e2..b3ab25af5b 100644
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ b/indra/newview/llpanelvoiceeffect.cpp
@@ -1,165 +1,165 @@
-/** 
- * @file llpanelvoiceeffect.cpp
- * @author Aimee
- * @brief Panel to select Voice Morphs.
- *
- * $LicenseInfo:firstyear=2010&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 "llpanelvoiceeffect.h"
-
-#include "llcombobox.h"
-#include "llfloaterreg.h"
-#include "llpanel.h"
-#include "lltrans.h"
-#include "lltransientfloatermgr.h"
-#include "llvoiceclient.h"
-#include "llweb.h"
-
-static LLPanelInjector<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect");
-
-LLPanelVoiceEffect::LLPanelVoiceEffect()
-	: mVoiceEffectCombo(NULL)
-{
-	mCommitCallbackRegistrar.add("Voice.CommitVoiceEffect", boost::bind(&LLPanelVoiceEffect::onCommitVoiceEffect, this));
-}
-
-LLPanelVoiceEffect::~LLPanelVoiceEffect()
-{
-	LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");
-	LLTransientFloaterMgr::getInstance()->removeControlView(combo_list_view);
-
-	if(LLVoiceClient::instanceExists())
-	{
-		LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-		if (effect_interface)
-		{
-			effect_interface->removeObserver(this);
-		}
-	}
-}
-
-// virtual
-bool LLPanelVoiceEffect::postBuild()
-{
-	mVoiceEffectCombo = getChild<LLComboBox>("voice_effect");
-
-	// Need to tell LLTransientFloaterMgr about the combo list, otherwise it can't
-	// be clicked while in a docked floater as it extends outside the floater area.
-	LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");
-	LLTransientFloaterMgr::getInstance()->addControlView(combo_list_view);
-
-	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-	if (effect_interface)
-	{
-		effect_interface->addObserver(this);
-	}
-
-	update(true);
-
-	return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-/// PRIVATE SECTION
-//////////////////////////////////////////////////////////////////////////
-
-void LLPanelVoiceEffect::onCommitVoiceEffect()
-{
-	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-	if (!effect_interface)
-	{
-		mVoiceEffectCombo->setEnabled(false);
-		return;
-	}
-
-	LLSD value = mVoiceEffectCombo->getValue();
-	if (value.asInteger() == PREVIEW_VOICE_EFFECTS)
-	{
-		// Open the Voice Morph preview floater
-		LLFloaterReg::showInstance("voice_effect");
-	}
-	else if (value.asInteger() == GET_VOICE_EFFECTS)
-	{
-		// Open the voice morphing info web page
-		LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
-	}
-	else
-	{
-		effect_interface->setVoiceEffect(value.asUUID());
-	}
-
-	mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());
-}
-
-// virtual
-void LLPanelVoiceEffect::onVoiceEffectChanged(bool effect_list_updated)
-{
-	update(effect_list_updated);
-}
-
-void LLPanelVoiceEffect::update(bool list_updated)
-{
-	if (mVoiceEffectCombo)
-	{
-		LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-		if (!effect_interface) return;
-		if (list_updated)
-		{
-			// Add the default "No Voice Morph" entry.
-			mVoiceEffectCombo->removeall();
-			mVoiceEffectCombo->add(getString("no_voice_effect"), LLUUID::null);
-			mVoiceEffectCombo->addSeparator();
-
-			// Add entries for each Voice Morph.
-			const voice_effect_list_t& effect_list = effect_interface->getVoiceEffectList();
-			if (!effect_list.empty())
-			{
-				for (voice_effect_list_t::const_iterator it = effect_list.begin(); it != effect_list.end(); ++it)
-				{
-					mVoiceEffectCombo->add(it->first, it->second, ADD_BOTTOM);
-				}
-
-				mVoiceEffectCombo->addSeparator();
-			}
-
-			// Add the fixed entries to go to the preview floater or marketing page.
-			mVoiceEffectCombo->add(getString("preview_voice_effects"), PREVIEW_VOICE_EFFECTS);
-			mVoiceEffectCombo->add(getString("get_voice_effects"), GET_VOICE_EFFECTS);
-		}
-
-		if (effect_interface && LLVoiceClient::instance().isVoiceWorking())
-		{
-			// Select the current Voice Morph.
-			mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());
-			mVoiceEffectCombo->setEnabled(true);
-		}
-		else
-		{
-			// If voice isn't working or Voice Effects are not supported disable the control.
-			mVoiceEffectCombo->setValue(LLUUID::null);
-			mVoiceEffectCombo->setEnabled(false);
-		}
-	}
-}
+/**

+ * @file llpanelvoiceeffect.cpp

+ * @author Aimee

+ * @brief Panel to select Voice Morphs.

+ *

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

+

+#include "llcombobox.h"

+#include "llfloaterreg.h"

+#include "llpanel.h"

+#include "lltrans.h"

+#include "lltransientfloatermgr.h"

+#include "llvoiceclient.h"

+#include "llweb.h"

+

+static LLPanelInjector<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect");

+

+LLPanelVoiceEffect::LLPanelVoiceEffect()

+    : mVoiceEffectCombo(NULL)

+{

+    mCommitCallbackRegistrar.add("Voice.CommitVoiceEffect", boost::bind(&LLPanelVoiceEffect::onCommitVoiceEffect, this));

+}

+

+LLPanelVoiceEffect::~LLPanelVoiceEffect()

+{

+    LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");

+    LLTransientFloaterMgr::getInstance()->removeControlView(combo_list_view);

+

+    if(LLVoiceClient::instanceExists())

+    {

+        LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();

+        if (effect_interface)

+        {

+            effect_interface->removeObserver(this);

+        }

+    }

+}

+

+// virtual

+bool LLPanelVoiceEffect::postBuild()

+{

+    mVoiceEffectCombo = getChild<LLComboBox>("voice_effect");

+

+    // Need to tell LLTransientFloaterMgr about the combo list, otherwise it can't

+    // be clicked while in a docked floater as it extends outside the floater area.

+    LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");

+    LLTransientFloaterMgr::getInstance()->addControlView(combo_list_view);

+

+    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();

+    if (effect_interface)

+    {

+        effect_interface->addObserver(this);

+    }

+

+    update(true);

+

+    return true;

+}

+

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

+/// PRIVATE SECTION

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

+

+void LLPanelVoiceEffect::onCommitVoiceEffect()

+{

+    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();

+    if (!effect_interface)

+    {

+        mVoiceEffectCombo->setEnabled(false);

+        return;

+    }

+

+    LLSD value = mVoiceEffectCombo->getValue();

+    if (value.asInteger() == PREVIEW_VOICE_EFFECTS)

+    {

+        // Open the Voice Morph preview floater

+        LLFloaterReg::showInstance("voice_effect");

+    }

+    else if (value.asInteger() == GET_VOICE_EFFECTS)

+    {

+        // Open the voice morphing info web page

+        LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));

+    }

+    else

+    {

+        effect_interface->setVoiceEffect(value.asUUID());

+    }

+

+    mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());

+}

+

+// virtual

+void LLPanelVoiceEffect::onVoiceEffectChanged(bool effect_list_updated)

+{

+    update(effect_list_updated);

+}

+

+void LLPanelVoiceEffect::update(bool list_updated)

+{

+    if (mVoiceEffectCombo)

+    {

+        LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();

+        if (!effect_interface) return;

+        if (list_updated)

+        {

+            // Add the default "No Voice Morph" entry.

+            mVoiceEffectCombo->removeall();

+            mVoiceEffectCombo->add(getString("no_voice_effect"), LLUUID::null);

+            mVoiceEffectCombo->addSeparator();

+

+            // Add entries for each Voice Morph.

+            const voice_effect_list_t& effect_list = effect_interface->getVoiceEffectList();

+            if (!effect_list.empty())

+            {

+                for (voice_effect_list_t::const_iterator it = effect_list.begin(); it != effect_list.end(); ++it)

+                {

+                    mVoiceEffectCombo->add(it->first, it->second, ADD_BOTTOM);

+                }

+

+                mVoiceEffectCombo->addSeparator();

+            }

+

+            // Add the fixed entries to go to the preview floater or marketing page.

+            mVoiceEffectCombo->add(getString("preview_voice_effects"), PREVIEW_VOICE_EFFECTS);

+            mVoiceEffectCombo->add(getString("get_voice_effects"), GET_VOICE_EFFECTS);

+        }

+

+        if (effect_interface && LLVoiceClient::instance().isVoiceWorking())

+        {

+            // Select the current Voice Morph.

+            mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());

+            mVoiceEffectCombo->setEnabled(true);

+        }

+        else

+        {

+            // If voice isn't working or Voice Effects are not supported disable the control.

+            mVoiceEffectCombo->setValue(LLUUID::null);

+            mVoiceEffectCombo->setEnabled(false);

+        }

+    }

+}