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

diff --git a/indra/newview/lldynamictexture.h b/indra/newview/lldynamictexture.h
index e2ae1090bc..d002f154a5 100644
--- a/indra/newview/lldynamictexture.h
+++ b/indra/newview/lldynamictexture.h
@@ -1,102 +1,102 @@
-/** 
- * @file lldynamictexture.h
- * @brief Implementation of LLViewerDynamicTexture class
- *
- * $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_LLDYNAMICTEXTURE_H
-#define LL_LLDYNAMICTEXTURE_H
-
-#include "llcamera.h"
-#include "llgl.h"
-#include "llcoord.h"
-#include "llviewertexture.h"
-#include "llcamera.h"
-
-class LLViewerDynamicTexture : public LLViewerTexture
-{
-    LL_ALIGN_NEW
-public:
-
-	enum
-	{
-		LL_VIEWER_DYNAMIC_TEXTURE = LLViewerTexture::DYNAMIC_TEXTURE,
-		LL_TEX_LAYER_SET_BUFFER = LLViewerTexture::INVALID_TEXTURE_TYPE + 1,
-		LL_VISUAL_PARAM_HINT,
-		LL_VISUAL_PARAM_RESET,
-		LL_PREVIEW_ANIMATION,
-		LL_IMAGE_PREVIEW_SCULPTED,
-		LL_IMAGE_PREVIEW_AVATAR,
-		INVALID_DYNAMIC_TEXTURE
-	};
-
-protected:
-	/*virtual*/ ~LLViewerDynamicTexture();
-
-public:
-	enum EOrder { ORDER_FIRST = 0, ORDER_MIDDLE = 1, ORDER_LAST = 2, ORDER_RESET = 3, ORDER_COUNT = 4 };
-
-	LLViewerDynamicTexture(S32 width,
-					 S32 height,
-					 S32 components,		// = 4,
-					 EOrder order,			// = ORDER_MIDDLE,
-					 bool clamp);
-	
-	/*virtual*/ S8 getType() const ;
-
-	S32			getOriginX() const	{ return mOrigin.mX; }
-	S32			getOriginY() const	{ return mOrigin.mY; }
-	
-	S32			getSize()		{ return mFullWidth * mFullHeight * mComponents; }
-
-	virtual bool needsRender() { return true; }
-	virtual void preRender(bool clear_depth = true);
-	virtual bool render();
-	virtual void postRender(bool success);
-
-	virtual void restoreGLTexture() {}
-	virtual void destroyGLTexture() {}
-
-	static bool	updateAllInstances();
-	static void destroyGL() ;
-	static void restoreGL() ;
-
-    void setBoundTarget(LLRenderTarget* target) { mBoundTarget = target; }
-
-protected:
-	void generateGLTexture();
-	void generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, bool swap_bytes = false);
-
-protected:
-	bool mClamp;
-	LLCoordGL mOrigin;
-	LL_ALIGN_16(LLCamera mCamera);
-	
-    LLRenderTarget* mBoundTarget;
-
-	typedef std::set<LLViewerDynamicTexture*> instance_list_t;
-	static instance_list_t sInstances[ LLViewerDynamicTexture::ORDER_COUNT ];
-	static S32 sNumRenders;
-};
-
-#endif
+/**

+ * @file lldynamictexture.h

+ * @brief Implementation of LLViewerDynamicTexture class

+ *

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

+#define LL_LLDYNAMICTEXTURE_H

+

+#include "llcamera.h"

+#include "llgl.h"

+#include "llcoord.h"

+#include "llviewertexture.h"

+#include "llcamera.h"

+

+class LLViewerDynamicTexture : public LLViewerTexture

+{

+    LL_ALIGN_NEW

+public:

+

+    enum

+    {

+        LL_VIEWER_DYNAMIC_TEXTURE = LLViewerTexture::DYNAMIC_TEXTURE,

+        LL_TEX_LAYER_SET_BUFFER = LLViewerTexture::INVALID_TEXTURE_TYPE + 1,

+        LL_VISUAL_PARAM_HINT,

+        LL_VISUAL_PARAM_RESET,

+        LL_PREVIEW_ANIMATION,

+        LL_IMAGE_PREVIEW_SCULPTED,

+        LL_IMAGE_PREVIEW_AVATAR,

+        INVALID_DYNAMIC_TEXTURE

+    };

+

+protected:

+    /*virtual*/ ~LLViewerDynamicTexture();

+

+public:

+    enum EOrder { ORDER_FIRST = 0, ORDER_MIDDLE = 1, ORDER_LAST = 2, ORDER_RESET = 3, ORDER_COUNT = 4 };

+

+    LLViewerDynamicTexture(S32 width,

+                     S32 height,

+                     S32 components,        // = 4,

+                     EOrder order,          // = ORDER_MIDDLE,

+                     bool clamp);

+

+    /*virtual*/ S8 getType() const ;

+

+    S32         getOriginX() const  { return mOrigin.mX; }

+    S32         getOriginY() const  { return mOrigin.mY; }

+

+    S32         getSize()       { return mFullWidth * mFullHeight * mComponents; }

+

+    virtual bool needsRender() { return true; }

+    virtual void preRender(bool clear_depth = true);

+    virtual bool render();

+    virtual void postRender(bool success);

+

+    virtual void restoreGLTexture() {}

+    virtual void destroyGLTexture() {}

+

+    static bool updateAllInstances();

+    static void destroyGL() ;

+    static void restoreGL() ;

+

+    void setBoundTarget(LLRenderTarget* target) { mBoundTarget = target; }

+

+protected:

+    void generateGLTexture();

+    void generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, bool swap_bytes = false);

+

+protected:

+    bool mClamp;

+    LLCoordGL mOrigin;

+    LL_ALIGN_16(LLCamera mCamera);

+

+    LLRenderTarget* mBoundTarget;

+

+    typedef std::set<LLViewerDynamicTexture*> instance_list_t;

+    static instance_list_t sInstances[ LLViewerDynamicTexture::ORDER_COUNT ];

+    static S32 sNumRenders;

+};

+

+#endif