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

diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h
index c2dfad6a56..6875bcc68b 100644
--- a/indra/llaudio/llaudioengine_openal.h
+++ b/indra/llaudio/llaudioengine_openal.h
@@ -1,108 +1,108 @@
-/**
- * @file audioengine_openal.cpp
- * @brief implementation of audio engine using OpenAL
- * support as a OpenAL 3D implementation
- *
- *
- * $LicenseInfo:firstyear=2002&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$
- */
-
-
-#ifndef LL_AUDIOENGINE_OPENAL_H
-#define LL_AUDIOENGINE_OPENAL_H
-
-#include "llaudioengine.h"
-#include "lllistener_openal.h"
-#include "llwindgen.h"
-
-class LLAudioEngine_OpenAL : public LLAudioEngine
-{
-	public:
-		LLAudioEngine_OpenAL();
-		virtual ~LLAudioEngine_OpenAL();
-
-        virtual bool init(void *user_data, const std::string &app_title);
-        virtual std::string getDriverName(bool verbose);
-        virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const { return nullptr; }
-		virtual void allocateListener();
-
-		virtual void shutdown();
-
-		void setInternalGain(F32 gain);
-
-		LLAudioBuffer* createBuffer();
-		LLAudioChannel* createChannel();
-
-		/*virtual*/ bool initWind();
-		/*virtual*/ void cleanupWind();
-		/*virtual*/ void updateWind(LLVector3 direction, F32 camera_altitude);
-
-	private:
-        typedef F32 WIND_SAMPLE_T;
-    	LLWindGen<WIND_SAMPLE_T> *mWindGen;
-    	F32 *mWindBuf;
-    	U32 mWindBufFreq;
-    	U32 mWindBufSamples;
-    	U32 mWindBufBytes;
-    	ALuint mWindSource;
-        int mNumEmptyWindALBuffers;
-
-    	static const int MAX_NUM_WIND_BUFFERS = 80;
-    	static const float WIND_BUFFER_SIZE_SEC; // 1/20th sec
-};
-
-class LLAudioChannelOpenAL : public LLAudioChannel
-{
-	public:
-		LLAudioChannelOpenAL();
-		virtual ~LLAudioChannelOpenAL();
-	protected:
-		/*virtual*/ void play();
-		/*virtual*/ void playSynced(LLAudioChannel *channelp);
-		/*virtual*/ void cleanup();
-		/*virtual*/ bool isPlaying();
-
-		/*virtual*/ bool updateBuffer();
-		/*virtual*/ void update3DPosition();
-		/*virtual*/ void updateLoop();
-
-		ALuint mALSource;
-	        ALint mLastSamplePos;
-};
-
-class LLAudioBufferOpenAL : public LLAudioBuffer{
-	public:
-		LLAudioBufferOpenAL();
-		virtual ~LLAudioBufferOpenAL();
-
-		bool loadWAV(const std::string& filename);
-		U32 getLength();
-
-		friend class LLAudioChannelOpenAL;
-	protected:
-		void cleanup();
-		ALuint getBuffer() {return mALBuffer;}
-
-		ALuint mALBuffer;
-};
-
-#endif
+/**

+ * @file audioengine_openal.cpp

+ * @brief implementation of audio engine using OpenAL

+ * support as a OpenAL 3D implementation

+ *

+ *

+ * $LicenseInfo:firstyear=2002&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$

+ */

+

+

+#ifndef LL_AUDIOENGINE_OPENAL_H

+#define LL_AUDIOENGINE_OPENAL_H

+

+#include "llaudioengine.h"

+#include "lllistener_openal.h"

+#include "llwindgen.h"

+

+class LLAudioEngine_OpenAL : public LLAudioEngine

+{

+    public:

+        LLAudioEngine_OpenAL();

+        virtual ~LLAudioEngine_OpenAL();

+

+        virtual bool init(void *user_data, const std::string &app_title);

+        virtual std::string getDriverName(bool verbose);

+        virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const { return nullptr; }

+        virtual void allocateListener();

+

+        virtual void shutdown();

+

+        void setInternalGain(F32 gain);

+

+        LLAudioBuffer* createBuffer();

+        LLAudioChannel* createChannel();

+

+        /*virtual*/ bool initWind();

+        /*virtual*/ void cleanupWind();

+        /*virtual*/ void updateWind(LLVector3 direction, F32 camera_altitude);

+

+    private:

+        typedef F32 WIND_SAMPLE_T;

+        LLWindGen<WIND_SAMPLE_T> *mWindGen;

+        F32 *mWindBuf;

+        U32 mWindBufFreq;

+        U32 mWindBufSamples;

+        U32 mWindBufBytes;

+        ALuint mWindSource;

+        int mNumEmptyWindALBuffers;

+

+        static const int MAX_NUM_WIND_BUFFERS = 80;

+        static const float WIND_BUFFER_SIZE_SEC; // 1/20th sec

+};

+

+class LLAudioChannelOpenAL : public LLAudioChannel

+{

+    public:

+        LLAudioChannelOpenAL();

+        virtual ~LLAudioChannelOpenAL();

+    protected:

+        /*virtual*/ void play();

+        /*virtual*/ void playSynced(LLAudioChannel *channelp);

+        /*virtual*/ void cleanup();

+        /*virtual*/ bool isPlaying();

+

+        /*virtual*/ bool updateBuffer();

+        /*virtual*/ void update3DPosition();

+        /*virtual*/ void updateLoop();

+

+        ALuint mALSource;

+            ALint mLastSamplePos;

+};

+

+class LLAudioBufferOpenAL : public LLAudioBuffer{

+    public:

+        LLAudioBufferOpenAL();

+        virtual ~LLAudioBufferOpenAL();

+

+        bool loadWAV(const std::string& filename);

+        U32 getLength();

+

+        friend class LLAudioChannelOpenAL;

+    protected:

+        void cleanup();

+        ALuint getBuffer() {return mALBuffer;}

+

+        ALuint mALBuffer;

+};

+

+#endif