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

diff --git a/indra/newview/llhudeffect.cpp b/indra/newview/llhudeffect.cpp
index eb57cc0d24..0187819a0b 100644
--- a/indra/newview/llhudeffect.cpp
+++ b/indra/newview/llhudeffect.cpp
@@ -1,133 +1,133 @@
-/** 
- * @file llhudeffect.cpp
- * @brief LLHUDEffect 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 "llhudeffect.h"
-
-#include "message.h"
-#include "llgl.h"
-#include "llagent.h"
-#include "llrendersphere.h"
-
-#include "llviewerobjectlist.h"
-#include "lldrawable.h"
-
-LLHUDEffect::LLHUDEffect(const U8 type)
-:	LLHUDObject(type),
-	mID(),
-	mDuration(1.f),
-	mColor()
-{
-	mNeedsSendToSim = false;
-	mOriginatedHere = false;
-	mDead = false;
-}
-
-LLHUDEffect::~LLHUDEffect()
-{
-}
-
-
-void LLHUDEffect::packData(LLMessageSystem *mesgsys)
-{
-	mesgsys->addUUIDFast(_PREHASH_ID, mID);
-	mesgsys->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	mesgsys->addU8Fast(_PREHASH_Type, mType);
-	mesgsys->addF32Fast(_PREHASH_Duration, mDuration);
-	mesgsys->addBinaryData(_PREHASH_Color, mColor.mV, 4);
-}
-
-void LLHUDEffect::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
-{
-	mesgsys->getUUIDFast(_PREHASH_Effect, _PREHASH_ID, mID, blocknum);
-	mesgsys->getU8Fast(_PREHASH_Effect, _PREHASH_Type, mType, blocknum);
-	mesgsys->getF32Fast(_PREHASH_Effect, _PREHASH_Duration, mDuration, blocknum);
-	mesgsys->getBinaryDataFast(_PREHASH_Effect,_PREHASH_Color, mColor.mV, 4, blocknum);
-}
-
-void LLHUDEffect::render()
-{
-	LL_ERRS() << "Never call this!" << LL_ENDL;
-}
-
-void LLHUDEffect::setID(const LLUUID &id)
-{
-	mID = id;
-}
-
-const LLUUID &LLHUDEffect::getID() const
-{
-	return mID;
-}
-
-void LLHUDEffect::setColor(const LLColor4U &color)
-{
-	mColor = color;
-}
-
-void LLHUDEffect::setDuration(const F32 duration)
-{
-	mDuration = duration;
-}
-
-void LLHUDEffect::setNeedsSendToSim(const bool send_to_sim)
-{
-	mNeedsSendToSim = send_to_sim;
-}
-
-bool LLHUDEffect::getNeedsSendToSim() const
-{
-	return mNeedsSendToSim;
-}
-
-
-void LLHUDEffect::setOriginatedHere(const bool orig_here)
-{
-	mOriginatedHere = orig_here;
-}
-
-bool LLHUDEffect::getOriginatedHere() const
-{
-	return mOriginatedHere;
-}
-
-//static
-void LLHUDEffect::getIDType(LLMessageSystem *mesgsys, S32 blocknum, LLUUID &id, U8 &type)
-{
-	mesgsys->getUUIDFast(_PREHASH_Effect, _PREHASH_ID, id, blocknum);
-	mesgsys->getU8Fast(_PREHASH_Effect, _PREHASH_Type, type, blocknum);
-}
-
-bool LLHUDEffect::isDead() const
-{
-	return mDead;
-}
-
-void LLHUDEffect::update()
-{
-	// do nothing
-}
+/**

+ * @file llhudeffect.cpp

+ * @brief LLHUDEffect 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 "llhudeffect.h"

+

+#include "message.h"

+#include "llgl.h"

+#include "llagent.h"

+#include "llrendersphere.h"

+

+#include "llviewerobjectlist.h"

+#include "lldrawable.h"

+

+LLHUDEffect::LLHUDEffect(const U8 type)

+:   LLHUDObject(type),

+    mID(),

+    mDuration(1.f),

+    mColor()

+{

+    mNeedsSendToSim = false;

+    mOriginatedHere = false;

+    mDead = false;

+}

+

+LLHUDEffect::~LLHUDEffect()

+{

+}

+

+

+void LLHUDEffect::packData(LLMessageSystem *mesgsys)

+{

+    mesgsys->addUUIDFast(_PREHASH_ID, mID);

+    mesgsys->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+    mesgsys->addU8Fast(_PREHASH_Type, mType);

+    mesgsys->addF32Fast(_PREHASH_Duration, mDuration);

+    mesgsys->addBinaryData(_PREHASH_Color, mColor.mV, 4);

+}

+

+void LLHUDEffect::unpackData(LLMessageSystem *mesgsys, S32 blocknum)

+{

+    mesgsys->getUUIDFast(_PREHASH_Effect, _PREHASH_ID, mID, blocknum);

+    mesgsys->getU8Fast(_PREHASH_Effect, _PREHASH_Type, mType, blocknum);

+    mesgsys->getF32Fast(_PREHASH_Effect, _PREHASH_Duration, mDuration, blocknum);

+    mesgsys->getBinaryDataFast(_PREHASH_Effect,_PREHASH_Color, mColor.mV, 4, blocknum);

+}

+

+void LLHUDEffect::render()

+{

+    LL_ERRS() << "Never call this!" << LL_ENDL;

+}

+

+void LLHUDEffect::setID(const LLUUID &id)

+{

+    mID = id;

+}

+

+const LLUUID &LLHUDEffect::getID() const

+{

+    return mID;

+}

+

+void LLHUDEffect::setColor(const LLColor4U &color)

+{

+    mColor = color;

+}

+

+void LLHUDEffect::setDuration(const F32 duration)

+{

+    mDuration = duration;

+}

+

+void LLHUDEffect::setNeedsSendToSim(const bool send_to_sim)

+{

+    mNeedsSendToSim = send_to_sim;

+}

+

+bool LLHUDEffect::getNeedsSendToSim() const

+{

+    return mNeedsSendToSim;

+}

+

+

+void LLHUDEffect::setOriginatedHere(const bool orig_here)

+{

+    mOriginatedHere = orig_here;

+}

+

+bool LLHUDEffect::getOriginatedHere() const

+{

+    return mOriginatedHere;

+}

+

+//static

+void LLHUDEffect::getIDType(LLMessageSystem *mesgsys, S32 blocknum, LLUUID &id, U8 &type)

+{

+    mesgsys->getUUIDFast(_PREHASH_Effect, _PREHASH_ID, id, blocknum);

+    mesgsys->getU8Fast(_PREHASH_Effect, _PREHASH_Type, type, blocknum);

+}

+

+bool LLHUDEffect::isDead() const

+{

+    return mDead;

+}

+

+void LLHUDEffect::update()

+{

+    // do nothing

+}