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

diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
index d6b355e336..797dc63017 100644
--- a/indra/newview/llhudobject.h
+++ b/indra/newview/llhudobject.h
@@ -1,123 +1,123 @@
-/** 
- * @file llhudobject.h
- * @brief LLHUDObject class definition
- *
- * $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_LLHUDOBJECT_H
-#define LL_LLHUDOBJECT_H
-
-/**
- * Base class and manager for in-world 2.5D non-interactive objects
- */
-
-#include "llpointer.h"
-
-#include "v4color.h"
-#include "v3math.h"
-#include "v3dmath.h"
-#include "lldrawpool.h"		// TODO: eliminate, unused below
-#include <list>
-
-class LLViewerCamera;
-class LLFontGL;
-class LLFace;
-class LLViewerObject;
-class LLHUDEffect;
-
-class LLHUDObject : public LLRefCount
-{
-public:
-	virtual void markDead();
-	virtual F32 getDistance() const;
-	virtual void setSourceObject(LLViewerObject* objectp);
-	virtual void setTargetObject(LLViewerObject* objectp);
-	virtual LLViewerObject* getSourceObject() { return mSourceObject; }
-	virtual LLViewerObject* getTargetObject() { return mTargetObject; }
-
-	void setPositionGlobal(const LLVector3d &position_global);
-	void setPositionAgent(const LLVector3 &position_agent);
-
-	bool isVisible() const { return mVisible; }
-
-	U8 getType() const { return mType; }
-
-	LLVector3d getPositionGlobal() const { return mPositionGlobal; }
-
-	static LLHUDObject *addHUDObject(const U8 type);
-	static LLHUDEffect *addHUDEffect(const U8 type);
-	static void updateAll();
-	static void renderAll();
-	static void renderAllForSelect();
-	static void renderAllForTimer();
-
-	// Some objects may need to update when window shape changes
-	static void reshapeAll();
-
-	static void cleanupHUDObjects();
-
-	enum
-	{
-		LL_HUD_TEXT,
-		LL_HUD_ICON,
-		LL_HUD_CONNECTOR,
-		LL_HUD_FLEXIBLE_OBJECT,			// Ventrella
-		LL_HUD_ANIMAL_CONTROLS,			// Ventrella
-		LL_HUD_LOCAL_ANIMATION_OBJECT,	// Ventrella
-		LL_HUD_CLOTH,					// Ventrella
-		LL_HUD_EFFECT_BEAM,
-		LL_HUD_EFFECT_GLOW,
-		LL_HUD_EFFECT_POINT,
-		LL_HUD_EFFECT_TRAIL,
-		LL_HUD_EFFECT_SPHERE,
-		LL_HUD_EFFECT_SPIRAL,
-		LL_HUD_EFFECT_EDIT,
-		LL_HUD_EFFECT_LOOKAT,
-		LL_HUD_EFFECT_POINTAT,
-		LL_HUD_EFFECT_VOICE_VISUALIZER,	// Ventrella
-		LL_HUD_NAME_TAG,
-		LL_HUD_EFFECT_BLOB
-	};
-protected:
-	static void sortObjects();
-
-	LLHUDObject(const U8 type);
-	virtual ~LLHUDObject();
-
-	virtual void render() = 0;
-	virtual void renderForTimer() {};
-	
-protected:
-	U8				mType;
-	bool			mDead;
-	bool			mVisible;
-	LLVector3d		mPositionGlobal;
-	LLPointer<LLViewerObject> mSourceObject;
-	LLPointer<LLViewerObject> mTargetObject;
-
-private:
-	typedef std::list<LLPointer<LLHUDObject> > hud_object_list_t;
-	static hud_object_list_t sHUDObjects;
-};
-
-#endif // LL_LLHUDOBJECT_H
+/**

+ * @file llhudobject.h

+ * @brief LLHUDObject class definition

+ *

+ * $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_LLHUDOBJECT_H

+#define LL_LLHUDOBJECT_H

+

+/**

+ * Base class and manager for in-world 2.5D non-interactive objects

+ */

+

+#include "llpointer.h"

+

+#include "v4color.h"

+#include "v3math.h"

+#include "v3dmath.h"

+#include "lldrawpool.h"     // TODO: eliminate, unused below

+#include <list>

+

+class LLViewerCamera;

+class LLFontGL;

+class LLFace;

+class LLViewerObject;

+class LLHUDEffect;

+

+class LLHUDObject : public LLRefCount

+{

+public:

+    virtual void markDead();

+    virtual F32 getDistance() const;

+    virtual void setSourceObject(LLViewerObject* objectp);

+    virtual void setTargetObject(LLViewerObject* objectp);

+    virtual LLViewerObject* getSourceObject() { return mSourceObject; }

+    virtual LLViewerObject* getTargetObject() { return mTargetObject; }

+

+    void setPositionGlobal(const LLVector3d &position_global);

+    void setPositionAgent(const LLVector3 &position_agent);

+

+    bool isVisible() const { return mVisible; }

+

+    U8 getType() const { return mType; }

+

+    LLVector3d getPositionGlobal() const { return mPositionGlobal; }

+

+    static LLHUDObject *addHUDObject(const U8 type);

+    static LLHUDEffect *addHUDEffect(const U8 type);

+    static void updateAll();

+    static void renderAll();

+    static void renderAllForSelect();

+    static void renderAllForTimer();

+

+    // Some objects may need to update when window shape changes

+    static void reshapeAll();

+

+    static void cleanupHUDObjects();

+

+    enum

+    {

+        LL_HUD_TEXT,

+        LL_HUD_ICON,

+        LL_HUD_CONNECTOR,

+        LL_HUD_FLEXIBLE_OBJECT,         // Ventrella

+        LL_HUD_ANIMAL_CONTROLS,         // Ventrella

+        LL_HUD_LOCAL_ANIMATION_OBJECT,  // Ventrella

+        LL_HUD_CLOTH,                   // Ventrella

+        LL_HUD_EFFECT_BEAM,

+        LL_HUD_EFFECT_GLOW,

+        LL_HUD_EFFECT_POINT,

+        LL_HUD_EFFECT_TRAIL,

+        LL_HUD_EFFECT_SPHERE,

+        LL_HUD_EFFECT_SPIRAL,

+        LL_HUD_EFFECT_EDIT,

+        LL_HUD_EFFECT_LOOKAT,

+        LL_HUD_EFFECT_POINTAT,

+        LL_HUD_EFFECT_VOICE_VISUALIZER, // Ventrella

+        LL_HUD_NAME_TAG,

+        LL_HUD_EFFECT_BLOB

+    };

+protected:

+    static void sortObjects();

+

+    LLHUDObject(const U8 type);

+    virtual ~LLHUDObject();

+

+    virtual void render() = 0;

+    virtual void renderForTimer() {};

+

+protected:

+    U8              mType;

+    bool            mDead;

+    bool            mVisible;

+    LLVector3d      mPositionGlobal;

+    LLPointer<LLViewerObject> mSourceObject;

+    LLPointer<LLViewerObject> mTargetObject;

+

+private:

+    typedef std::list<LLPointer<LLHUDObject> > hud_object_list_t;

+    static hud_object_list_t sHUDObjects;

+};

+

+#endif // LL_LLHUDOBJECT_H