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

diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp
index 706bf02df2..fb982ae88e 100644
--- a/indra/newview/llpanellandaudio.cpp
+++ b/indra/newview/llpanellandaudio.cpp
@@ -1,212 +1,212 @@
-/**
- * @file llpanellandaudio.cpp
- * @brief Allows configuration of "media" for a land parcel,
- *   for example movies, web pages, and audio.
- *
- * $LicenseInfo:firstyear=2007&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 "llpanellandaudio.h"
-
-// viewer includes
-#include "llmimetypes.h"
-#include "llviewerparcelmgr.h"
-#include "llviewerregion.h"
-#include "lluictrlfactory.h"
-
-// library includes
-#include "llcheckboxctrl.h"
-#include "llcombobox.h"
-#include "llfloaterurlentry.h"
-#include "llfocusmgr.h"
-#include "lllineeditor.h"
-#include "llparcel.h"
-#include "lltextbox.h"
-#include "llradiogroup.h"
-#include "llspinctrl.h"
-#include "llsdutil.h"
-#include "lltexturectrl.h"
-#include "roles_constants.h"
-#include "llscrolllistctrl.h"
-
-// Values for the parcel voice settings radio group
-enum
-{
-	kRadioVoiceChatEstate = 0,
-	kRadioVoiceChatPrivate = 1,
-	kRadioVoiceChatDisable = 2
-};
-
-//---------------------------------------------------------------------------
-// LLPanelLandAudio
-//---------------------------------------------------------------------------
-
-LLPanelLandAudio::LLPanelLandAudio(LLParcelSelectionHandle& parcel)
-:	LLPanel(/*std::string("land_media_panel")*/), mParcel(parcel)
-{
-}
-
-
-// virtual
-LLPanelLandAudio::~LLPanelLandAudio()
-{
-}
-
-
-bool LLPanelLandAudio::postBuild()
-{
-	mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
-	childSetCommitCallback("check sound local", onCommitAny, this);
-
-	mCheckParcelEnableVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel");
-	childSetCommitCallback("parcel_enable_voice_channel", onCommitAny, this);
-
-	// This one is always disabled so no need for a commit callback
-	mCheckEstateDisabledVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_is_estate_disabled");
-
-	mCheckParcelVoiceLocal = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_local");
-	childSetCommitCallback("parcel_enable_voice_channel_local", onCommitAny, this);
-
-	mMusicURLEdit = getChild<LLLineEditor>("music_url");
-	childSetCommitCallback("music_url", onCommitAny, this);
-
-	mCheckAVSoundAny = getChild<LLCheckBoxCtrl>("all av sound check");
-	childSetCommitCallback("all av sound check", onCommitAny, this);
-
-	mCheckAVSoundGroup = getChild<LLCheckBoxCtrl>("group av sound check");
-	childSetCommitCallback("group av sound check", onCommitAny, this);
-
-    mCheckObscureMOAP = getChild<LLCheckBoxCtrl>("obscure_moap");
-    childSetCommitCallback("obscure_moap", onCommitAny, this);
-
-	return true;
-}
-
-
-// public
-void LLPanelLandAudio::refresh()
-{
-	LLParcel *parcel = mParcel->getParcel();
-
-	if (!parcel)
-	{
-		clearCtrls();
-	}
-	else
-	{
-		// something selected, hooray!
-
-		// Display options
-		bool can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
-
-		mCheckSoundLocal->set( parcel->getSoundLocal() );
-		mCheckSoundLocal->setEnabled( can_change_media );
-
-		bool allow_voice = parcel->getParcelFlagAllowVoice();
-
-		LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
-		if (region && region->isVoiceEnabled())
-		{
-			mCheckEstateDisabledVoice->setVisible(false);
-
-			mCheckParcelEnableVoice->setVisible(true);
-			mCheckParcelEnableVoice->setEnabled( can_change_media );
-			mCheckParcelEnableVoice->set(allow_voice);
-
-			mCheckParcelVoiceLocal->setEnabled( can_change_media && allow_voice );
-		}
-		else
-		{
-			// Voice disabled at estate level, overrides parcel settings
-			// Replace the parcel voice checkbox with a disabled one
-			// labelled with an explanatory message
-			mCheckEstateDisabledVoice->setVisible(true);
-
-			mCheckParcelEnableVoice->setVisible(false);
-			mCheckParcelEnableVoice->setEnabled(false);
-			mCheckParcelVoiceLocal->setEnabled(false);
-		}
-
-		mCheckParcelEnableVoice->set(allow_voice);
-		mCheckParcelVoiceLocal->set(!parcel->getParcelFlagUseEstateVoiceChannel());
-
-		mMusicURLEdit->setText(parcel->getMusicURL());
-		mMusicURLEdit->setEnabled( can_change_media );
-
-		bool can_change_av_sounds = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS) && parcel->getHaveNewParcelLimitData();
-		mCheckAVSoundAny->set(parcel->getAllowAnyAVSounds());
-		mCheckAVSoundAny->setEnabled(can_change_av_sounds);
-
-		mCheckAVSoundGroup->set(parcel->getAllowGroupAVSounds() || parcel->getAllowAnyAVSounds());	// On if "Everyone" is on
-		mCheckAVSoundGroup->setEnabled(can_change_av_sounds && !parcel->getAllowAnyAVSounds());		// Enabled if "Everyone" is off
-
-        mCheckObscureMOAP->set(parcel->getObscureMOAP());
-        mCheckObscureMOAP->setEnabled(can_change_media);
-	}
-}
-// static
-void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
-{
-	LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
-
-	LLParcel* parcel = self->mParcel->getParcel();
-	if (!parcel)
-	{
-		return;
-	}
-
-	// Extract data from UI
-	bool sound_local		= self->mCheckSoundLocal->get();
-	std::string music_url	= self->mMusicURLEdit->getText();
-
-	bool voice_enabled = self->mCheckParcelEnableVoice->get();
-	bool voice_estate_chan = !self->mCheckParcelVoiceLocal->get();
-
-	bool any_av_sound		= self->mCheckAVSoundAny->get();
-	bool group_av_sound		= true;		// If set to "Everyone" then group is checked as well
-	if (!any_av_sound)
-	{	// If "Everyone" is off, use the value from the checkbox
-		group_av_sound = self->mCheckAVSoundGroup->get();
-	}
-
-    bool obscure_moap = self->mCheckObscureMOAP->get();
-
-	// Remove leading/trailing whitespace (common when copying/pasting)
-	LLStringUtil::trim(music_url);
-
-	// Push data into current parcel
-	parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);
-	parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
-	parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
-	parcel->setMusicURL(music_url);
-	parcel->setAllowAnyAVSounds(any_av_sound);
-	parcel->setAllowGroupAVSounds(group_av_sound);
-    parcel->setObscureMOAP(obscure_moap);
-
-	// Send current parcel data upstream to server
-	LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
-
-	// Might have changed properties, so let's redraw!
-	self->refresh();
-}
+/**

+ * @file llpanellandaudio.cpp

+ * @brief Allows configuration of "media" for a land parcel,

+ *   for example movies, web pages, and audio.

+ *

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

+

+// viewer includes

+#include "llmimetypes.h"

+#include "llviewerparcelmgr.h"

+#include "llviewerregion.h"

+#include "lluictrlfactory.h"

+

+// library includes

+#include "llcheckboxctrl.h"

+#include "llcombobox.h"

+#include "llfloaterurlentry.h"

+#include "llfocusmgr.h"

+#include "lllineeditor.h"

+#include "llparcel.h"

+#include "lltextbox.h"

+#include "llradiogroup.h"

+#include "llspinctrl.h"

+#include "llsdutil.h"

+#include "lltexturectrl.h"

+#include "roles_constants.h"

+#include "llscrolllistctrl.h"

+

+// Values for the parcel voice settings radio group

+enum

+{

+    kRadioVoiceChatEstate = 0,

+    kRadioVoiceChatPrivate = 1,

+    kRadioVoiceChatDisable = 2

+};

+

+//---------------------------------------------------------------------------

+// LLPanelLandAudio

+//---------------------------------------------------------------------------

+

+LLPanelLandAudio::LLPanelLandAudio(LLParcelSelectionHandle& parcel)

+:   LLPanel(/*std::string("land_media_panel")*/), mParcel(parcel)

+{

+}

+

+

+// virtual

+LLPanelLandAudio::~LLPanelLandAudio()

+{

+}

+

+

+bool LLPanelLandAudio::postBuild()

+{

+    mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");

+    childSetCommitCallback("check sound local", onCommitAny, this);

+

+    mCheckParcelEnableVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel");

+    childSetCommitCallback("parcel_enable_voice_channel", onCommitAny, this);

+

+    // This one is always disabled so no need for a commit callback

+    mCheckEstateDisabledVoice = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_is_estate_disabled");

+

+    mCheckParcelVoiceLocal = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_local");

+    childSetCommitCallback("parcel_enable_voice_channel_local", onCommitAny, this);

+

+    mMusicURLEdit = getChild<LLLineEditor>("music_url");

+    childSetCommitCallback("music_url", onCommitAny, this);

+

+    mCheckAVSoundAny = getChild<LLCheckBoxCtrl>("all av sound check");

+    childSetCommitCallback("all av sound check", onCommitAny, this);

+

+    mCheckAVSoundGroup = getChild<LLCheckBoxCtrl>("group av sound check");

+    childSetCommitCallback("group av sound check", onCommitAny, this);

+

+    mCheckObscureMOAP = getChild<LLCheckBoxCtrl>("obscure_moap");

+    childSetCommitCallback("obscure_moap", onCommitAny, this);

+

+    return true;

+}

+

+

+// public

+void LLPanelLandAudio::refresh()

+{

+    LLParcel *parcel = mParcel->getParcel();

+

+    if (!parcel)

+    {

+        clearCtrls();

+    }

+    else

+    {

+        // something selected, hooray!

+

+        // Display options

+        bool can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);

+

+        mCheckSoundLocal->set( parcel->getSoundLocal() );

+        mCheckSoundLocal->setEnabled( can_change_media );

+

+        bool allow_voice = parcel->getParcelFlagAllowVoice();

+

+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();

+        if (region && region->isVoiceEnabled())

+        {

+            mCheckEstateDisabledVoice->setVisible(false);

+

+            mCheckParcelEnableVoice->setVisible(true);

+            mCheckParcelEnableVoice->setEnabled( can_change_media );

+            mCheckParcelEnableVoice->set(allow_voice);

+

+            mCheckParcelVoiceLocal->setEnabled( can_change_media && allow_voice );

+        }

+        else

+        {

+            // Voice disabled at estate level, overrides parcel settings

+            // Replace the parcel voice checkbox with a disabled one

+            // labelled with an explanatory message

+            mCheckEstateDisabledVoice->setVisible(true);

+

+            mCheckParcelEnableVoice->setVisible(false);

+            mCheckParcelEnableVoice->setEnabled(false);

+            mCheckParcelVoiceLocal->setEnabled(false);

+        }

+

+        mCheckParcelEnableVoice->set(allow_voice);

+        mCheckParcelVoiceLocal->set(!parcel->getParcelFlagUseEstateVoiceChannel());

+

+        mMusicURLEdit->setText(parcel->getMusicURL());

+        mMusicURLEdit->setEnabled( can_change_media );

+

+        bool can_change_av_sounds = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS) && parcel->getHaveNewParcelLimitData();

+        mCheckAVSoundAny->set(parcel->getAllowAnyAVSounds());

+        mCheckAVSoundAny->setEnabled(can_change_av_sounds);

+

+        mCheckAVSoundGroup->set(parcel->getAllowGroupAVSounds() || parcel->getAllowAnyAVSounds());  // On if "Everyone" is on

+        mCheckAVSoundGroup->setEnabled(can_change_av_sounds && !parcel->getAllowAnyAVSounds());     // Enabled if "Everyone" is off

+

+        mCheckObscureMOAP->set(parcel->getObscureMOAP());

+        mCheckObscureMOAP->setEnabled(can_change_media);

+    }

+}

+// static

+void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)

+{

+    LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;

+

+    LLParcel* parcel = self->mParcel->getParcel();

+    if (!parcel)

+    {

+        return;

+    }

+

+    // Extract data from UI

+    bool sound_local        = self->mCheckSoundLocal->get();

+    std::string music_url   = self->mMusicURLEdit->getText();

+

+    bool voice_enabled = self->mCheckParcelEnableVoice->get();

+    bool voice_estate_chan = !self->mCheckParcelVoiceLocal->get();

+

+    bool any_av_sound       = self->mCheckAVSoundAny->get();

+    bool group_av_sound     = true;     // If set to "Everyone" then group is checked as well

+    if (!any_av_sound)

+    {   // If "Everyone" is off, use the value from the checkbox

+        group_av_sound = self->mCheckAVSoundGroup->get();

+    }

+

+    bool obscure_moap = self->mCheckObscureMOAP->get();

+

+    // Remove leading/trailing whitespace (common when copying/pasting)

+    LLStringUtil::trim(music_url);

+

+    // Push data into current parcel

+    parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);

+    parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);

+    parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);

+    parcel->setMusicURL(music_url);

+    parcel->setAllowAnyAVSounds(any_av_sound);

+    parcel->setAllowGroupAVSounds(group_av_sound);

+    parcel->setObscureMOAP(obscure_moap);

+

+    // Send current parcel data upstream to server

+    LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );

+

+    // Might have changed properties, so let's redraw!

+    self->refresh();

+}