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/llviewertexlayer.h b/indra/newview/llviewertexlayer.h
index 0365459ad9..31d9b006c1 100644
--- a/indra/newview/llviewertexlayer.h
+++ b/indra/newview/llviewertexlayer.h
@@ -1,133 +1,133 @@
-/** 
- * @file llviewertexlayer.h
- * @brief Viewer Texture layer classes. Used for avatars.
- *
- * $LicenseInfo:firstyear=2012&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_VIEWER_TEXLAYER_H
-#define LL_VIEWER_TEXLAYER_H
-
-#include "lldynamictexture.h"
-#include "llextendedstatus.h"
-#include "lltexlayer.h"
-
-class LLVOAvatarSelf;
-class LLViewerTexLayerSetBuffer;
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// LLViewerTexLayerSet
-//
-// An ordered set of texture layers that gets composited into a single texture.
-// Only exists for llavatarappearanceself.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLViewerTexLayerSet : public LLTexLayerSet
-{
-public:
-	LLViewerTexLayerSet(LLAvatarAppearance* const appearance);
-	virtual ~LLViewerTexLayerSet();
-
-	/*virtual*/void				requestUpdate();
-	bool						isLocalTextureDataAvailable() const;
-	bool						isLocalTextureDataFinal() const;
-	void						updateComposite();
-	/*virtual*/void				createComposite();
-	void						setUpdatesEnabled(bool b);
-	bool						getUpdatesEnabled()	const 	{ return mUpdatesEnabled; }
-
-	LLVOAvatarSelf*				getAvatar();
-	const LLVOAvatarSelf*		getAvatar()	const;
-	LLViewerTexLayerSetBuffer*	getViewerComposite();
-	const LLViewerTexLayerSetBuffer*	getViewerComposite() const;
-
-private:
-	bool						mUpdatesEnabled;
-
-};
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// LLViewerTexLayerSetBuffer
-//
-// The composite image that a LLViewerTexLayerSet writes to.  Each LLViewerTexLayerSet has one.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLViewerTexLayerSetBuffer : public LLTexLayerSetBuffer, public LLViewerDynamicTexture
-{
-	LOG_CLASS(LLViewerTexLayerSetBuffer);
-
-public:
-	LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner, S32 width, S32 height);
-	virtual ~LLViewerTexLayerSetBuffer();
-
-public:
-	/*virtual*/ S8          getType() const;
-	bool					isInitialized(void) const;
-	static void				dumpTotalByteCount();
-	const std::string		dumpTextureInfo() const;
-	virtual void 			restoreGLTexture();
-	virtual void 			destroyGLTexture();
-private:
-	LLViewerTexLayerSet*	getViewerTexLayerSet() 
-		{ return dynamic_cast<LLViewerTexLayerSet*> (mTexLayerSet); }
-	const LLViewerTexLayerSet*	getViewerTexLayerSet() const
-		{ return dynamic_cast<const LLViewerTexLayerSet*> (mTexLayerSet); }
-	static S32				sGLByteCount;
-
-	//--------------------------------------------------------------------
-	// Tex Layer Render
-	//--------------------------------------------------------------------
-	virtual void			preRenderTexLayerSet();
-	virtual void			midRenderTexLayerSet(bool success);
-	virtual void			postRenderTexLayerSet(bool success);
-	virtual S32				getCompositeOriginX() const { return getOriginX(); }
-	virtual S32				getCompositeOriginY() const { return getOriginY(); }
-	virtual S32				getCompositeWidth() const { return getFullWidth(); }
-	virtual S32				getCompositeHeight() const { return getFullHeight(); }
-
-	//--------------------------------------------------------------------
-	// Dynamic Texture Interface
-	//--------------------------------------------------------------------
-public:
-	/*virtual*/ bool		needsRender();
-protected:
-	// Pass these along for tex layer rendering.
-	virtual void			preRender(bool clear_depth) { preRenderTexLayerSet(); }
-	virtual void			postRender(bool success) { postRenderTexLayerSet(success); }
-	virtual bool			render() { return renderTexLayerSet(mBoundTarget); }
-	
-	//--------------------------------------------------------------------
-	// Updates
-	//--------------------------------------------------------------------
-public:
-	void					requestUpdate();
-	bool					requestUpdateImmediate();
-protected:
-	bool					isReadyToUpdate() const;
-	void					doUpdate();
-	void					restartUpdateTimer();
-private:
-	bool					mNeedsUpdate; 					// Whether we need to locally update our baked textures
-	U32						mNumLowresUpdates; 				// Number of times we've locally updated with lowres version of our baked textures
-	LLFrameTimer    		mNeedsUpdateTimer; 				// Tracks time since update was requested and performed.
-};
-
-#endif  // LL_VIEWER_TEXLAYER_H
-
+/**

+ * @file llviewertexlayer.h

+ * @brief Viewer Texture layer classes. Used for avatars.

+ *

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

+#define LL_VIEWER_TEXLAYER_H

+

+#include "lldynamictexture.h"

+#include "llextendedstatus.h"

+#include "lltexlayer.h"

+

+class LLVOAvatarSelf;

+class LLViewerTexLayerSetBuffer;

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// LLViewerTexLayerSet

+//

+// An ordered set of texture layers that gets composited into a single texture.

+// Only exists for llavatarappearanceself.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLViewerTexLayerSet : public LLTexLayerSet

+{

+public:

+    LLViewerTexLayerSet(LLAvatarAppearance* const appearance);

+    virtual ~LLViewerTexLayerSet();

+

+    /*virtual*/void             requestUpdate();

+    bool                        isLocalTextureDataAvailable() const;

+    bool                        isLocalTextureDataFinal() const;

+    void                        updateComposite();

+    /*virtual*/void             createComposite();

+    void                        setUpdatesEnabled(bool b);

+    bool                        getUpdatesEnabled() const   { return mUpdatesEnabled; }

+

+    LLVOAvatarSelf*             getAvatar();

+    const LLVOAvatarSelf*       getAvatar() const;

+    LLViewerTexLayerSetBuffer*  getViewerComposite();

+    const LLViewerTexLayerSetBuffer*    getViewerComposite() const;

+

+private:

+    bool                        mUpdatesEnabled;

+

+};

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// LLViewerTexLayerSetBuffer

+//

+// The composite image that a LLViewerTexLayerSet writes to.  Each LLViewerTexLayerSet has one.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLViewerTexLayerSetBuffer : public LLTexLayerSetBuffer, public LLViewerDynamicTexture

+{

+    LOG_CLASS(LLViewerTexLayerSetBuffer);

+

+public:

+    LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner, S32 width, S32 height);

+    virtual ~LLViewerTexLayerSetBuffer();

+

+public:

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

+    bool                    isInitialized(void) const;

+    static void             dumpTotalByteCount();

+    const std::string       dumpTextureInfo() const;

+    virtual void            restoreGLTexture();

+    virtual void            destroyGLTexture();

+private:

+    LLViewerTexLayerSet*    getViewerTexLayerSet()

+        { return dynamic_cast<LLViewerTexLayerSet*> (mTexLayerSet); }

+    const LLViewerTexLayerSet*  getViewerTexLayerSet() const

+        { return dynamic_cast<const LLViewerTexLayerSet*> (mTexLayerSet); }

+    static S32              sGLByteCount;

+

+    //--------------------------------------------------------------------

+    // Tex Layer Render

+    //--------------------------------------------------------------------

+    virtual void            preRenderTexLayerSet();

+    virtual void            midRenderTexLayerSet(bool success);

+    virtual void            postRenderTexLayerSet(bool success);

+    virtual S32             getCompositeOriginX() const { return getOriginX(); }

+    virtual S32             getCompositeOriginY() const { return getOriginY(); }

+    virtual S32             getCompositeWidth() const { return getFullWidth(); }

+    virtual S32             getCompositeHeight() const { return getFullHeight(); }

+

+    //--------------------------------------------------------------------

+    // Dynamic Texture Interface

+    //--------------------------------------------------------------------

+public:

+    /*virtual*/ bool        needsRender();

+protected:

+    // Pass these along for tex layer rendering.

+    virtual void            preRender(bool clear_depth) { preRenderTexLayerSet(); }

+    virtual void            postRender(bool success) { postRenderTexLayerSet(success); }

+    virtual bool            render() { return renderTexLayerSet(mBoundTarget); }

+

+    //--------------------------------------------------------------------

+    // Updates

+    //--------------------------------------------------------------------

+public:

+    void                    requestUpdate();

+    bool                    requestUpdateImmediate();

+protected:

+    bool                    isReadyToUpdate() const;

+    void                    doUpdate();

+    void                    restartUpdateTimer();

+private:

+    bool                    mNeedsUpdate;                   // Whether we need to locally update our baked textures

+    U32                     mNumLowresUpdates;              // Number of times we've locally updated with lowres version of our baked textures

+    LLFrameTimer            mNeedsUpdateTimer;              // Tracks time since update was requested and performed.

+};

+

+#endif  // LL_VIEWER_TEXLAYER_H

+