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

diff --git a/indra/newview/llaudiosourcevo.cpp b/indra/newview/llaudiosourcevo.cpp
index 43abbb57ee..13a91e9713 100644
--- a/indra/newview/llaudiosourcevo.cpp
+++ b/indra/newview/llaudiosourcevo.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llaudiosourcevo.cpp
  * @author Douglas Soo, James Cook
  * @brief Audio sources attached to viewer objects
@@ -6,21 +6,21 @@
  * $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$
  */
@@ -37,24 +37,24 @@
 #include "llvoavatarself.h"
 
 LLAudioSourceVO::LLAudioSourceVO(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, LLViewerObject *objectp)
-	:	LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX), 
-	mObjectp(objectp)
+    :   LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX),
+    mObjectp(objectp)
 {
-	update();
+    update();
 }
 
 LLAudioSourceVO::~LLAudioSourceVO()
 {
-	if (mObjectp)
-	{
-		mObjectp->clearAttachedSound();
-	}
-	mObjectp = NULL;
+    if (mObjectp)
+    {
+        mObjectp->clearAttachedSound();
+    }
+    mObjectp = NULL;
 }
 
 void LLAudioSourceVO::setGain(const F32 gain)
 {
-	mGain = llclamp(gain, 0.f, 1.f);
+    mGain = llclamp(gain, 0.f, 1.f);
 }
 
 void LLAudioSourceVO::checkCutOffRadius()
@@ -129,16 +129,16 @@ bool LLAudioSourceVO::isInCutOffRadius(const LLVector3d pos_global, const F32 cu
 
 void LLAudioSourceVO::updateMute()
 {
-	if (!mObjectp || mObjectp->isDead())
-	{
-	  	mSourceMuted = true;
-		return;
-	}
+    if (!mObjectp || mObjectp->isDead())
+    {
+        mSourceMuted = true;
+        return;
+    }
 
-	bool mute = false;
-	LLVector3d pos_global = getPosGlobal();
+    bool mute = false;
+    LLVector3d pos_global = getPosGlobal();
 
-	F32 cutoff = mObjectp->getSoundCutOffRadius();
+    F32 cutoff = mObjectp->getSoundCutOffRadius();
     // Object can specify radius at which it turns off
     // consider cutoff below 0.1m as 'cutoff off'
     if (cutoff > 0.1f && !isInCutOffRadius(pos_global, cutoff))
@@ -170,90 +170,90 @@ void LLAudioSourceVO::updateMute()
         }
     }
 
-	if (!mute)
-	{
-		if (LLMuteList::getInstance()->isMuted(mObjectp->getID()))
-		{
-			mute = true;
-		}
-		else if (LLMuteList::getInstance()->isMuted(mOwnerID, LLMute::flagObjectSounds))
-		{
-			mute = true;
-		}
-		else if (mObjectp->isAttachment())
-		{
-			LLViewerObject* parent = mObjectp;
-			while (parent && !parent->isAvatar())
-			{
-				parent = (LLViewerObject*)parent->getParent();
-			}
-			if (parent 
-				&& LLMuteList::getInstance()->isMuted(parent->getID()))
-			{
-				mute = true;
-			}
-		}
-	}
+    if (!mute)
+    {
+        if (LLMuteList::getInstance()->isMuted(mObjectp->getID()))
+        {
+            mute = true;
+        }
+        else if (LLMuteList::getInstance()->isMuted(mOwnerID, LLMute::flagObjectSounds))
+        {
+            mute = true;
+        }
+        else if (mObjectp->isAttachment())
+        {
+            LLViewerObject* parent = mObjectp;
+            while (parent && !parent->isAvatar())
+            {
+                parent = (LLViewerObject*)parent->getParent();
+            }
+            if (parent
+                && LLMuteList::getInstance()->isMuted(parent->getID()))
+            {
+                mute = true;
+            }
+        }
+    }
 
-	if (mute != mSourceMuted)
-	{
-		mSourceMuted = mute;
-		if (mSourceMuted)
-		{
-		  	// Stop the sound.
-			this->play(LLUUID::null);
-		}
-		else
-		{
-		  	// Muted sounds keep there data at all times, because
-			// it's the place where the audio UUID is stored.
-			// However, it's possible that mCurrentDatap is
-			// NULL when this source did only preload sounds.
-			if (mCurrentDatap)
-			{
-		  		// Restart the sound.
-				this->play(mCurrentDatap->getID());
-			}
-		}
-	}
+    if (mute != mSourceMuted)
+    {
+        mSourceMuted = mute;
+        if (mSourceMuted)
+        {
+            // Stop the sound.
+            this->play(LLUUID::null);
+        }
+        else
+        {
+            // Muted sounds keep there data at all times, because
+            // it's the place where the audio UUID is stored.
+            // However, it's possible that mCurrentDatap is
+            // NULL when this source did only preload sounds.
+            if (mCurrentDatap)
+            {
+                // Restart the sound.
+                this->play(mCurrentDatap->getID());
+            }
+        }
+    }
 }
 
 void LLAudioSourceVO::update()
 {
-	updateMute();
+    updateMute();
 
-	if (!mObjectp)
-	{
-		return;
-	}
+    if (!mObjectp)
+    {
+        return;
+    }
 
-	if (mObjectp->isDead())
-	{
-		mObjectp = NULL;
-		return;
-	}
+    if (mObjectp->isDead())
+    {
+        mObjectp = NULL;
+        return;
+    }
 
-	if (mSourceMuted)
-	{
-	  	return;
-	}
+    if (mSourceMuted)
+    {
+        return;
+    }
 
-	if (mObjectp->isHUDAttachment())
-	{
-		mPositionGlobal = gAgentCamera.getCameraPositionGlobal();
-	}
-	else
-	{
-		mPositionGlobal = mObjectp->getPositionGlobal();
-	}
-	if (mObjectp->getSubParent())
-	{
-		mVelocity = mObjectp->getSubParent()->getVelocity();
-	}
-	else
-	{
-		mVelocity = mObjectp->getVelocity();
-	}
+    if (mObjectp->isHUDAttachment())
+    {
+        mPositionGlobal = gAgentCamera.getCameraPositionGlobal();
+    }
+    else
+    {
+        mPositionGlobal = mObjectp->getPositionGlobal();
+    }
+    if (mObjectp->getSubParent())
+    {
+        mVelocity = mObjectp->getSubParent()->getVelocity();
+    }
+    else
+    {
+        mVelocity = mObjectp->getVelocity();
+    }
 
-	LLAudioSource::update();
+    LLAudioSource::update();
 }