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

diff --git a/indra/media_plugins/cef/windows_volume_catcher.cpp b/indra/media_plugins/cef/windows_volume_catcher.cpp
index 7a36123a11..e7daeb5f74 100644
--- a/indra/media_plugins/cef/windows_volume_catcher.cpp
+++ b/indra/media_plugins/cef/windows_volume_catcher.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file windows_volume_catcher.cpp
  * @brief A Windows implementation of volume level control of all audio channels opened by a process.
  *
@@ -6,21 +6,21 @@
  * $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$
  * @endcond
@@ -32,24 +32,24 @@
 #include <mmeapi.h>
 class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
 {
-	LLSINGLETON(VolumeCatcherImpl);
-	// This is a singleton class -- both callers and the component implementation should use getInstance() to find the instance.
-	~VolumeCatcherImpl();
+    LLSINGLETON(VolumeCatcherImpl);
+    // This is a singleton class -- both callers and the component implementation should use getInstance() to find the instance.
+    ~VolumeCatcherImpl();
 
 public:
 
-	void setVolume(F32 volume);
-	void setPan(F32 pan);
-	
+    void setVolume(F32 volume);
+    void setPan(F32 pan);
+
 private:
-	F32 	mVolume;
-	F32 	mPan;
-	bool mSystemIsVistaOrHigher;
+    F32     mVolume;
+    F32     mPan;
+    bool mSystemIsVistaOrHigher;
 };
 
 VolumeCatcherImpl::VolumeCatcherImpl()
-:	mVolume(1.0f),			// default volume is max
-	mPan(0.f)				// default pan is centered
+:   mVolume(1.0f),          // default volume is max
+    mPan(0.f)               // default pan is centered
 {
 }
 
@@ -59,46 +59,46 @@ VolumeCatcherImpl::~VolumeCatcherImpl()
 
 void VolumeCatcherImpl::setVolume(F32 volume)
 {
-	mVolume = volume;
-
-	// set both left/right to same volume
-	// TODO: use pan value to set independently
-	DWORD left_channel = (DWORD)(mVolume * 65535.0f);
-	DWORD right_channel = (DWORD)(mVolume * 65535.0f);
-	DWORD hw_volume = left_channel << 16 | right_channel;
-	::waveOutSetVolume(NULL, hw_volume);
+    mVolume = volume;
+
+    // set both left/right to same volume
+    // TODO: use pan value to set independently
+    DWORD left_channel = (DWORD)(mVolume * 65535.0f);
+    DWORD right_channel = (DWORD)(mVolume * 65535.0f);
+    DWORD hw_volume = left_channel << 16 | right_channel;
+    ::waveOutSetVolume(NULL, hw_volume);
 }
 
 void VolumeCatcherImpl::setPan(F32 pan)
-{	// remember pan for calculating individual channel levels later
-	mPan = pan;
+{   // remember pan for calculating individual channel levels later
+    mPan = pan;
 }
 
 /////////////////////////////////////////////////////
 
 VolumeCatcher::VolumeCatcher()
 {
-	pimpl = VolumeCatcherImpl::getInstance();
+    pimpl = VolumeCatcherImpl::getInstance();
 }
 
 VolumeCatcher::~VolumeCatcher()
 {
-	// Let the instance persist until exit.
+    // Let the instance persist until exit.
 }
 
 void VolumeCatcher::setVolume(F32 volume)
 {
-	pimpl->setVolume(volume);
+    pimpl->setVolume(volume);
 }
 
 void VolumeCatcher::setPan(F32 pan)
 {
-	pimpl->setPan(pan);
+    pimpl->setPan(pan);
 }
 
 void VolumeCatcher::pump()
 {
-	// No periodic tasks are necessary for this implementation.
+    // No periodic tasks are necessary for this implementation.
 }