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

diff --git a/indra/newview/llvlcomposition.h b/indra/newview/llvlcomposition.h
index 4915d8d2e0..26449a80bf 100644
--- a/indra/newview/llvlcomposition.h
+++ b/indra/newview/llvlcomposition.h
@@ -1,86 +1,86 @@
-/** 
- * @file llvlcomposition.h
- * @brief Viewer-side representation of a composition layer...
- *
- * $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_LLVLCOMPOSITION_H
-#define LL_LLVLCOMPOSITION_H
-
-#include "llviewerlayer.h"
-#include "llviewertexture.h"
-
-class LLSurface;
-
-class LLVLComposition : public LLViewerLayer
-{
-public:
-	LLVLComposition(LLSurface *surfacep, const U32 width, const F32 scale);
-	/*virtual*/ ~LLVLComposition();
-
-	void setSurface(LLSurface *surfacep);
-
-	// Viewer side hack to generate composition values
-	bool generateHeights(const F32 x, const F32 y, const F32 width, const F32 height);
-	bool generateComposition();
-	// Generate texture from composition values.
-	bool generateTexture(const F32 x, const F32 y, const F32 width, const F32 height);		
-
-	// Use these as indeces ito the get/setters below that use 'corner'
-	enum ECorner
-	{
-		SOUTHWEST = 0,
-		SOUTHEAST = 1,
-		NORTHWEST = 2,
-		NORTHEAST = 3,
-		CORNER_COUNT = 4
-	};
-	LLUUID getDetailTextureID(S32 corner);
-	LLViewerFetchedTexture* getDetailTexture(S32 corner);
-	F32 getStartHeight(S32 corner);
-	F32 getHeightRange(S32 corner);
-
-	void setDetailTextureID(S32 corner, const LLUUID& id);
-	void setStartHeight(S32 corner, F32 start_height);
-	void setHeightRange(S32 corner, F32 range);
-
-	friend class LLVOSurfacePatch;
-	friend class LLDrawPoolTerrain;
-	void setParamsReady()		{ mParamsReady = true; }
-	bool getParamsReady() const	{ return mParamsReady; }
-protected:
-	bool mParamsReady;
-	LLSurface *mSurfacep;
-	bool mTexturesLoaded;
-
-	LLPointer<LLViewerFetchedTexture> mDetailTextures[CORNER_COUNT];
-	LLPointer<LLImageRaw> mRawImages[CORNER_COUNT];
-
-	F32 mStartHeight[CORNER_COUNT];
-	F32 mHeightRange[CORNER_COUNT];
-
-	F32 mTexScaleX;
-	F32 mTexScaleY;
-};
-
-#endif //LL_LLVLCOMPOSITION_H
+/**

+ * @file llvlcomposition.h

+ * @brief Viewer-side representation of a composition layer...

+ *

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

+#define LL_LLVLCOMPOSITION_H

+

+#include "llviewerlayer.h"

+#include "llviewertexture.h"

+

+class LLSurface;

+

+class LLVLComposition : public LLViewerLayer

+{

+public:

+    LLVLComposition(LLSurface *surfacep, const U32 width, const F32 scale);

+    /*virtual*/ ~LLVLComposition();

+

+    void setSurface(LLSurface *surfacep);

+

+    // Viewer side hack to generate composition values

+    bool generateHeights(const F32 x, const F32 y, const F32 width, const F32 height);

+    bool generateComposition();

+    // Generate texture from composition values.

+    bool generateTexture(const F32 x, const F32 y, const F32 width, const F32 height);

+

+    // Use these as indeces ito the get/setters below that use 'corner'

+    enum ECorner

+    {

+        SOUTHWEST = 0,

+        SOUTHEAST = 1,

+        NORTHWEST = 2,

+        NORTHEAST = 3,

+        CORNER_COUNT = 4

+    };

+    LLUUID getDetailTextureID(S32 corner);

+    LLViewerFetchedTexture* getDetailTexture(S32 corner);

+    F32 getStartHeight(S32 corner);

+    F32 getHeightRange(S32 corner);

+

+    void setDetailTextureID(S32 corner, const LLUUID& id);

+    void setStartHeight(S32 corner, F32 start_height);

+    void setHeightRange(S32 corner, F32 range);

+

+    friend class LLVOSurfacePatch;

+    friend class LLDrawPoolTerrain;

+    void setParamsReady()       { mParamsReady = true; }

+    bool getParamsReady() const { return mParamsReady; }

+protected:

+    bool mParamsReady;

+    LLSurface *mSurfacep;

+    bool mTexturesLoaded;

+

+    LLPointer<LLViewerFetchedTexture> mDetailTextures[CORNER_COUNT];

+    LLPointer<LLImageRaw> mRawImages[CORNER_COUNT];

+

+    F32 mStartHeight[CORNER_COUNT];

+    F32 mHeightRange[CORNER_COUNT];

+

+    F32 mTexScaleX;

+    F32 mTexScaleY;

+};

+

+#endif //LL_LLVLCOMPOSITION_H