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

diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
index 25300a8dff..314a00a3a3 100644
--- a/indra/llrender/llfontbitmapcache.h
+++ b/indra/llrender/llfontbitmapcache.h
@@ -1,81 +1,81 @@
-/** 
- * @file llfontbitmapcache.h
- * @brief Storage for previously rendered glyphs.
- *
- * $LicenseInfo:firstyear=2008&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_LLFONTBITMAPCACHE_H
-#define LL_LLFONTBITMAPCACHE_H
-
-#include <vector>
-#include "lltrace.h"
-
-enum class EFontGlyphType : U32
-{
-	Grayscale = 0,
-	Color,
-	Count,
-	Unspecified,
-};
-
-// Maintain a collection of bitmaps containing rendered glyphs.
-// Generalizes the single-bitmap logic from LLFontFreetype and LLFontGL.
-class LLFontBitmapCache
-{
-public:
-	LLFontBitmapCache();
-	~LLFontBitmapCache();
-
-	// Need to call this once, before caching any glyphs.
- 	void init(S32 max_char_width,
-			  S32 max_char_height);
-
-	void reset();
-
-	bool nextOpenPos(S32 width, S32& posX, S32& posY, EFontGlyphType bitmapType, U32& bitmapNum);
-	
-	void destroyGL();
-	
- 	LLImageRaw* getImageRaw(EFontGlyphType bitmapType, U32 bitmapNum) const;
- 	LLImageGL* getImageGL(EFontGlyphType bitmapType, U32 bitmapNum) const;
-
-	S32 getMaxCharWidth() const { return mMaxCharWidth; }
-	U32 getNumBitmaps(EFontGlyphType bitmapType) const { return (bitmapType < EFontGlyphType::Count) ? mImageRawVec[static_cast<U32>(bitmapType)].size() : 0; }
-	S32 getBitmapWidth() const { return mBitmapWidth; }
-	S32 getBitmapHeight() const { return mBitmapHeight; }
-
-protected:
-	static U32 getNumComponents(EFontGlyphType bitmap_type);
-
-private:
-	S32 mBitmapWidth = 0;
-	S32 mBitmapHeight = 0;
-	S32 mCurrentOffsetX[static_cast<U32>(EFontGlyphType::Count)] = { 1 };
-	S32 mCurrentOffsetY[static_cast<U32>(EFontGlyphType::Count)] = { 1 };
-	S32 mMaxCharWidth = 0;
-	S32 mMaxCharHeight = 0;
-	std::vector<LLPointer<LLImageRaw>> mImageRawVec[static_cast<U32>(EFontGlyphType::Count)];
-	std::vector<LLPointer<LLImageGL>> mImageGLVec[static_cast<U32>(EFontGlyphType::Count)];
-};
-
-#endif //LL_LLFONTBITMAPCACHE_H
+/**

+ * @file llfontbitmapcache.h

+ * @brief Storage for previously rendered glyphs.

+ *

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

+#define LL_LLFONTBITMAPCACHE_H

+

+#include <vector>

+#include "lltrace.h"

+

+enum class EFontGlyphType : U32

+{

+    Grayscale = 0,

+    Color,

+    Count,

+    Unspecified,

+};

+

+// Maintain a collection of bitmaps containing rendered glyphs.

+// Generalizes the single-bitmap logic from LLFontFreetype and LLFontGL.

+class LLFontBitmapCache

+{

+public:

+    LLFontBitmapCache();

+    ~LLFontBitmapCache();

+

+    // Need to call this once, before caching any glyphs.

+    void init(S32 max_char_width,

+              S32 max_char_height);

+

+    void reset();

+

+    bool nextOpenPos(S32 width, S32& posX, S32& posY, EFontGlyphType bitmapType, U32& bitmapNum);

+

+    void destroyGL();

+

+    LLImageRaw* getImageRaw(EFontGlyphType bitmapType, U32 bitmapNum) const;

+    LLImageGL* getImageGL(EFontGlyphType bitmapType, U32 bitmapNum) const;

+

+    S32 getMaxCharWidth() const { return mMaxCharWidth; }

+    U32 getNumBitmaps(EFontGlyphType bitmapType) const { return (bitmapType < EFontGlyphType::Count) ? mImageRawVec[static_cast<U32>(bitmapType)].size() : 0; }

+    S32 getBitmapWidth() const { return mBitmapWidth; }

+    S32 getBitmapHeight() const { return mBitmapHeight; }

+

+protected:

+    static U32 getNumComponents(EFontGlyphType bitmap_type);

+

+private:

+    S32 mBitmapWidth = 0;

+    S32 mBitmapHeight = 0;

+    S32 mCurrentOffsetX[static_cast<U32>(EFontGlyphType::Count)] = { 1 };

+    S32 mCurrentOffsetY[static_cast<U32>(EFontGlyphType::Count)] = { 1 };

+    S32 mMaxCharWidth = 0;

+    S32 mMaxCharHeight = 0;

+    std::vector<LLPointer<LLImageRaw>> mImageRawVec[static_cast<U32>(EFontGlyphType::Count)];

+    std::vector<LLPointer<LLImageGL>> mImageGLVec[static_cast<U32>(EFontGlyphType::Count)];

+};

+

+#endif //LL_LLFONTBITMAPCACHE_H