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

diff --git a/indra/newview/llsprite.h b/indra/newview/llsprite.h
index 457c0230f7..113a73a815 100644
--- a/indra/newview/llsprite.h
+++ b/indra/newview/llsprite.h
@@ -1,106 +1,106 @@
-/** 
- * @file llsprite.h
- * @brief LLSprite class definition
- *
- * $LicenseInfo:firstyear=2001&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_LLSPRITE_H
-#define LL_LLSPRITE_H
-
-////#include "vmath.h"
-//#include "llmath.h"
-#include "v3math.h"
-#include "v4math.h"
-#include "v4color.h"
-#include "lluuid.h"
-#include "llgl.h"
-#include "llviewertexture.h"
-
-class LLViewerCamera;
-
-class LLFace;
-
-class LLSprite  
-{
-public:
-	LLSprite(const LLUUID &image_uuid);
-	~LLSprite();
-
-	void render(LLViewerCamera * camerap);
-
-	F32 getWidth()				const	{ return mWidth; } 
-	F32 getHeight()				const	{ return mHeight; }
-	F32 getYaw()				const	{ return mYaw; } 
-	F32 getPitch()				const	{ return mPitch; }
-	F32	getAlpha()				const	{ return mColor.mV[VALPHA]; }
-
-	LLVector3 getPosition()		const	{ return mPosition; }
-	LLColor4  getColor()		const	{ return mColor; }
-
-	void setPosition(const LLVector3 &position);
-	void setPitch(const F32 pitch);
-	void setSize(const F32 width, const F32 height);
-	void setYaw(const F32 yaw);
-	void setFollow(const bool follow);
-	void setUseCameraUp(const bool use_up);
-
-	void setTexMode(LLGLenum mode);
-	void setColor(const LLColor4 &color);
-	void setColor(const F32 r, const F32 g, const F32 b, const F32 a);
-	void setAlpha(const F32 alpha)					{ mColor.mV[VALPHA] = alpha; }
-	void setNormal(const LLVector3 &normal)		{ sNormal = normal; sNormal.normalize();}
-
-	F32 getAlpha();
-
-	void updateFace(LLFace &face);
-
-public:
-	LLUUID mImageID;
-  	LLPointer<LLViewerTexture> mImagep;
-private:
-	F32 mWidth;
-	F32 mHeight;
-	F32 mWidthDiv2;
-	F32 mHeightDiv2;
-	F32 mPitch;
-	F32 mYaw;
-	LLVector3 mPosition;
-	bool mFollow;
-	bool mUseCameraUp;
-
-	LLColor4 mColor;
-	LLGLenum mTexMode;
-
-	// put 
-	LLVector3 mScaledUp;
-	LLVector3 mScaledRight;
-	static LLVector3 sCameraUp;
-	static LLVector3 sCameraRight;
-	static LLVector3 sCameraPosition;
-	static LLVector3 sNormal;
-	LLVector3 mA,mB,mC,mD;   // the four corners of a quad
-
-};
-
-#endif
-
+/**

+ * @file llsprite.h

+ * @brief LLSprite class definition

+ *

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

+#define LL_LLSPRITE_H

+

+////#include "vmath.h"

+//#include "llmath.h"

+#include "v3math.h"

+#include "v4math.h"

+#include "v4color.h"

+#include "lluuid.h"

+#include "llgl.h"

+#include "llviewertexture.h"

+

+class LLViewerCamera;

+

+class LLFace;

+

+class LLSprite

+{

+public:

+    LLSprite(const LLUUID &image_uuid);

+    ~LLSprite();

+

+    void render(LLViewerCamera * camerap);

+

+    F32 getWidth()              const   { return mWidth; }

+    F32 getHeight()             const   { return mHeight; }

+    F32 getYaw()                const   { return mYaw; }

+    F32 getPitch()              const   { return mPitch; }

+    F32 getAlpha()              const   { return mColor.mV[VALPHA]; }

+

+    LLVector3 getPosition()     const   { return mPosition; }

+    LLColor4  getColor()        const   { return mColor; }

+

+    void setPosition(const LLVector3 &position);

+    void setPitch(const F32 pitch);

+    void setSize(const F32 width, const F32 height);

+    void setYaw(const F32 yaw);

+    void setFollow(const bool follow);

+    void setUseCameraUp(const bool use_up);

+

+    void setTexMode(LLGLenum mode);

+    void setColor(const LLColor4 &color);

+    void setColor(const F32 r, const F32 g, const F32 b, const F32 a);

+    void setAlpha(const F32 alpha)                  { mColor.mV[VALPHA] = alpha; }

+    void setNormal(const LLVector3 &normal)     { sNormal = normal; sNormal.normalize();}

+

+    F32 getAlpha();

+

+    void updateFace(LLFace &face);

+

+public:

+    LLUUID mImageID;

+    LLPointer<LLViewerTexture> mImagep;

+private:

+    F32 mWidth;

+    F32 mHeight;

+    F32 mWidthDiv2;

+    F32 mHeightDiv2;

+    F32 mPitch;

+    F32 mYaw;

+    LLVector3 mPosition;

+    bool mFollow;

+    bool mUseCameraUp;

+

+    LLColor4 mColor;

+    LLGLenum mTexMode;

+

+    // put

+    LLVector3 mScaledUp;

+    LLVector3 mScaledRight;

+    static LLVector3 sCameraUp;

+    static LLVector3 sCameraRight;

+    static LLVector3 sCameraPosition;

+    static LLVector3 sNormal;

+    LLVector3 mA,mB,mC,mD;   // the four corners of a quad

+

+};

+

+#endif

+