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

diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp
index 1c67e3fb14..19ff9dc047 100644
--- a/indra/llrender/llfontbitmapcache.cpp
+++ b/indra/llrender/llfontbitmapcache.cpp
@@ -1,186 +1,186 @@
-/** 
- * @file llfontbitmapcache.cpp
- * @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$
- */
-
-#include "linden_common.h"
-
-#include "llgl.h"
-#include "llfontbitmapcache.h"
-
-LLFontBitmapCache::LLFontBitmapCache()
-
-{
-}
-
-LLFontBitmapCache::~LLFontBitmapCache()
-{
-}
-
-void LLFontBitmapCache::init(S32 max_char_width,
-							 S32 max_char_height)
-{
-	reset();
-	
-	mMaxCharWidth = max_char_width;
-	mMaxCharHeight = max_char_height;
-
-	S32 image_width = mMaxCharWidth * 20;
-	S32 pow_iw = 2;
-	while (pow_iw < image_width)
-	{
-		pow_iw <<= 1;
-	}
-	image_width = pow_iw;
-	image_width = llmin(512, image_width); // Don't make bigger than 512x512, ever.
-
-	mBitmapWidth = image_width;
-	mBitmapHeight = image_width;
-}
-
-LLImageRaw *LLFontBitmapCache::getImageRaw(EFontGlyphType bitmap_type, U32 bitmap_num) const
-{
-	const U32 bitmap_idx = static_cast<U32>(bitmap_type);
-	if (bitmap_type >= EFontGlyphType::Count || bitmap_num >= mImageRawVec[bitmap_idx].size())
-		return nullptr;
-
-	return mImageRawVec[bitmap_idx][bitmap_num];
-}
-
-LLImageGL *LLFontBitmapCache::getImageGL(EFontGlyphType bitmap_type, U32 bitmap_num) const
-{
-	const U32 bitmap_idx = static_cast<U32>(bitmap_type);
-	if (bitmap_type >= EFontGlyphType::Count || bitmap_num >= mImageGLVec[bitmap_idx].size())
-		return nullptr;
-
-	return mImageGLVec[bitmap_idx][bitmap_num];
-}
-
-
-bool LLFontBitmapCache::nextOpenPos(S32 width, S32& pos_x, S32& pos_y, EFontGlyphType bitmap_type, U32& bitmap_num)
-{
-	if (bitmap_type >= EFontGlyphType::Count)
-	{
-		return false;
-	}
-
-	const U32 bitmap_idx = static_cast<U32>(bitmap_type);
-	if (mImageRawVec[bitmap_idx].empty() || (mCurrentOffsetX[bitmap_idx] + width + 1) > mBitmapWidth)
-	{
-		if ((mImageRawVec[bitmap_idx].empty()) || (mCurrentOffsetY[bitmap_idx] + 2*mMaxCharHeight + 2) > mBitmapHeight)
-		{
-			// We're out of space in the current image, or no image
-			// has been allocated yet.  Make a new one.
-            
-            S32 image_width = mMaxCharWidth * 20;
-            S32 pow_iw = 2;
-            while (pow_iw < image_width)
-            {
-                pow_iw *= 2;
-            }
-            image_width = pow_iw;
-            image_width = llmin(512, image_width); // Don't make bigger than 512x512, ever.
-            S32 image_height = image_width;
-            
-            mBitmapWidth = image_width;
-            mBitmapHeight = image_height;
-            
-			S32 num_components = getNumComponents(bitmap_type);
-			mImageRawVec[bitmap_idx].push_back(new LLImageRaw(mBitmapWidth, mBitmapHeight, num_components));
-			bitmap_num = mImageRawVec[bitmap_idx].size() - 1;
-
-			LLImageRaw* image_raw = getImageRaw(bitmap_type, bitmap_num);
-			if (EFontGlyphType::Grayscale == bitmap_type)
-			{
-				image_raw->clear(255, 0);
-			}
-
-			// Make corresponding GL image.
-			mImageGLVec[bitmap_idx].push_back(new LLImageGL(image_raw, false));
-			LLImageGL* image_gl = getImageGL(bitmap_type, bitmap_num);
-
-			// Start at beginning of the new image.
-			mCurrentOffsetX[bitmap_idx] = 1;
-			mCurrentOffsetY[bitmap_idx] = 1;
-
-			// Attach corresponding GL texture. (*TODO: is this needed?)
-			gGL.getTexUnit(0)->bind(image_gl);
-			image_gl->setFilteringOption(LLTexUnit::TFO_POINT); // was setMipFilterNearest(true, true);
-		}
-		else
-		{
-			// Move to next row in current image.
-			mCurrentOffsetX[bitmap_idx] = 1;
-			mCurrentOffsetY[bitmap_idx] += mMaxCharHeight + 1;
-		}
-	}
-
-	pos_x = mCurrentOffsetX[bitmap_idx];
-	pos_y = mCurrentOffsetY[bitmap_idx];
-	bitmap_num = getNumBitmaps(bitmap_type) - 1;
-
-	mCurrentOffsetX[bitmap_idx] += width + 1;
-
-	return true;
-}
-
-void LLFontBitmapCache::destroyGL()
-{
-	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
-	{
-		for (LLImageGL* image_gl : mImageGLVec[idx])
-		{
-			image_gl->destroyGLTexture();
-		}
-	}
-}
-
-void LLFontBitmapCache::reset()
-{
-	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
-	{
-		mImageRawVec[idx].clear();
-		mImageGLVec[idx].clear();
-		mCurrentOffsetX[idx] = 1;
-		mCurrentOffsetY[idx] = 1;
-	}
-	
-	mBitmapWidth = 0;
-	mBitmapHeight = 0;
-}
-
-//static
-U32 LLFontBitmapCache::getNumComponents(EFontGlyphType bitmap_type)
-{
-	switch (bitmap_type)
-	{
-		case EFontGlyphType::Grayscale:
-			return 2;
-		case EFontGlyphType::Color:
-			return 4;
-		default:
-			llassert(false);
-			return 2;
-	}
-}
+/**

+ * @file llfontbitmapcache.cpp

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

+ */

+

+#include "linden_common.h"

+

+#include "llgl.h"

+#include "llfontbitmapcache.h"

+

+LLFontBitmapCache::LLFontBitmapCache()

+

+{

+}

+

+LLFontBitmapCache::~LLFontBitmapCache()

+{

+}

+

+void LLFontBitmapCache::init(S32 max_char_width,

+                             S32 max_char_height)

+{

+    reset();

+

+    mMaxCharWidth = max_char_width;

+    mMaxCharHeight = max_char_height;

+

+    S32 image_width = mMaxCharWidth * 20;

+    S32 pow_iw = 2;

+    while (pow_iw < image_width)

+    {

+        pow_iw <<= 1;

+    }

+    image_width = pow_iw;

+    image_width = llmin(512, image_width); // Don't make bigger than 512x512, ever.

+

+    mBitmapWidth = image_width;

+    mBitmapHeight = image_width;

+}

+

+LLImageRaw *LLFontBitmapCache::getImageRaw(EFontGlyphType bitmap_type, U32 bitmap_num) const

+{

+    const U32 bitmap_idx = static_cast<U32>(bitmap_type);

+    if (bitmap_type >= EFontGlyphType::Count || bitmap_num >= mImageRawVec[bitmap_idx].size())

+        return nullptr;

+

+    return mImageRawVec[bitmap_idx][bitmap_num];

+}

+

+LLImageGL *LLFontBitmapCache::getImageGL(EFontGlyphType bitmap_type, U32 bitmap_num) const

+{

+    const U32 bitmap_idx = static_cast<U32>(bitmap_type);

+    if (bitmap_type >= EFontGlyphType::Count || bitmap_num >= mImageGLVec[bitmap_idx].size())

+        return nullptr;

+

+    return mImageGLVec[bitmap_idx][bitmap_num];

+}

+

+

+bool LLFontBitmapCache::nextOpenPos(S32 width, S32& pos_x, S32& pos_y, EFontGlyphType bitmap_type, U32& bitmap_num)

+{

+    if (bitmap_type >= EFontGlyphType::Count)

+    {

+        return false;

+    }

+

+    const U32 bitmap_idx = static_cast<U32>(bitmap_type);

+    if (mImageRawVec[bitmap_idx].empty() || (mCurrentOffsetX[bitmap_idx] + width + 1) > mBitmapWidth)

+    {

+        if ((mImageRawVec[bitmap_idx].empty()) || (mCurrentOffsetY[bitmap_idx] + 2*mMaxCharHeight + 2) > mBitmapHeight)

+        {

+            // We're out of space in the current image, or no image

+            // has been allocated yet.  Make a new one.

+

+            S32 image_width = mMaxCharWidth * 20;

+            S32 pow_iw = 2;

+            while (pow_iw < image_width)

+            {

+                pow_iw *= 2;

+            }

+            image_width = pow_iw;

+            image_width = llmin(512, image_width); // Don't make bigger than 512x512, ever.

+            S32 image_height = image_width;

+

+            mBitmapWidth = image_width;

+            mBitmapHeight = image_height;

+

+            S32 num_components = getNumComponents(bitmap_type);

+            mImageRawVec[bitmap_idx].push_back(new LLImageRaw(mBitmapWidth, mBitmapHeight, num_components));

+            bitmap_num = mImageRawVec[bitmap_idx].size() - 1;

+

+            LLImageRaw* image_raw = getImageRaw(bitmap_type, bitmap_num);

+            if (EFontGlyphType::Grayscale == bitmap_type)

+            {

+                image_raw->clear(255, 0);

+            }

+

+            // Make corresponding GL image.

+            mImageGLVec[bitmap_idx].push_back(new LLImageGL(image_raw, false));

+            LLImageGL* image_gl = getImageGL(bitmap_type, bitmap_num);

+

+            // Start at beginning of the new image.

+            mCurrentOffsetX[bitmap_idx] = 1;

+            mCurrentOffsetY[bitmap_idx] = 1;

+

+            // Attach corresponding GL texture. (*TODO: is this needed?)

+            gGL.getTexUnit(0)->bind(image_gl);

+            image_gl->setFilteringOption(LLTexUnit::TFO_POINT); // was setMipFilterNearest(true, true);

+        }

+        else

+        {

+            // Move to next row in current image.

+            mCurrentOffsetX[bitmap_idx] = 1;

+            mCurrentOffsetY[bitmap_idx] += mMaxCharHeight + 1;

+        }

+    }

+

+    pos_x = mCurrentOffsetX[bitmap_idx];

+    pos_y = mCurrentOffsetY[bitmap_idx];

+    bitmap_num = getNumBitmaps(bitmap_type) - 1;

+

+    mCurrentOffsetX[bitmap_idx] += width + 1;

+

+    return true;

+}

+

+void LLFontBitmapCache::destroyGL()

+{

+    for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)

+    {

+        for (LLImageGL* image_gl : mImageGLVec[idx])

+        {

+            image_gl->destroyGLTexture();

+        }

+    }

+}

+

+void LLFontBitmapCache::reset()

+{

+    for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)

+    {

+        mImageRawVec[idx].clear();

+        mImageGLVec[idx].clear();

+        mCurrentOffsetX[idx] = 1;

+        mCurrentOffsetY[idx] = 1;

+    }

+

+    mBitmapWidth = 0;

+    mBitmapHeight = 0;

+}

+

+//static

+U32 LLFontBitmapCache::getNumComponents(EFontGlyphType bitmap_type)

+{

+    switch (bitmap_type)

+    {

+        case EFontGlyphType::Grayscale:

+            return 2;

+        case EFontGlyphType::Color:

+            return 4;

+        default:

+            llassert(false);

+            return 2;

+    }

+}