Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 34 insertions, 34 deletions

diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
index c63281ab70..8f704df44f 100644
--- a/indra/llrender/llfontbitmapcache.h
+++ b/indra/llrender/llfontbitmapcache.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @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$
  */
@@ -32,10 +32,10 @@
 
 enum class EFontGlyphType : U32
 {
-	Grayscale = 0,
-	Color,
-	Count,
-	Unspecified,
+    Grayscale = 0,
+    Color,
+    Count,
+    Unspecified,
 };
 
 // Maintain a collection of bitmaps containing rendered glyphs.
@@ -43,39 +43,39 @@ enum class EFontGlyphType : U32
 class LLFontBitmapCache
 {
 public:
-	LLFontBitmapCache();
-	~LLFontBitmapCache();
+    LLFontBitmapCache();
+    ~LLFontBitmapCache();
+
+    // Need to call this once, before caching any glyphs.
+    void init(S32 max_char_width,
+              S32 max_char_height);
+
+    void reset();
 
-	// Need to call this once, before caching any glyphs.
- 	void init(S32 max_char_width,
-			  S32 max_char_height);
+    BOOL nextOpenPos(S32 width, S32& posX, S32& posY, EFontGlyphType bitmapType, U32& bitmapNum);
 
-	void reset();
+    void destroyGL();
 
-	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;
+    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; }
+    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);
+    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)];
+    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