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

diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp
index 2fbbfdc40d..797b676e17 100644
--- a/indra/newview/llpreviewsound.cpp
+++ b/indra/newview/llpreviewsound.cpp
@@ -1,100 +1,100 @@
-/** 
- * @file llpreviewsound.cpp
- * @brief LLPreviewSound class 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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llaudioengine.h"
-#include "llagent.h"          // gAgent
-#include "llbutton.h"
-#include "llinventory.h"
-#include "lllineeditor.h"
-#include "llpreviewsound.h"
-#include "llresmgr.h"
-#include "llviewercontrol.h"
-#include "llviewermessage.h"  // send_guid_sound_trigger
-#include "lluictrlfactory.h"
-
-extern LLAudioEngine* gAudiop;
-extern LLAgent gAgent;
-
-const F32 SOUND_GAIN = 1.0f;
-
-LLPreviewSound::LLPreviewSound(const LLSD& key)
-  : LLPreview( key )
-{
-}
-
-// virtual
-bool	LLPreviewSound::postBuild()
-{
-	const LLInventoryItem* item = getItem();
-	if (item)
-	{
-		getChild<LLUICtrl>("desc")->setValue(item->getDescription());
-		if (gAudiop)
-		{
-			gAudiop->preloadSound(item->getAssetUUID()); // preload the sound
-		}
-	}
-	
-	childSetAction("Sound play btn",&LLPreviewSound::playSound,this);
-	childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this);
-
-	LLButton* button = getChild<LLButton>("Sound play btn");
-	button->setSoundFlags(LLView::SILENT);
-	
-	button = getChild<LLButton>("Sound audition btn");
-	button->setSoundFlags(LLView::SILENT);
-
-	childSetCommitCallback("desc", LLPreview::onText, this);
-	getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);	
-
-	return LLPreview::postBuild();
-}
-
-// static
-void LLPreviewSound::playSound( void *userdata )
-{
-	LLPreviewSound* self = (LLPreviewSound*) userdata;
-	const LLInventoryItem *item = self->getItem();
-
-	if(item && gAudiop)
-	{
-		send_sound_trigger(item->getAssetUUID(), SOUND_GAIN);
-	}
-}
-
-// static
-void LLPreviewSound::auditionSound( void *userdata )
-{
-	LLPreviewSound* self = (LLPreviewSound*) userdata;
-	const LLInventoryItem *item = self->getItem();
-
-	if(item && gAudiop)
-	{
-		gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_SFX);
-	}
-}
+/**

+ * @file llpreviewsound.cpp

+ * @brief LLPreviewSound class 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$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llaudioengine.h"

+#include "llagent.h"          // gAgent

+#include "llbutton.h"

+#include "llinventory.h"

+#include "lllineeditor.h"

+#include "llpreviewsound.h"

+#include "llresmgr.h"

+#include "llviewercontrol.h"

+#include "llviewermessage.h"  // send_guid_sound_trigger

+#include "lluictrlfactory.h"

+

+extern LLAudioEngine* gAudiop;

+extern LLAgent gAgent;

+

+const F32 SOUND_GAIN = 1.0f;

+

+LLPreviewSound::LLPreviewSound(const LLSD& key)

+  : LLPreview( key )

+{

+}

+

+// virtual

+bool    LLPreviewSound::postBuild()

+{

+    const LLInventoryItem* item = getItem();

+    if (item)

+    {

+        getChild<LLUICtrl>("desc")->setValue(item->getDescription());

+        if (gAudiop)

+        {

+            gAudiop->preloadSound(item->getAssetUUID()); // preload the sound

+        }

+    }

+

+    childSetAction("Sound play btn",&LLPreviewSound::playSound,this);

+    childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this);

+

+    LLButton* button = getChild<LLButton>("Sound play btn");

+    button->setSoundFlags(LLView::SILENT);

+

+    button = getChild<LLButton>("Sound audition btn");

+    button->setSoundFlags(LLView::SILENT);

+

+    childSetCommitCallback("desc", LLPreview::onText, this);

+    getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);

+

+    return LLPreview::postBuild();

+}

+

+// static

+void LLPreviewSound::playSound( void *userdata )

+{

+    LLPreviewSound* self = (LLPreviewSound*) userdata;

+    const LLInventoryItem *item = self->getItem();

+

+    if(item && gAudiop)

+    {

+        send_sound_trigger(item->getAssetUUID(), SOUND_GAIN);

+    }

+}

+

+// static

+void LLPreviewSound::auditionSound( void *userdata )

+{

+    LLPreviewSound* self = (LLPreviewSound*) userdata;

+    const LLInventoryItem *item = self->getItem();

+

+    if(item && gAudiop)

+    {

+        gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_SFX);

+    }

+}