From 4e2b2f662ad3f7b2e09f9451227bbf7018d91708 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 20 Oct 2019 23:45:52 +0200
Subject: Update freetype to 2.10.1 and move viewer fonts to their own package

---
 .hgignore                                      |   1 +
 autobuild.xml                                  |  38 +++++++++-
 indra/cmake/ViewerMiscLibs.cmake               |   1 +
 indra/newview/CMakeLists.txt                   |   6 ++
 indra/newview/fonts/DejaVu-license.txt         |  99 -------------------------
 indra/newview/fonts/DejaVuSans-Bold.ttf        | Bin 573136 -> 0 bytes
 indra/newview/fonts/DejaVuSans-BoldOblique.ttf | Bin 524056 -> 0 bytes
 indra/newview/fonts/DejaVuSans-Oblique.ttf     | Bin 523804 -> 0 bytes
 indra/newview/fonts/DejaVuSans.ttf             | Bin 622280 -> 0 bytes
 indra/newview/fonts/DejaVuSansMono.ttf         | Bin 321524 -> 0 bytes
 indra/newview/viewer_manifest.py               |   2 +-
 11 files changed, 43 insertions(+), 104 deletions(-)
 delete mode 100644 indra/newview/fonts/DejaVu-license.txt
 delete mode 100644 indra/newview/fonts/DejaVuSans-Bold.ttf
 delete mode 100644 indra/newview/fonts/DejaVuSans-BoldOblique.ttf
 delete mode 100644 indra/newview/fonts/DejaVuSans-Oblique.ttf
 delete mode 100644 indra/newview/fonts/DejaVuSans.ttf
 delete mode 100644 indra/newview/fonts/DejaVuSansMono.ttf

diff --git a/.hgignore b/.hgignore
index 0d672e6ebc..3a5cbe4d94 100755
--- a/.hgignore
+++ b/.hgignore
@@ -36,6 +36,7 @@ indra/newview/browser_profile
 indra/newview/character
 indra/newview/fmod.dll
 indra/newview/fmod.log
+indra/newview/fonts
 indra/newview/mozilla-theme
 indra/newview/mozilla-universal-darwin.tgz
 indra/newview/res/ll_icon.*
diff --git a/autobuild.xml b/autobuild.xml
index 3983e12313..8bd6491edd 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -817,6 +817,36 @@
         <key>version</key>
         <string>4.44.64.501533</string>
       </map>
+      <key>fonts</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright various</string>
+        <key>description</key>
+        <string>Viewer fonts</string>
+        <key>license</key>
+        <string>Various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/fonts.txt</string>
+        <key>name</key>
+        <string>fonts</string>
+        <key>platforms</key>
+        <map>
+          <key>common</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>65b89f06d9b698b376e1736216dd5623</string>
+              <key>url</key>
+              <string>viewer_fonts-1.0-1.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>common</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>1.0</string>
+      </map>
       <key>fontconfig</key>
       <map>
         <key>copyright</key>
@@ -926,9 +956,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b7a8df22cfc910180c66bb1c1ed89cd4</string>
+              <string>d8f5b352176d5c582d91ce936a700b2c</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/876/1922/freetype-2.4.4.500865-windows-500865.tar.bz2</string>
+              <string>freetype-2.10.1.0-windows-72.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -938,9 +968,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ff72a895012ed603935083496b0a7bc9</string>
+              <string>aa8be83cdfcd5cda0343ea72e7d662ca</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/877/1925/freetype-2.4.4.500865-windows64-500865.tar.bz2</string>
+              <string>freetype-2.10.1.0-windows64-72.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index fc5bdedb5a..f213de100c 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -10,3 +10,4 @@ if (NOT USESYSTEMLIBS)
   use_prebuilt_binary(slvoice)
 endif(NOT USESYSTEMLIBS)
 
+use_prebuilt_binary(fonts)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b8789da66b..b83d3afadd 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1470,6 +1470,12 @@ if (WINDOWS)
         set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
     endif(USE_PRECOMPILED_HEADERS)
 
+    message("Copying fonts")
+    file(GLOB FONT_FILE_GLOB_LIST
+      "${AUTOBUILD_INSTALL_DIR}/fonts/*"
+    )
+    file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
+
     # Replace the icons with the appropriate ones for the channel
     # ('test' is the default)
     set(ICON_PATH "test")
diff --git a/indra/newview/fonts/DejaVu-license.txt b/indra/newview/fonts/DejaVu-license.txt
deleted file mode 100644
index 254e2cc42a..0000000000
--- a/indra/newview/fonts/DejaVu-license.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-Bitstream Vera Fonts Copyright
-------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
-
-Arev Fonts Copyright
-------------------------------
-
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
-
-$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
diff --git a/indra/newview/fonts/DejaVuSans-Bold.ttf b/indra/newview/fonts/DejaVuSans-Bold.ttf
deleted file mode 100644
index ec1a2ebaf2..0000000000
Binary files a/indra/newview/fonts/DejaVuSans-Bold.ttf and /dev/null differ
diff --git a/indra/newview/fonts/DejaVuSans-BoldOblique.ttf b/indra/newview/fonts/DejaVuSans-BoldOblique.ttf
deleted file mode 100644
index 1a5576460d..0000000000
Binary files a/indra/newview/fonts/DejaVuSans-BoldOblique.ttf and /dev/null differ
diff --git a/indra/newview/fonts/DejaVuSans-Oblique.ttf b/indra/newview/fonts/DejaVuSans-Oblique.ttf
deleted file mode 100644
index becc549927..0000000000
Binary files a/indra/newview/fonts/DejaVuSans-Oblique.ttf and /dev/null differ
diff --git a/indra/newview/fonts/DejaVuSans.ttf b/indra/newview/fonts/DejaVuSans.ttf
deleted file mode 100644
index c1b19d8705..0000000000
Binary files a/indra/newview/fonts/DejaVuSans.ttf and /dev/null differ
diff --git a/indra/newview/fonts/DejaVuSansMono.ttf b/indra/newview/fonts/DejaVuSansMono.ttf
deleted file mode 100644
index 6bc854ddae..0000000000
Binary files a/indra/newview/fonts/DejaVuSansMono.ttf and /dev/null differ
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index fcb97ded8f..d5526bf5fd 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -137,7 +137,7 @@ class ViewerManifest(LLManifest):
                 self.path("*.tga")
 
             # Include our fonts
-            with self.prefix(src_dst="fonts"):
+            with self.prefix(src="../packages/fonts"):
                 self.path("*.ttf")
                 self.path("*.txt")
 
-- 
cgit v1.2.3


From 05566ce7a7e1895a5b3ab2f9df2587dac63429e1 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 27 Oct 2019 16:41:38 +0200
Subject: Font debugging aid to dump descriptors + individual textures

---
 indra/llrender/llfontbitmapcache.h                 |  1 +
 indra/llrender/llfontfreetype.cpp                  | 33 ++++++++++++++++++++++
 indra/llrender/llfontfreetype.h                    |  1 +
 indra/llrender/llfontgl.cpp                        | 20 +++++++++++++
 indra/llrender/llfontgl.h                          |  4 +++
 indra/llrender/llfontregistry.cpp                  | 11 ++++++++
 indra/llrender/llfontregistry.h                    |  1 +
 indra/newview/llviewermenu.cpp                     |  4 +++
 indra/newview/skins/default/xui/en/menu_login.xml  | 26 +++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 ++++++++
 10 files changed, 113 insertions(+)

diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
index 75df3a94a7..7e0e905756 100644
--- a/indra/llrender/llfontbitmapcache.h
+++ b/indra/llrender/llfontbitmapcache.h
@@ -53,6 +53,7 @@ public:
  	LLImageGL *getImageGL(U32 bitmapNum = 0) const;
 	
 	S32 getMaxCharWidth() const { return mMaxCharWidth; }
+	S32 getNumBitmaps() const { return mImageRawVec.size(); }
 	S32 getNumComponents() const { return mNumComponents; }
 	S32 getBitmapWidth() const { return mBitmapWidth; }
 	S32 getBitmapHeight() const { return mBitmapHeight; }
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index c41730ebaa..78bc6ac433 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -40,8 +40,10 @@
 #include FT_FREETYPE_H
 #endif
 
+#include "lldir.h"
 #include "llerror.h"
 #include "llimage.h"
+#include "llimagepng.h"
 //#include "llimagej2c.h"
 #include "llmath.h"	// Linden math
 #include "llstring.h"
@@ -657,6 +659,37 @@ const std::string &LLFontFreetype::getName() const
 	return mName;
 }
 
+static void dumpFontBitmap(const LLImageRaw* image_raw, const std::string& file_name)
+{
+	LLPointer<LLImagePNG> tmpImage = new LLImagePNG();
+	if ( (tmpImage->encode(image_raw, 0.0f)) && (tmpImage->save(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, file_name))) )
+	{
+		LL_INFOS("Font") << "Successfully saved " << file_name << LL_ENDL;
+	}
+	else
+	{
+		LL_WARNS("Font") << "Failed to save " << file_name << LL_ENDL;
+	}
+}
+
+void LLFontFreetype::dumpFontBitmaps() const
+{
+	// Dump all the regular bitmaps
+	for (int idx = 0, cnt = mFontBitmapCachep->getNumBitmaps(); idx < cnt; idx++)
+	{
+		dumpFontBitmap(mFontBitmapCachep->getImageRaw(idx), llformat("%s_%d_%d_%d.png", mFTFace->family_name, (int)(mPointSize * 10), mStyle, idx));
+	}
+
+//	// Dump all the color bitmaps (if any)
+//	if (mFontColorBitmapCachep)
+//	{
+//		for (int idxBitmap = 0, cntBitmap = mFontColorBitmapCachep->getNumBitmaps(); idxBitmap < cntBitmap; idxBitmap++)
+//		{
+//			dumpFontBitmap(mFontColorBitmapCachep->getImageRaw(idxBitmap), llformat("%s_%d_%d_clr_%d.png", mFTFace->family_name, (int)mPointSize, mStyle, idxBitmap));
+//		}
+//	}
+}
+
 const LLFontBitmapCache* LLFontFreetype::getFontBitmapCache() const
 {
 	return mFontBitmapCachep;
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
index 1afe84e770..a25cc18fcf 100644
--- a/indra/llrender/llfontfreetype.h
+++ b/indra/llrender/llfontfreetype.h
@@ -143,6 +143,7 @@ public:
 
 	const std::string& getName() const;
 
+	void       dumpFontBitmaps() const;
 	const LLFontBitmapCache* getFontBitmapCache() const;
 
 	void setStyle(U8 style);
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 86a4c35e6d..990a3e8281 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -831,6 +831,26 @@ void LLFontGL::initClass(F32 screen_dpi, F32 x_scale, F32 y_scale, const std::st
 	}
 }
 
+void LLFontGL::dumpTextures()
+{
+	if (mFontFreetype.notNull())
+	{
+		mFontFreetype->dumpFontBitmaps();
+	}
+}
+
+// static
+void LLFontGL::dumpFonts()
+{
+	sFontRegistry->dump();
+}
+
+// static
+void LLFontGL::dumpFontTextures()
+{
+	sFontRegistry->dumpTextures();
+}
+
 // Force standard fonts to get generated up front.
 // This is primarily for error detection purposes.
 // Don't do this during initClass because it can be slow and we want to get
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 10891faed9..b1a433f97d 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -163,6 +163,10 @@ public:
 
 	static void initClass(F32 screen_dpi, F32 x_scale, F32 y_scale, const std::string& app_dir, bool create_gl_textures = true);
 
+	       void dumpTextures();
+	static void dumpFonts();
+	static void dumpFontTextures();
+
 	// Load sans-serif, sans-serif-small, etc.
 	// Slow, requires multiple seconds to load fonts.
 	static bool loadDefaultFonts();
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index dbe71e2882..5ab2ab046e 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -721,6 +721,17 @@ void LLFontRegistry::dump()
 	}
 }
 
+void LLFontRegistry::dumpTextures()
+{
+	for (const auto& fontEntry : mFontMap)
+	{
+		if (fontEntry.second)
+		{
+			fontEntry.second->dumpTextures();
+		}
+	}
+}
+
 const string_vec_t& LLFontRegistry::getUltimateFallbackList() const 
 { 
 	return mUltimateFallbackList;
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
index e30c81c630..b1259ef4e7 100644
--- a/indra/llrender/llfontregistry.h
+++ b/indra/llrender/llfontregistry.h
@@ -94,6 +94,7 @@ public:
 	bool nameToSize(const std::string& size_name, F32& size);
 
 	void dump();
+	void dumpTextures();
 	
 	const string_vec_t& getUltimateFallbackList() const;
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 52b2c631fa..f99cbedcbe 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9121,6 +9121,10 @@ void initialize_menus()
 	//Develop (clear cache immediately)
 	commit.add("Develop.ClearCache", boost::bind(&handle_cache_clear_immediately) );
 
+	// Develop (Fonts debugging)
+	commit.add("Develop.Fonts.Dump", boost::bind(&LLFontGL::dumpFonts));
+	commit.add("Develop.Fonts.DumpTextures", boost::bind(&LLFontGL::dumpFontTextures));
+
 	// Admin >Object
 	view_listener_t::addMenu(new LLAdminForceTakeCopy(), "Admin.ForceTakeCopy");
 	view_listener_t::addMenu(new LLAdminHandleObjectOwnerSelf(), "Admin.HandleObjectOwnerSelf");
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 07b3cc3bd8..93795be474 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -166,6 +166,32 @@
              parameter="ui_preview" />
         </menu_item_call>
       <menu_item_separator />
+      <menu
+       create_jump_keys="true"
+       label="Fonts"
+       name="Fonts"
+       tear_off="true">
+        <menu_item_call
+         label="Show Font Test"
+         name="Show Font Test">
+          <menu_item_call.on_click
+           function="Floater.Show"
+           parameter="font_test" />
+        </menu_item_call>
+        <menu_item_separator />
+        <menu_item_call
+         label="Dump Fonts"
+         name="Dump Fonts">
+          <menu_item_call.on_click
+           function="Develop.Fonts.Dump" />
+        </menu_item_call>
+        <menu_item_call
+         label="Dump Font Textures"
+         name="Dump Font Textures">
+          <menu_item_call.on_click
+           function="Develop.Fonts.DumpTextures" />
+        </menu_item_call>
+      </menu>
       <menu
        create_jump_keys="true"
        label="UI Tests"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7bb7b5d62c..d92e633e87 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3194,6 +3194,18 @@
              function="Advanced.WebContentTest"
              parameter="https://cryptic-ridge-1632.herokuapp.com/"/>
           </menu_item_call>
+          <menu_item_call
+           label="Dump Fonts"
+           name="Dump Fonts">
+            <menu_item_call.on_click
+             function="Develop.Fonts.Dump" />
+          </menu_item_call>
+          <menu_item_call
+           label="Dump Font Textures"
+           name="Dump Font Textures">
+            <menu_item_call.on_click
+             function="Develop.Fonts.DumpTextures" />
+          </menu_item_call>
           <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
-- 
cgit v1.2.3


From 9cfdb278de30e4a22d5d38fd08305fd40a905d80 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 28 Oct 2019 23:40:41 +0200
Subject: Support for COLR/CPAL fonts

---
 indra/llrender/llfontbitmapcache.cpp | 175 +++++++++++++++++++----------------
 indra/llrender/llfontbitmapcache.h   |  34 ++++---
 indra/llrender/llfontfreetype.cpp    | 148 ++++++++++++++++++-----------
 indra/llrender/llfontfreetype.h      |   8 +-
 indra/llrender/llfontgl.cpp          |  16 ++--
 indra/llrender/llfontgl.h            |   2 +-
 indra/llrender/llfontregistry.cpp    |   2 +-
 7 files changed, 222 insertions(+), 163 deletions(-)

diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp
index f128636ab2..754adb14cb 100644
--- a/indra/llrender/llfontbitmapcache.cpp
+++ b/indra/llrender/llfontbitmapcache.cpp
@@ -30,152 +30,165 @@
 #include "llfontbitmapcache.h"
 
 LLFontBitmapCache::LLFontBitmapCache()
-:	LLTrace::MemTrackable<LLFontBitmapCache>("LLFontBitmapCache"),
-	mNumComponents(0),
-	mBitmapWidth(0),
-	mBitmapHeight(0),
-	mBitmapNum(-1),
-	mMaxCharWidth(0),
-	mMaxCharHeight(0),
-	mCurrentOffsetX(1),
-	mCurrentOffsetY(1)
+	: LLTrace::MemTrackable<LLFontBitmapCache>("LLFontBitmapCache")
+	, mBitmapWidth(0)
+	, mBitmapHeight(0)
+	, mMaxCharWidth(0)
+	, mMaxCharHeight(0)
 {
+	// *TODO: simplify with initializer after VS2017
+	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
+	{
+		mCurrentOffsetX[idx] = 1;
+		mCurrentOffsetY[idx] = 1;
+	}
 }
 
 LLFontBitmapCache::~LLFontBitmapCache()
 {
 }
 
-void LLFontBitmapCache::init(S32 num_components,
-							 S32 max_char_width,
+void LLFontBitmapCache::init(S32 max_char_width,
 							 S32 max_char_height)
 {
 	reset();
 	
-	mNumComponents = num_components;
 	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(U32 bitmap_num) const
+LLImageRaw *LLFontBitmapCache::getImageRaw(EFontGlyphType bitmap_type, U32 bitmap_num) const
 {
-	if (bitmap_num >= mImageRawVec.size())
-		return NULL;
+	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_num];
+	return mImageRawVec[bitmap_idx][bitmap_num];
 }
 
-LLImageGL *LLFontBitmapCache::getImageGL(U32 bitmap_num) const
+LLImageGL *LLFontBitmapCache::getImageGL(EFontGlyphType bitmap_type, U32 bitmap_num) const
 {
-	if (bitmap_num >= mImageGLVec.size())
-		return NULL;
+	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_num];
+	return mImageGLVec[bitmap_idx][bitmap_num];
 }
 
 
-BOOL LLFontBitmapCache::nextOpenPos(S32 width, S32 &pos_x, S32 &pos_y, S32& bitmap_num)
+BOOL LLFontBitmapCache::nextOpenPos(S32 width, S32& pos_x, S32& pos_y, EFontGlyphType bitmap_type, U32& bitmap_num)
 {
-	if ((mBitmapNum<0) || (mCurrentOffsetX + width + 1) > mBitmapWidth)
+	if (bitmap_type >= EFontGlyphType::Count)
 	{
-		if ((mBitmapNum<0) || (mCurrentOffsetY + 2*mMaxCharHeight + 2) > mBitmapHeight)
+		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.
-			
-			mImageRawVec.push_back(new LLImageRaw);
-			mBitmapNum = mImageRawVec.size()-1;
-			LLImageRaw *image_raw = getImageRaw(mBitmapNum);
+			S32 num_components = getNumComponents(bitmap_type);
+			mImageRawVec[bitmap_idx].push_back(new LLImageRaw(mBitmapWidth, mBitmapHeight, num_components));
+			bitmap_num = mImageRawVec[bitmap_idx].size() - 1;
 
-			// Make corresponding GL image.
-			mImageGLVec.push_back(new LLImageGL(FALSE));
-			LLImageGL *image_gl = getImageGL(mBitmapNum);
-			
-			S32 image_width = mMaxCharWidth * 20;
-			S32 pow_iw = 2;
-			while (pow_iw < image_width)
+			LLImageRaw* image_raw = getImageRaw(bitmap_type, bitmap_num);
+			if (EFontGlyphType::Grayscale == bitmap_type)
 			{
-				pow_iw *= 2;
+				image_raw->clear(255, 0);
 			}
-			image_width = pow_iw;
-			image_width = llmin(512, image_width); // Don't make bigger than 512x512, ever.
-			S32 image_height = image_width;
 
-			image_raw->resize(image_width, image_height, mNumComponents);
-
-			mBitmapWidth = image_width;
-			mBitmapHeight = image_height;
-
-			switch (mNumComponents)
-			{
-				case 1:
-					image_raw->clear();
-				break;
-				case 2:
-					image_raw->clear(255, 0);
-				break;
-			}
+			// 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 = 1;
-			mCurrentOffsetY = 1;
+			mCurrentOffsetX[bitmap_idx] = 1;
+			mCurrentOffsetY[bitmap_idx] = 1;
 
-			// Attach corresponding GL texture.
-			image_gl->createGLTexture(0, image_raw);
+			// Attach corresponding GL texture. (*TODO: is this needed?)
 			gGL.getTexUnit(0)->bind(image_gl);
 			image_gl->setFilteringOption(LLTexUnit::TFO_POINT); // was setMipFilterNearest(TRUE, TRUE);
-
-			claimMem(image_raw);
-			claimMem(image_gl);
 		}
 		else
 		{
 			// Move to next row in current image.
-			mCurrentOffsetX = 1;
-			mCurrentOffsetY += mMaxCharHeight + 1;
+			mCurrentOffsetX[bitmap_idx] = 1;
+			mCurrentOffsetY[bitmap_idx] += mMaxCharHeight + 1;
 		}
 	}
 
-	pos_x = mCurrentOffsetX;
-	pos_y = mCurrentOffsetY;
-	bitmap_num = mBitmapNum;
+	pos_x = mCurrentOffsetX[bitmap_idx];
+	pos_y = mCurrentOffsetY[bitmap_idx];
+	bitmap_num = getNumBitmaps(bitmap_type) - 1;
 
-	mCurrentOffsetX += width + 1;
+	mCurrentOffsetX[bitmap_idx] += width + 1;
 
 	return TRUE;
 }
 
 void LLFontBitmapCache::destroyGL()
 {
-	for (std::vector<LLPointer<LLImageGL> >::iterator it = mImageGLVec.begin();
-		 it != mImageGLVec.end(); ++it)
+	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
 	{
-		(*it)->destroyGLTexture();
+		for (std::vector<LLPointer<LLImageGL> >::iterator it = mImageGLVec[idx].begin(); it != mImageGLVec[idx].end(); ++it)
+		{
+			(*it)->destroyGLTexture();
+		}
 	}
 }
 
 void LLFontBitmapCache::reset()
 {
-	for (std::vector<LLPointer<LLImageRaw> >::iterator it = mImageRawVec.begin(), end_it = mImageRawVec.end();
-		it != end_it;
-		++it)
+	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
 	{
-		disclaimMem(**it);
+		for (std::vector<LLPointer<LLImageRaw> >::iterator it = mImageRawVec[idx].begin(), end_it = mImageRawVec[idx].end(); it != end_it; ++it)
+		{
+			disclaimMem(**it);
+		}
+		mImageRawVec[idx].clear();
 	}
-	mImageRawVec.clear();
 
-	for (std::vector<LLPointer<LLImageGL> >::iterator it = mImageGLVec.begin(), end_it = mImageGLVec.end();
-		it != end_it;
-		++it)
+	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
 	{
-		disclaimMem(**it);
+		for (std::vector<LLPointer<LLImageGL> >::iterator it = mImageGLVec[idx].begin(), end_it = mImageGLVec[idx].end(); it != end_it; ++it)
+		{
+			disclaimMem(**it);
+		}
+		mImageGLVec[idx].clear();
+		mCurrentOffsetX[idx] = 1;
+		mCurrentOffsetY[idx] = 1;
 	}
-	mImageGLVec.clear();
 	
 	mBitmapWidth = 0;
 	mBitmapHeight = 0;
-	mBitmapNum = -1;
-	mCurrentOffsetX = 1;
-	mCurrentOffsetY = 1;
 }
 
+//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;
+	}
+}
diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
index 7e0e905756..f68af0d2b6 100644
--- a/indra/llrender/llfontbitmapcache.h
+++ b/indra/llrender/llfontbitmapcache.h
@@ -30,6 +30,13 @@
 #include <vector>
 #include "lltrace.h"
 
+enum class EFontGlyphType : U32
+{
+	Grayscale = 0,
+	Color,
+	Count
+};
+
 // Maintain a collection of bitmaps containing rendered glyphs.
 // Generalizes the single-bitmap logic from LLFontFreetype and LLFontGL.
 class LLFontBitmapCache : public LLTrace::MemTrackable<LLFontBitmapCache>
@@ -39,36 +46,35 @@ public:
 	~LLFontBitmapCache();
 
 	// Need to call this once, before caching any glyphs.
- 	void init(S32 num_components,
-			  S32 max_char_width,
+ 	void init(S32 max_char_width,
 			  S32 max_char_height);
 
 	void reset();
 
-	BOOL nextOpenPos(S32 width, S32 &posX, S32 &posY, S32 &bitmapNum);
+	BOOL nextOpenPos(S32 width, S32& posX, S32& posY, EFontGlyphType bitmapType, U32& bitmapNum);
 	
 	void destroyGL();
 	
- 	LLImageRaw *getImageRaw(U32 bitmapNum = 0) const;
- 	LLImageGL *getImageGL(U32 bitmapNum = 0) const;
-	
+ 	LLImageRaw* getImageRaw(EFontGlyphType bitmapType, U32 bitmapNum) const;
+ 	LLImageGL* getImageGL(EFontGlyphType bitmapType, U32 bitmapNum) const;
+
 	S32 getMaxCharWidth() const { return mMaxCharWidth; }
-	S32 getNumBitmaps() const { return mImageRawVec.size(); }
-	S32 getNumComponents() const { return mNumComponents; }
+	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 mNumComponents;
 	S32 mBitmapWidth;
 	S32 mBitmapHeight;
-	S32 mBitmapNum;
+	S32 mCurrentOffsetX[static_cast<U32>(EFontGlyphType::Count)];
+	S32 mCurrentOffsetY[static_cast<U32>(EFontGlyphType::Count)];
 	S32 mMaxCharWidth;
 	S32 mMaxCharHeight;
-	S32 mCurrentOffsetX;
-	S32 mCurrentOffsetY;
-	std::vector<LLPointer<LLImageRaw> >	mImageRawVec;
-	std::vector<LLPointer<LLImageGL> > mImageGLVec;
+	std::vector<LLPointer<LLImageRaw>> mImageRawVec[static_cast<U32>(EFontGlyphType::Count)];
+	std::vector<LLPointer<LLImageGL>> mImageGLVec[static_cast<U32>(EFontGlyphType::Count)];
 };
 
 #endif //LL_LLFONTBITMAPCACHE_H
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 78bc6ac433..57154feeec 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -101,6 +101,7 @@ LLFontGlyphInfo::LLFontGlyphInfo(U32 index)
 	mYBitmapOffset(0), 	// Offset to the origin in the bitmap
 	mXBearing(0),		// Distance from baseline to left in pixels
 	mYBearing(0),		// Distance from baseline to top in pixels
+	mBitmapType(EFontGlyphType::Grayscale),
 	mBitmapNum(0) // Which bitmap in the bitmap cache contains this glyph
 {
 }
@@ -159,7 +160,7 @@ void ft_close_cb(FT_Stream stream) {
 }
 #endif
 
-BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, S32 components, BOOL is_fallback, S32 face_n)
+BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n)
 {
 	// Don't leak face objects.  This is also needed to deal with
 	// changed font file names.
@@ -223,7 +224,7 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
 	S32 max_char_width = ll_round(0.5f + (x_max - x_min));
 	S32 max_char_height = ll_round(0.5f + (y_max - y_min));
 
-	mFontBitmapCachep->init(components, max_char_width, max_char_height);
+	mFontBitmapCachep->init(max_char_width, max_char_height);
 	claimMem(mFontBitmapCachep);
 
 
@@ -236,7 +237,7 @@ BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v
 	if (!mIsFallback)
 	{
 		// Add the default glyph
-		addGlyphFromFont(this, 0, 0);
+		addGlyphFromFont(this, 0, 0, EFontGlyphType::Grayscale);
 	}
 
 	mName = filename;
@@ -447,7 +448,7 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch) const
 			glyph_index = FT_Get_Char_Index((*iter)->mFTFace, wch);
 			if (glyph_index)
 			{
-				return addGlyphFromFont(*iter, wch, glyph_index);
+				return addGlyphFromFont(*iter, wch, glyph_index, EFontGlyphType::Color);
 			}
 		}
 	}
@@ -455,29 +456,43 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch) const
 	char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch);
 	if (iter == mCharGlyphInfoMap.end())
 	{
-		return addGlyphFromFont(this, wch, glyph_index);
+		return addGlyphFromFont(this, wch, glyph_index, EFontGlyphType::Color);
 	}
 	return NULL;
 }
 
-LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index) const
+LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const
 {
 	if (mFTFace == NULL)
 		return NULL;
 
 	llassert(!mIsFallback);
-	fontp->renderGlyph(glyph_index);
+	fontp->renderGlyph(bitmap_type, glyph_index);
+	switch (fontp->mFTFace->glyph->bitmap.pixel_mode)
+	{
+		case FT_PIXEL_MODE_MONO:
+		case FT_PIXEL_MODE_GRAY:
+			bitmap_type = EFontGlyphType::Grayscale;
+			break;
+		case FT_PIXEL_MODE_BGRA:
+			bitmap_type = EFontGlyphType::Color;
+			break;
+		default:
+			llassert_always(true);
+			break;
+	}
 	S32 width = fontp->mFTFace->glyph->bitmap.width;
 	S32 height = fontp->mFTFace->glyph->bitmap.rows;
 
 	S32 pos_x, pos_y;
-	S32 bitmap_num;
-	mFontBitmapCachep->nextOpenPos(width, pos_x, pos_y, bitmap_num);
+	U32 bitmap_num;
+	mFontBitmapCachep->nextOpenPos(width, pos_x, pos_y, bitmap_type, bitmap_num);
 	mAddGlyphCount++;
 
 	LLFontGlyphInfo* gi = new LLFontGlyphInfo(glyph_index);
 	gi->mXBitmapOffset = pos_x;
 	gi->mYBitmapOffset = pos_y;
+	gi->mBitmapType = bitmap_type;
 	gi->mBitmapNum = bitmap_num;
 	gi->mWidth = width;
 	gi->mHeight = height;
@@ -489,9 +504,6 @@ LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, l
 
 	insertGlyphInfo(wch, gi);
 
-	llassert(fontp->mFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO
-	    || fontp->mFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
-
 	if (fontp->mFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO
 	    || fontp->mFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY)
 	{
@@ -525,39 +537,32 @@ LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, l
 			buffer_row_stride = width;
 		}
 
-		switch (mFontBitmapCachep->getNumComponents())
-		{
-		case 1:
-			mFontBitmapCachep->getImageRaw(bitmap_num)->setSubImage(pos_x,
-																	pos_y,
-																	width,
-																	height,
-																	buffer_data,
-																	buffer_row_stride,
-																	TRUE);
-			break;
-		case 2:
-			setSubImageLuminanceAlpha(pos_x,	
-									  pos_y,
-									  bitmap_num,
-									  width,
-									  height,
-									  buffer_data,
-									  buffer_row_stride);
-			break;
-		default:
-			break;
-		}
+		setSubImageLuminanceAlpha(pos_x,
+									pos_y,
+									bitmap_num,
+									width,
+									height,
+									buffer_data,
+									buffer_row_stride);
 
 		if (tmp_graydata)
 			delete[] tmp_graydata;
+	}
+	else if (fontp->mFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA)
+	{
+		setSubImageBGRA(pos_x,
+		                pos_y,
+		                bitmap_num,
+		                fontp->mFTFace->glyph->bitmap.width,
+		                fontp->mFTFace->glyph->bitmap.rows,
+		                fontp->mFTFace->glyph->bitmap.buffer,
+		                llabs(fontp->mFTFace->glyph->bitmap.pitch));
 	} else {
-		// we don't know how to handle this pixel format from FreeType;
-		// omit it from the font-image.
+		llassert(false);
 	}
 	
-	LLImageGL *image_gl = mFontBitmapCachep->getImageGL(bitmap_num);
-	LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(bitmap_num);
+	LLImageGL *image_gl = mFontBitmapCachep->getImageGL(bitmap_type, bitmap_num);
+	LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(bitmap_type, bitmap_num);
 	image_gl->setSubImage(image_raw, 0, 0, image_gl->getWidth(), image_gl->getHeight());
 
 	return gi;
@@ -592,12 +597,19 @@ void LLFontFreetype::insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const
 	}
 }
 
-void LLFontFreetype::renderGlyph(U32 glyph_index) const
+void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) const
 {
 	if (mFTFace == NULL)
 		return;
 
-	llassert_always(! FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_FORCE_AUTOHINT) );
+	FT_Int32 load_flags = FT_LOAD_FORCE_AUTOHINT;
+	if (EFontGlyphType::Color == bitmap_type)
+	{
+		// We may not actually get a color render so our caller should always examine mFTFace->glyph->bitmap.pixel_mode
+		load_flags |= FT_LOAD_COLOR;
+	}
+
+	llassert_always(! FT_Load_Glyph(mFTFace, glyph_index, load_flags) );
 
 	llassert_always(! FT_Render_Glyph(mFTFace->glyph, gFontRenderMode) );
 
@@ -607,7 +619,7 @@ void LLFontFreetype::renderGlyph(U32 glyph_index) const
 void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi)
 {
 	resetBitmapCache(); 
-	loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mFontBitmapCachep->getNumComponents(), mIsFallback);
+	loadFace(mName, mPointSize, vert_dpi ,horz_dpi, true, mIsFallback, 0);
 	if (!mIsFallback)
 	{
 		// This is the head of the list - need to rebuild ourself and all fallbacks.
@@ -645,7 +657,7 @@ void LLFontFreetype::resetBitmapCache()
 	if(!mIsFallback)
 	{
 		// Add the empty glyph
-		addGlyphFromFont(this, 0, 0);
+		addGlyphFromFont(this, 0, 0, EFontGlyphType::Grayscale);
 	}
 }
 
@@ -674,20 +686,17 @@ static void dumpFontBitmap(const LLImageRaw* image_raw, const std::string& file_
 
 void LLFontFreetype::dumpFontBitmaps() const
 {
-	// Dump all the regular bitmaps
-	for (int idx = 0, cnt = mFontBitmapCachep->getNumBitmaps(); idx < cnt; idx++)
+	// Dump all the regular bitmaps (if any)
+	for (int idx = 0, cnt = mFontBitmapCachep->getNumBitmaps(EFontGlyphType::Grayscale); idx < cnt; idx++)
 	{
-		dumpFontBitmap(mFontBitmapCachep->getImageRaw(idx), llformat("%s_%d_%d_%d.png", mFTFace->family_name, (int)(mPointSize * 10), mStyle, idx));
+		dumpFontBitmap(mFontBitmapCachep->getImageRaw(EFontGlyphType::Grayscale, idx), llformat("%s_%d_%d_%d.png", mFTFace->family_name, (int)(mPointSize * 10), mStyle, idx));
 	}
 
-//	// Dump all the color bitmaps (if any)
-//	if (mFontColorBitmapCachep)
-//	{
-//		for (int idxBitmap = 0, cntBitmap = mFontColorBitmapCachep->getNumBitmaps(); idxBitmap < cntBitmap; idxBitmap++)
-//		{
-//			dumpFontBitmap(mFontColorBitmapCachep->getImageRaw(idxBitmap), llformat("%s_%d_%d_clr_%d.png", mFTFace->family_name, (int)mPointSize, mStyle, idxBitmap));
-//		}
-//	}
+	// Dump all the color bitmaps (if any)
+	for (int idx = 0, cnt = mFontBitmapCachep->getNumBitmaps(EFontGlyphType::Color); idx < cnt; idx++)
+	{
+		dumpFontBitmap(mFontBitmapCachep->getImageRaw(EFontGlyphType::Color, idx), llformat("%s_%d_%d_%d_clr.png", mFTFace->family_name, (int)(mPointSize * 10), mStyle, idx));
+	}
 }
 
 const LLFontBitmapCache* LLFontFreetype::getFontBitmapCache() const
@@ -705,9 +714,38 @@ U8 LLFontFreetype::getStyle() const
 	return mStyle;
 }
 
+bool LLFontFreetype::setSubImageBGRA(U32 x, U32 y, U32 bitmap_num, U16 width, U16 height, const U8* data, U32 stride) const
+{
+	LLImageRaw* image_raw = mFontBitmapCachep->getImageRaw(EFontGlyphType::Color, bitmap_num);
+	llassert(!mIsFallback);
+	llassert(image_raw && (image_raw->getComponents() == 4));
+
+	// NOTE: inspired by LLImageRaw::setSubImage()
+	U32* image_data = (U32*)image_raw->getData();
+	if (!image_data)
+	{
+		return false;
+	}
+
+	for (U32 idxRow = 0; idxRow < height; idxRow++)
+	{
+		const U32 nSrcRow = height - 1 - idxRow;
+		const U32 nSrcOffset = nSrcRow * width * image_raw->getComponents();
+		const U32 nDstOffset = (y + idxRow) * image_raw->getWidth() + x;
+
+		for (U32 idxCol = 0; idxCol < width; idxCol++)
+		{
+			U32 nTemp = nSrcOffset + idxCol * 4;
+			image_data[nDstOffset + idxCol] = data[nTemp + 3] << 24 | data[nTemp] << 16 | data[nTemp + 1] << 8 | data[nTemp + 2];
+		}
+	}
+
+	return true;
+}
+
 void LLFontFreetype::setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32 width, U32 height, U8 *data, S32 stride) const
 {
-	LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(bitmap_num);
+	LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(EFontGlyphType::Grayscale, bitmap_num);
 
 	llassert(!mIsFallback);
 	llassert(image_raw && (image_raw->getComponents() == 2));
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
index a25cc18fcf..7b7b3faaf0 100644
--- a/indra/llrender/llfontfreetype.h
+++ b/indra/llrender/llfontfreetype.h
@@ -71,6 +71,7 @@ struct LLFontGlyphInfo
 	S32 mYBitmapOffset; // Offset to the origin in the bitmap
 	S32 mXBearing;	// Distance from baseline to left in pixels
 	S32 mYBearing;	// Distance from baseline to top in pixels
+	EFontGlyphType mBitmapType; // Specifies the bitmap type in the bitmap cache
 	S32 mBitmapNum; // Which bitmap in the bitmap cache contains this glyph
 };
 
@@ -84,7 +85,7 @@ public:
 
 	// is_fallback should be true for fallback fonts that aren't used
 	// to render directly (Unicode backup, primarily)
-	BOOL loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, S32 components, BOOL is_fallback, S32 face_n = 0);
+	BOOL loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n);
 
 	S32 getNumFaces(const std::string& filename);
 
@@ -152,10 +153,11 @@ public:
 private:
 	void resetBitmapCache();
 	void setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32 width, U32 height, U8 *data, S32 stride = 0) const;
+	bool setSubImageBGRA(U32 x, U32 y, U32 bitmap_num, U16 width, U16 height, const U8* data, U32 stride) const;
 	BOOL hasGlyph(llwchar wch) const;		// Has a glyph for this character
 	LLFontGlyphInfo* addGlyph(llwchar wch) const;		// Add a new character to the font if necessary
-	LLFontGlyphInfo* addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index) const;	// Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
-	void renderGlyph(U32 glyph_index) const;
+	LLFontGlyphInfo* addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const;	// Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
+	void renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) const;
 	void insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const;
 
 	std::string mName;
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 990a3e8281..6fee34d3eb 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -89,14 +89,14 @@ void LLFontGL::destroyGL()
 	mFontFreetype->destroyGL();
 }
 
-BOOL LLFontGL::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, S32 components, BOOL is_fallback, S32 face_n)
+BOOL LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n)
 {
 	if(mFontFreetype == reinterpret_cast<LLFontFreetype*>(NULL))
 	{
 		mFontFreetype = new LLFontFreetype;
 	}
 
-	return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, components, is_fallback, face_n);
+	return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, use_color, is_fallback, face_n);
 }
 
 S32 LLFontGL::getNumFaces(const std::string& filename)
@@ -280,7 +280,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 
 	LLColor4U text_color(color);
 
-	S32 bitmap_num = -1;
+	std::pair<EFontGlyphType, S32> bitmap_entry = std::make_pair(EFontGlyphType::Grayscale, -1);
 	S32 glyph_count = 0;
 	for (i = begin_offset; i < begin_offset + length; i++)
 	{
@@ -298,8 +298,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 			break;
 		}
 		// Per-glyph bitmap texture.
-		S32 next_bitmap_num = fgi->mBitmapNum;
-		if (next_bitmap_num != bitmap_num)
+		std::pair<EFontGlyphType, S32> next_bitmap_entry = std::make_pair(fgi->mBitmapType, fgi->mBitmapNum);
+		if (next_bitmap_entry != bitmap_entry)
 		{
 			// Actually draw the queued glyphs before switching their texture;
 			// otherwise the queued glyphs will be taken from wrong textures.
@@ -313,8 +313,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 				glyph_count = 0;
 			}
 
-			bitmap_num = next_bitmap_num;
-			LLImageGL *font_image = font_bitmap_cache->getImageGL(bitmap_num);
+			bitmap_entry = next_bitmap_entry;
+			LLImageGL* font_image = font_bitmap_cache->getImageGL(fgi->mBitmapType, bitmap_entry.second);
 			gGL.getTexUnit(0)->bind(font_image);
 		}
 	
@@ -347,7 +347,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 			glyph_count = 0;
 		}
 
-		drawGlyph(glyph_count, vertices, uvs, colors, screen_rect, uv_rect, text_color, style_to_add, shadow, drop_shadow_strength);
+		drawGlyph(glyph_count, vertices, uvs, colors, screen_rect, uv_rect, (fgi->mBitmapType == EFontGlyphType::Grayscale) ? text_color : LLColor4U::white, style_to_add, shadow, drop_shadow_strength);
 
 		chars_drawn++;
 		cur_x += fgi->mXAdvance;
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index b1a433f97d..5028ccc770 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -87,7 +87,7 @@ public:
 
 	void destroyGL();
 
-	BOOL loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, const S32 components, BOOL is_fallback, S32 face_n = 0);
+	BOOL loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n);
 
 	S32 getNumFaces(const std::string& filename);
 
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 5ab2ab046e..426b10b016 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -495,7 +495,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 					fontp = new LLFontGL;
 				}
 				if (fontp->loadFace(*font_paths_it, point_size_scale,
-								 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback, i))
+								 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, true, is_fallback, i))
 				{
 					is_font_loaded = true;
 					if (is_first_found)
-- 
cgit v1.2.3


From 418308bc7ce4e9924d6280f784222ba45172eea4 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 6 Nov 2019 12:34:26 +0100
Subject: Characters can have more than one representation in LLFontFreetype  
 * By default all viewer text will use B/W glyphs   * Added temporary
 use_color attribute to LLTextBase for testing

---
 indra/llrender/llfontbitmapcache.h    |  3 +-
 indra/llrender/llfontfreetype.cpp     | 90 ++++++++++++++++++++++++-----------
 indra/llrender/llfontfreetype.h       | 14 +++---
 indra/llrender/llfontgl.cpp           | 45 +++++++++---------
 indra/llrender/llfontgl.h             | 11 +++--
 indra/llui/llfolderviewitem.cpp       |  6 +--
 indra/llui/lltextbase.cpp             | 11 +++--
 indra/llui/lltextbase.h               |  3 ++
 indra/llui/llview.cpp                 |  2 +-
 indra/newview/llexpandabletextbox.cpp |  2 +-
 indra/newview/llfloateruipreview.cpp  |  8 ++--
 indra/newview/lltextureview.cpp       |  2 +-
 indra/newview/llviewerwindow.cpp      |  2 +-
 indra/newview/llworldmapview.cpp      |  3 +-
 14 files changed, 126 insertions(+), 76 deletions(-)

diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
index f68af0d2b6..5d0094fd69 100644
--- a/indra/llrender/llfontbitmapcache.h
+++ b/indra/llrender/llfontbitmapcache.h
@@ -34,7 +34,8 @@ enum class EFontGlyphType : U32
 {
 	Grayscale = 0,
 	Color,
-	Count
+	Count,
+	Unspecified,
 };
 
 // Maintain a collection of bitmaps containing rendered glyphs.
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 57154feeec..7d66965e57 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -91,8 +91,9 @@ LLFontManager::~LLFontManager()
 }
 
 
-LLFontGlyphInfo::LLFontGlyphInfo(U32 index)
+LLFontGlyphInfo::LLFontGlyphInfo(U32 index, EFontGlyphType glyph_type)
 :	mGlyphIndex(index),
+	mGlyphType(glyph_type),
 	mWidth(0),			// In pixels
 	mHeight(0),			// In pixels
 	mXAdvance(0.f),		// In pixels
@@ -101,11 +102,25 @@ LLFontGlyphInfo::LLFontGlyphInfo(U32 index)
 	mYBitmapOffset(0), 	// Offset to the origin in the bitmap
 	mXBearing(0),		// Distance from baseline to left in pixels
 	mYBearing(0),		// Distance from baseline to top in pixels
-	mBitmapType(EFontGlyphType::Grayscale),
-	mBitmapNum(0) // Which bitmap in the bitmap cache contains this glyph
+	mBitmapEntry(std::make_pair(EFontGlyphType::Unspecified, -1)) // Which bitmap in the bitmap cache contains this glyph
 {
 }
 
+LLFontGlyphInfo::LLFontGlyphInfo(const LLFontGlyphInfo& fgi)
+	: mGlyphIndex(fgi.mGlyphIndex)
+	, mGlyphType(fgi.mGlyphType)
+	, mWidth(fgi.mWidth)
+	, mHeight(fgi.mHeight)
+	, mXAdvance(fgi.mXAdvance)
+	, mYAdvance(fgi.mYAdvance)
+	, mXBitmapOffset(fgi.mXBitmapOffset)
+	, mYBitmapOffset(fgi.mYBitmapOffset)
+	, mXBearing(fgi.mXBearing)
+	, mYBearing(fgi.mYBearing)
+{
+	mBitmapEntry = fgi.mBitmapEntry;
+}
+
 LLFontFreetype::LLFontFreetype()
 :	LLTrace::MemTrackable<LLFontFreetype>("LLFontFreetype"),
 	mFontBitmapCachep(new LLFontBitmapCache),
@@ -361,7 +376,7 @@ F32 LLFontFreetype::getXAdvance(llwchar wch) const
 		return 0.0;
 
 	// Return existing info only if it is current
-	LLFontGlyphInfo* gi = getGlyphInfo(wch);
+	LLFontGlyphInfo* gi = getGlyphInfo(wch, EFontGlyphType::Unspecified);
 	if (gi)
 	{
 		return gi->mXAdvance;
@@ -393,10 +408,10 @@ F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const
 		return 0.0;
 
 	//llassert(!mIsFallback);
-	LLFontGlyphInfo* left_glyph_info = getGlyphInfo(char_left);;
+	LLFontGlyphInfo* left_glyph_info = getGlyphInfo(char_left, EFontGlyphType::Unspecified);;
 	U32 left_glyph = left_glyph_info ? left_glyph_info->mGlyphIndex : 0;
 	// Kern this puppy.
-	LLFontGlyphInfo* right_glyph_info = getGlyphInfo(char_right);
+	LLFontGlyphInfo* right_glyph_info = getGlyphInfo(char_right, EFontGlyphType::Unspecified);
 	U32 right_glyph = right_glyph_info ? right_glyph_info->mGlyphIndex : 0;
 
 	FT_Vector  delta;
@@ -427,12 +442,13 @@ BOOL LLFontFreetype::hasGlyph(llwchar wch) const
 	return(mCharGlyphInfoMap.find(wch) != mCharGlyphInfoMap.end());
 }
 
-LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch) const
+LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch, EFontGlyphType glyph_type) const
 {
 	if (mFTFace == NULL)
 		return FALSE;
 
 	llassert(!mIsFallback);
+	llassert(glyph_type < EFontGlyphType::Count);
 	//LL_DEBUGS() << "Adding new glyph for " << wch << " to font" << LL_ENDL;
 
 	FT_UInt glyph_index;
@@ -448,34 +464,38 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch) const
 			glyph_index = FT_Get_Char_Index((*iter)->mFTFace, wch);
 			if (glyph_index)
 			{
-				return addGlyphFromFont(*iter, wch, glyph_index, EFontGlyphType::Color);
+				return addGlyphFromFont(*iter, wch, glyph_index, glyph_type);
 			}
 		}
 	}
 	
-	char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch);
-	if (iter == mCharGlyphInfoMap.end())
+	std::pair<char_glyph_info_map_t::iterator, char_glyph_info_map_t::iterator> range_it = mCharGlyphInfoMap.equal_range(wch);
+	char_glyph_info_map_t::iterator iter = 
+		std::find_if(range_it.first, range_it.second, [&glyph_type](const char_glyph_info_map_t::value_type& entry) { return entry.second->mGlyphType == glyph_type; });
+	if (iter == range_it.second)
 	{
-		return addGlyphFromFont(this, wch, glyph_index, EFontGlyphType::Color);
+		return addGlyphFromFont(this, wch, glyph_index, glyph_type);
 	}
 	return NULL;
 }
 
-LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const
+LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType requested_glyph_type) const
 {
 	if (mFTFace == NULL)
 		return NULL;
 
 	llassert(!mIsFallback);
-	fontp->renderGlyph(bitmap_type, glyph_index);
+	fontp->renderGlyph(requested_glyph_type, glyph_index);
+
+	EFontGlyphType bitmap_glyph_type = EFontGlyphType::Unspecified;
 	switch (fontp->mFTFace->glyph->bitmap.pixel_mode)
 	{
 		case FT_PIXEL_MODE_MONO:
 		case FT_PIXEL_MODE_GRAY:
-			bitmap_type = EFontGlyphType::Grayscale;
+			bitmap_glyph_type = EFontGlyphType::Grayscale;
 			break;
 		case FT_PIXEL_MODE_BGRA:
-			bitmap_type = EFontGlyphType::Color;
+			bitmap_glyph_type = EFontGlyphType::Color;
 			break;
 		default:
 			llassert_always(true);
@@ -486,14 +506,13 @@ LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, l
 
 	S32 pos_x, pos_y;
 	U32 bitmap_num;
-	mFontBitmapCachep->nextOpenPos(width, pos_x, pos_y, bitmap_type, bitmap_num);
+	mFontBitmapCachep->nextOpenPos(width, pos_x, pos_y, bitmap_glyph_type, bitmap_num);
 	mAddGlyphCount++;
 
-	LLFontGlyphInfo* gi = new LLFontGlyphInfo(glyph_index);
+	LLFontGlyphInfo* gi = new LLFontGlyphInfo(glyph_index, requested_glyph_type);
 	gi->mXBitmapOffset = pos_x;
 	gi->mYBitmapOffset = pos_y;
-	gi->mBitmapType = bitmap_type;
-	gi->mBitmapNum = bitmap_num;
+	gi->mBitmapEntry = std::make_pair(bitmap_glyph_type, bitmap_num);
 	gi->mWidth = width;
 	gi->mHeight = height;
 	gi->mXBearing = fontp->mFTFace->glyph->bitmap_left;
@@ -504,6 +523,13 @@ LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, l
 
 	insertGlyphInfo(wch, gi);
 
+	if (requested_glyph_type != bitmap_glyph_type)
+	{
+		LLFontGlyphInfo* gi_temp = new LLFontGlyphInfo(*gi);
+		gi_temp->mGlyphType = bitmap_glyph_type;
+		insertGlyphInfo(wch, gi_temp);
+	}
+
 	if (fontp->mFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_MONO
 	    || fontp->mFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY)
 	{
@@ -561,31 +587,39 @@ LLFontGlyphInfo* LLFontFreetype::addGlyphFromFont(const LLFontFreetype *fontp, l
 		llassert(false);
 	}
 	
-	LLImageGL *image_gl = mFontBitmapCachep->getImageGL(bitmap_type, bitmap_num);
-	LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(bitmap_type, bitmap_num);
+	LLImageGL *image_gl = mFontBitmapCachep->getImageGL(bitmap_glyph_type, bitmap_num);
+	LLImageRaw *image_raw = mFontBitmapCachep->getImageRaw(bitmap_glyph_type, bitmap_num);
 	image_gl->setSubImage(image_raw, 0, 0, image_gl->getWidth(), image_gl->getHeight());
 
 	return gi;
 }
 
-LLFontGlyphInfo* LLFontFreetype::getGlyphInfo(llwchar wch) const
+LLFontGlyphInfo* LLFontFreetype::getGlyphInfo(llwchar wch, EFontGlyphType glyph_type) const
 {
-	char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch);
-	if (iter != mCharGlyphInfoMap.end())
+	std::pair<char_glyph_info_map_t::iterator, char_glyph_info_map_t::iterator> range_it = mCharGlyphInfoMap.equal_range(wch);
+
+	char_glyph_info_map_t::iterator iter = (EFontGlyphType::Unspecified != glyph_type)
+		? std::find_if(range_it.first, range_it.second, [&glyph_type](const char_glyph_info_map_t::value_type& entry) { return entry.second->mGlyphType == glyph_type; })
+		: range_it.first;
+	if (iter != range_it.second)
 	{
 		return iter->second;
 	}
 	else
 	{
 		// this glyph doesn't yet exist, so render it and return the result
-		return addGlyph(wch);
+		return addGlyph(wch, (EFontGlyphType::Unspecified != glyph_type) ? glyph_type : EFontGlyphType::Grayscale);
 	}
 }
 
 void LLFontFreetype::insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const
 {
-	char_glyph_info_map_t::iterator iter = mCharGlyphInfoMap.find(wch);
-	if (iter != mCharGlyphInfoMap.end())
+	llassert(gi->mGlyphType < EFontGlyphType::Count);
+	std::pair<char_glyph_info_map_t::iterator, char_glyph_info_map_t::iterator> range_it = mCharGlyphInfoMap.equal_range(wch);
+
+	char_glyph_info_map_t::iterator iter =
+		std::find_if(range_it.first, range_it.second, [&gi](const char_glyph_info_map_t::value_type& entry) { return entry.second->mGlyphType == gi->mGlyphType; });
+	if (iter != range_it.second)
 	{
 		delete iter->second;
 		iter->second = gi;
@@ -593,7 +627,7 @@ void LLFontFreetype::insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const
 	else
 	{
 		claimMem(gi);
-		mCharGlyphInfoMap[wch] = gi;
+		mCharGlyphInfoMap.insert(std::make_pair(wch, gi));
 	}
 }
 
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
index 7b7b3faaf0..8c2d2bc491 100644
--- a/indra/llrender/llfontfreetype.h
+++ b/indra/llrender/llfontfreetype.h
@@ -56,9 +56,11 @@ private:
 
 struct LLFontGlyphInfo
 {
-	LLFontGlyphInfo(U32 index);
+	LLFontGlyphInfo(U32 index, EFontGlyphType glyph_type);
+	LLFontGlyphInfo(const LLFontGlyphInfo& fgi);
 
 	U32 mGlyphIndex;
+	EFontGlyphType mGlyphType;
 
 	// Metrics
 	S32 mWidth;			// In pixels
@@ -71,8 +73,7 @@ struct LLFontGlyphInfo
 	S32 mYBitmapOffset; // Offset to the origin in the bitmap
 	S32 mXBearing;	// Distance from baseline to left in pixels
 	S32 mYBearing;	// Distance from baseline to top in pixels
-	EFontGlyphType mBitmapType; // Specifies the bitmap type in the bitmap cache
-	S32 mBitmapNum; // Which bitmap in the bitmap cache contains this glyph
+	std::pair<EFontGlyphType, S32> mBitmapEntry; // Which bitmap in the bitmap cache contains this glyph
 };
 
 extern LLFontManager *gFontManagerp;
@@ -136,7 +137,7 @@ public:
 	F32 getXKerning(llwchar char_left, llwchar char_right) const; // Get the kerning between the two characters
 	F32 getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const; // Get the kerning between the two characters
 
-	LLFontGlyphInfo* getGlyphInfo(llwchar wch) const;
+	LLFontGlyphInfo* getGlyphInfo(llwchar wch, EFontGlyphType glyph_type) const;
 
 	void reset(F32 vert_dpi, F32 horz_dpi);
 
@@ -155,7 +156,7 @@ private:
 	void setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32 width, U32 height, U8 *data, S32 stride = 0) const;
 	bool setSubImageBGRA(U32 x, U32 y, U32 bitmap_num, U16 width, U16 height, const U8* data, U32 stride) const;
 	BOOL hasGlyph(llwchar wch) const;		// Has a glyph for this character
-	LLFontGlyphInfo* addGlyph(llwchar wch) const;		// Add a new character to the font if necessary
+	LLFontGlyphInfo* addGlyph(llwchar wch, EFontGlyphType glyph_type) const;		// Add a new character to the font if necessary
 	LLFontGlyphInfo* addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const;	// Add a glyph from this font to the other (returns the glyph_index, 0 if not found)
 	void renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) const;
 	void insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const;
@@ -179,7 +180,8 @@ private:
 	BOOL mIsFallback;
 	font_vector_t mFallbackFonts; // A list of fallback fonts to look for glyphs in (for Unicode chars)
 
-	typedef boost::unordered_map<llwchar, LLFontGlyphInfo*> char_glyph_info_map_t;
+	// *NOTE: the same glyph can be present with multiple representations (but the pointer is always unique)
+	typedef boost::unordered_multimap<llwchar, LLFontGlyphInfo*> char_glyph_info_map_t;
 	mutable char_glyph_info_map_t mCharGlyphInfoMap; // Information about glyph location in bitmap
 
 	mutable LLFontBitmapCache* mFontBitmapCachep;
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 6fee34d3eb..78017ecb3d 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -112,14 +112,14 @@ S32 LLFontGL::getNumFaces(const std::string& filename)
 static LLTrace::BlockTimerStatHandle FTM_RENDER_FONTS("Fonts");
 
 S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, const LLRect& rect, const LLColor4 &color, HAlign halign, VAlign valign, U8 style,
-    ShadowType shadow, S32 max_chars, F32* right_x, BOOL use_ellipses) const
+    ShadowType shadow, S32 max_chars, F32* right_x, BOOL use_ellipses, BOOL use_color) const
 {
     LLRectf rect_float(rect.mLeft, rect.mTop, rect.mRight, rect.mBottom);
-    return render(wstr, begin_offset, rect_float, color, halign, valign, style, shadow, max_chars, right_x, use_ellipses);
+    return render(wstr, begin_offset, rect_float, color, halign, valign, style, shadow, max_chars, right_x, use_ellipses, use_color);
 }
 
 S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, const LLRectf& rect, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, 
-					 ShadowType shadow, S32 max_chars, F32* right_x, BOOL use_ellipses) const
+					 ShadowType shadow, S32 max_chars, F32* right_x, BOOL use_ellipses, BOOL use_color) const
 {
 	F32 x = rect.mLeft;
 	F32 y = 0.f;
@@ -140,12 +140,12 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, const LLRectf& rec
 		y = rect.mBottom;
 		break;
 	}
-	return render(wstr, begin_offset, x, y, color, halign, valign, style, shadow, max_chars, rect.getWidth(), right_x, use_ellipses);
+	return render(wstr, begin_offset, x, y, color, halign, valign, style, shadow, max_chars, rect.getWidth(), right_x, use_ellipses, use_color);
 }
 
 
 S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, 
-					 ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_ellipses) const
+					 ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_ellipses, BOOL use_color) const
 {
 	LL_RECORD_BLOCK_TIME(FTM_RENDER_FONTS);
 
@@ -290,7 +290,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 		next_glyph = NULL;
 		if(!fgi)
 		{
-			fgi = mFontFreetype->getGlyphInfo(wch);
+			fgi = mFontFreetype->getGlyphInfo(wch, (!use_color) ? EFontGlyphType::Grayscale : EFontGlyphType::Color);
 		}
 		if (!fgi)
 		{
@@ -298,7 +298,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 			break;
 		}
 		// Per-glyph bitmap texture.
-		std::pair<EFontGlyphType, S32> next_bitmap_entry = std::make_pair(fgi->mBitmapType, fgi->mBitmapNum);
+		std::pair<EFontGlyphType, S32> next_bitmap_entry = fgi->mBitmapEntry;
 		if (next_bitmap_entry != bitmap_entry)
 		{
 			// Actually draw the queued glyphs before switching their texture;
@@ -314,7 +314,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 			}
 
 			bitmap_entry = next_bitmap_entry;
-			LLImageGL* font_image = font_bitmap_cache->getImageGL(fgi->mBitmapType, bitmap_entry.second);
+			LLImageGL* font_image = font_bitmap_cache->getImageGL(bitmap_entry.first, bitmap_entry.second);
 			gGL.getTexUnit(0)->bind(font_image);
 		}
 	
@@ -347,7 +347,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 			glyph_count = 0;
 		}
 
-		drawGlyph(glyph_count, vertices, uvs, colors, screen_rect, uv_rect, (fgi->mBitmapType == EFontGlyphType::Grayscale) ? text_color : LLColor4U::white, style_to_add, shadow, drop_shadow_strength);
+		drawGlyph(glyph_count, vertices, uvs, colors, screen_rect, uv_rect, (bitmap_entry.first == EFontGlyphType::Grayscale) ? text_color : LLColor4U::white, style_to_add, shadow, drop_shadow_strength);
 
 		chars_drawn++;
 		cur_x += fgi->mXAdvance;
@@ -357,7 +357,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 		if (next_char && (next_char < LAST_CHARACTER))
 		{
 			// Kern this puppy.
-			next_glyph = mFontFreetype->getGlyphInfo(next_char);
+			next_glyph = mFontFreetype->getGlyphInfo(next_char, (!use_color) ? EFontGlyphType::Grayscale : EFontGlyphType::Color);
 			cur_x += mFontFreetype->getXKerning(fgi, next_glyph);
 		}
 
@@ -411,7 +411,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 				shadow,
 				S32_MAX, max_pixels,
 				right_x,
-				FALSE); 
+				FALSE,
+				use_color); 
 		gGL.popUIMatrix();
 	}
 
@@ -425,19 +426,19 @@ S32 LLFontGL::render(const LLWString &text, S32 begin_offset, F32 x, F32 y, cons
 	return render(text, begin_offset, x, y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
 }
 
-S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels,  F32* right_x, BOOL use_ellipses) const
+S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels,  F32* right_x, BOOL use_ellipses, BOOL use_color) const
 {
-	return render(utf8str_to_wstring(text), begin_offset, x, y, color, halign, valign, style, shadow, max_chars, max_pixels, right_x, use_ellipses);
+	return render(utf8str_to_wstring(text), begin_offset, x, y, color, halign, valign, style, shadow, max_chars, max_pixels, right_x, use_ellipses, use_color);
 }
 
 S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color) const
 {
-	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE, FALSE);
 }
 
 S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, ShadowType shadow) const
 {
-	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, halign, valign, style, shadow, S32_MAX, S32_MAX, NULL, FALSE);
+	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, halign, valign, style, shadow, S32_MAX, S32_MAX, NULL, FALSE, FALSE);
 }
 
 // font metrics - override for LLFontFreetype that returns units of virtual pixels
@@ -514,7 +515,7 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars
 		next_glyph = NULL;
 		if(!fgi)
 		{
-			fgi = mFontFreetype->getGlyphInfo(wch);
+			fgi = mFontFreetype->getGlyphInfo(wch, EFontGlyphType::Unspecified);
 		}
 
 		F32 advance = mFontFreetype->getXAdvance(fgi);
@@ -534,7 +535,7 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars
 			&& (next_char < LAST_CHARACTER))
 		{
 			// Kern this puppy.
-			next_glyph = mFontFreetype->getGlyphInfo(next_char);
+			next_glyph = mFontFreetype->getGlyphInfo(next_char, EFontGlyphType::Unspecified);
 			cur_x += mFontFreetype->getXKerning(fgi, next_glyph);
 		}
 		// Round after kerning.
@@ -616,7 +617,7 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
 		next_glyph = NULL;
 		if(!fgi)
 		{
-			fgi = mFontFreetype->getGlyphInfo(wch);
+			fgi = mFontFreetype->getGlyphInfo(wch, EFontGlyphType::Unspecified);
 
 			if (NULL == fgi)
 			{
@@ -641,7 +642,7 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
 		if (((i+1) < max_chars) && wchars[i+1])
 		{
 			// Kern this puppy.
-			next_glyph = mFontFreetype->getGlyphInfo(wchars[i+1]);
+			next_glyph = mFontFreetype->getGlyphInfo(wchars[i+1], EFontGlyphType::Unspecified);
 			cur_x += mFontFreetype->getXKerning(fgi, next_glyph);
 		}
 
@@ -688,7 +689,7 @@ S32	LLFontGL::firstDrawableChar(const llwchar* wchars, F32 max_pixels, S32 text_
 	{
 		llwchar wch = wchars[i];
 
-		const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch);
+		const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch, EFontGlyphType::Unspecified);
 
 		// last character uses character width, since the whole character needs to be visible
 		// other characters just use advance
@@ -763,7 +764,7 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t
 		next_glyph = NULL;
 		if(!glyph)
 		{
-			glyph = mFontFreetype->getGlyphInfo(wch);
+			glyph = mFontFreetype->getGlyphInfo(wch, EFontGlyphType::Unspecified);
 		}
 		
 		F32 char_width = mFontFreetype->getXAdvance(glyph);
@@ -793,7 +794,7 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t
 			&& (wchars[(pos + 1)]))
 		{
 			// Kern this puppy.
-			next_glyph = mFontFreetype->getGlyphInfo(wchars[pos + 1]);
+			next_glyph = mFontFreetype->getGlyphInfo(wchars[pos + 1], EFontGlyphType::Unspecified);
 			cur_x += mFontFreetype->getXKerning(glyph, next_glyph);
 		}
 
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 5028ccc770..68bf5db668 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -98,7 +98,8 @@ public:
 				U8 style = NORMAL, ShadowType shadow = NO_SHADOW, 
 				S32 max_chars = S32_MAX,
 				F32* right_x=NULL, 
-				BOOL use_ellipses = FALSE) const;
+				BOOL use_ellipses = FALSE,
+				BOOL use_color = FALSE) const;
 
 	S32 render(const LLWString &text, S32 begin_offset, 
 				const LLRectf& rect, 
@@ -107,7 +108,8 @@ public:
 				U8 style = NORMAL, ShadowType shadow = NO_SHADOW, 
 				S32 max_chars = S32_MAX,
 				F32* right_x=NULL, 
-				BOOL use_ellipses = FALSE) const;
+				BOOL use_ellipses = FALSE,
+				BOOL use_color = FALSE) const;
 
 	S32 render(const LLWString &text, S32 begin_offset, 
 				F32 x, F32 y, 
@@ -116,12 +118,13 @@ public:
 				U8 style = NORMAL, ShadowType shadow = NO_SHADOW, 
 				S32 max_chars = S32_MAX, S32 max_pixels = S32_MAX, 
 				F32* right_x=NULL, 
-				BOOL use_ellipses = FALSE) const;
+				BOOL use_ellipses = FALSE,
+				BOOL use_color = FALSE) const;
 
 	S32 render(const LLWString &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color) const;
 
 	// renderUTF8 does a conversion, so is slower!
-	S32 renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels,  F32* right_x, BOOL use_ellipses) const;
+	S32 renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels,  F32* right_x, BOOL use_ellipses, BOOL use_color) const;
 	S32 renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color) const;
 	S32 renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style = NORMAL, ShadowType shadow = NO_SHADOW) const;
 
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 0510e472c5..0c1c3c40ec 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -826,7 +826,7 @@ void LLFolderViewItem::drawLabel(const LLFontGL * font, const F32 x, const F32 y
     //
     font->renderUTF8(mLabel, 0, x, y, color,
         LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-        S32_MAX, getRect().getWidth() - (S32) x - mLabelPaddingRight, &right_x, TRUE);
+        S32_MAX, getRect().getWidth() - (S32) x - mLabelPaddingRight, &right_x, /*use_ellipses*/TRUE, /*use_color*/FALSE);
 }
 
 void LLFolderViewItem::draw()
@@ -905,7 +905,7 @@ void LLFolderViewItem::draw()
 	{
 		font->renderUTF8( mLabelSuffix, 0, right_x, y, isFadeItem() ? color : (LLColor4)sSuffixColor,
 						  LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-						  S32_MAX, S32_MAX, &right_x, FALSE );
+						  S32_MAX, S32_MAX, &right_x, /*use_ellipses*/FALSE, /*use_color*/FALSE );
 	}
 
 	//--------------------------------------------------------------------------------//
@@ -917,7 +917,7 @@ void LLFolderViewItem::draw()
         F32 yy = (F32)getRect().getHeight() - font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
         font->renderUTF8( combined_string, mViewModelItem->getFilterStringOffset(), match_string_left, yy,
             sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-            filter_string_length, S32_MAX, &right_x, FALSE );
+            filter_string_length, S32_MAX, &right_x, /*use_ellipses*/FALSE, /*use_color*/FALSE );
     }
 
     //Gilbert Linden 9-20-2012: Although this should be legal, removing it because it causes the mLabelSuffix rendering to
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index a23741b6dd..64b3a0ddcc 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -163,6 +163,7 @@ LLTextBase::Params::Params()
 	wrap("wrap"),
 	trusted_content("trusted_content", true),
 	use_ellipses("use_ellipses", false),
+	use_color("use_color", false),
 	parse_urls("parse_urls", false),
 	force_urls_external("force_urls_external", false),
 	parse_highlights("parse_highlights", false)
@@ -217,6 +218,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mPlainText ( p.plain_text ),
 	mWordWrap(p.wrap),
 	mUseEllipses( p.use_ellipses ),
+	mUseColor(p.use_color),
 	mParseHTML(p.parse_urls),
 	mForceUrlsExternal(p.force_urls_external),
 	mParseHighlights(p.parse_highlights),
@@ -3198,7 +3200,8 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele
 				 mStyle->getShadowType(), 
 				 length,
 				 &right_x, 
-				 mEditor.getUseEllipses());
+				 mEditor.getUseEllipses(),
+				 mEditor.getUseColor());
 	}
 	rect.mLeft = right_x;
 	
@@ -3217,7 +3220,8 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele
 				 LLFontGL::NO_SHADOW, 
 				 length,
 				 &right_x, 
-				 mEditor.getUseEllipses());
+				 mEditor.getUseEllipses(),
+				 mEditor.getUseColor());
 	}
 	rect.mLeft = right_x;
 	if( selection_end < seg_end )
@@ -3234,7 +3238,8 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele
 				 mStyle->getShadowType(), 
 				 length,
 				 &right_x, 
-				 mEditor.getUseEllipses());
+				 mEditor.getUseEllipses(),
+				 mEditor.getUseColor());
 	}
     return right_x;
 }
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 9831c35858..6f1e178e36 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -314,6 +314,7 @@ public:
 								plain_text,
 								wrap,
 								use_ellipses,
+								use_color,
 								parse_urls,
 								force_urls_external,
 								parse_highlights,
@@ -389,6 +390,7 @@ public:
 	// used by LLTextSegment layout code
 	bool					getWordWrap() { return mWordWrap; }
 	bool					getUseEllipses() { return mUseEllipses; }
+	bool					getUseColor() { return mUseColor; }
 	bool					truncate(); // returns true of truncation occurred
 
 	bool					isContentTrusted() {return mTrustedContent;}
@@ -681,6 +683,7 @@ protected:
 	bool						mParseHighlights;	// highlight user-defined keywords
 	bool                		mWordWrap;
 	bool						mUseEllipses;
+	bool						mUseColor;
 	bool						mTrackEnd;			// if true, keeps scroll position at end of document during resize
 	bool						mReadOnly;
 	bool						mBGVisible;			// render background?
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 89ad8138d8..40537e6c4a 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1282,7 +1282,7 @@ void LLView::drawDebugRect()
 										debug_rect.getWidth(), debug_rect.getHeight());
 			LLFontGL::getFontSansSerifSmall()->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
 												LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-												S32_MAX, S32_MAX, NULL, FALSE);
+												S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
 		}
 	}
 	LLUI::popMatrix();
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index d657f04457..a03b84daa5 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -88,7 +88,7 @@ public:
 									mStyle->getShadowType(), 
 									end - start, draw_rect.getWidth(), 
 									&right_x, 
-									mEditor.getUseEllipses());
+									mEditor.getUseEllipses(), mEditor.getUseColor());
 		return right_x;
 	}
 	/*virtual*/ bool	canEdit() const { return false; }
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index db5a192287..211371571d 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -1601,7 +1601,7 @@ void LLOverlapPanel::draw()
 		LLUI::translate(5,getRect().getHeight()-20);	// translate to top-5,left-5
 		LLView::sDrawPreviewHighlights = FALSE;
 		LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection_text, 0, 0, 0, text_color,
-				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
 	}
 	else
 	{
@@ -1619,7 +1619,7 @@ void LLOverlapPanel::draw()
 			std::string current_selection = std::string(current_selection_text + LLView::sPreviewClickedElement->getName() + " (no elements overlap)");
 			S32 text_width = LLFontGL::getFontSansSerifSmall()->getWidth(current_selection) + 10;
 			LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection, 0, 0, 0, text_color,
-					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
 			// widen panel enough to fit this text
 			LLRect rect = getRect();
 			setRect(LLRect(rect.mLeft,rect.mTop,rect.getWidth() < text_width ? rect.mLeft + text_width : rect.mRight,rect.mTop));
@@ -1685,7 +1685,7 @@ void LLOverlapPanel::draw()
 		// draw currently-selected element at top of overlappers
 		LLUI::translate(0,-mSpacing);
 		LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection_text + LLView::sPreviewClickedElement->getName(), 0, 0, 0, text_color,
-				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
 		LLUI::translate(0,-mSpacing-LLView::sPreviewClickedElement->getRect().getHeight());	// skip spacing distance + height
 		LLView::sPreviewClickedElement->draw();
 
@@ -1700,7 +1700,7 @@ void LLOverlapPanel::draw()
 			// draw name
 			LLUI::translate(0,-mSpacing);
 			LLFontGL::getFontSansSerifSmall()->renderUTF8(overlapper_text + viewp->getName(), 0, 0, 0, text_color,
-					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
 
 			// draw element
 			LLUI::translate(0,-mSpacing-viewp->getRect().getHeight());	// skip spacing distance + height
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 0d2edc0268..9ec6b99416 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -612,7 +612,7 @@ void LLGLTexMemBar::draw()
 	LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*3,
 											 text_color, LLFontGL::LEFT, LLFontGL::TOP,
 											 LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX,
-											 &x_right, FALSE);
+											 &x_right, /*use_ellipses*/FALSE, /*use_color*/FALSE);
 
 	F32Kilobits bandwidth(LLAppViewer::getTextureFetch()->getTextureBandwidth());
 	F32Kilobits max_bandwidth(gSavedSettings.getF32("ThrottleBandwidthKBPS"));
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index c3cf07e9c7..e4d445b95c 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -867,7 +867,7 @@ public:
 			const Line& line = *iter;
 			LLFontGL::getFontMonospace()->renderUTF8(line.text, 0, (F32)line.x, (F32)line.y, mTextColor,
 											 LLFontGL::LEFT, LLFontGL::TOP,
-											 LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+											 LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
 		}
 		mLineList.clear();
 	}
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 86249badaa..ff1f95526e 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -469,7 +469,8 @@ void LLWorldMapView::draw()
 					S32_MAX, //max_chars
 					sMapScale, //max_pixels
 					NULL,
-					TRUE); //use ellipses
+					/*use_ellipses*/TRUE,
+					/*use_color*/FALSE);
 			}
 		}
 	}
-- 
cgit v1.2.3


From 5a6ddb2ea666e895890d3cb690cce5101cf12652 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 7 Nov 2019 17:15:21 +0100
Subject: Fallback fonts can have first crack at adding an unknown character +
 set Twemoji as the viewer's fallback for all emoji blocks

---
 autobuild.xml                                |  90 ++++++++++++++++
 indra/cmake/CMakeLists.txt                   |   2 +
 indra/cmake/FindICU4C.cmake                  |  33 ++++++
 indra/cmake/ICU4C.cmake                      |  22 ++++
 indra/llcommon/CMakeLists.txt                |   2 +
 indra/llcommon/llstring.cpp                  |  26 +++++
 indra/llcommon/llstring.h                    |   2 +
 indra/llrender/llfontfreetype.cpp            |  42 +++++---
 indra/llrender/llfontfreetype.h              |  12 +--
 indra/llrender/llfontgl.cpp                  |   4 +-
 indra/llrender/llfontgl.h                    |   2 +-
 indra/llrender/llfontregistry.cpp            | 150 +++++++++++++++------------
 indra/llrender/llfontregistry.h              |  42 ++++++--
 indra/newview/CMakeLists.txt                 |   2 +
 indra/newview/skins/default/xui/en/fonts.xml |   1 +
 indra/win_crash_logger/CMakeLists.txt        |   2 +
 16 files changed, 333 insertions(+), 101 deletions(-)
 create mode 100644 indra/cmake/FindICU4C.cmake
 create mode 100644 indra/cmake/ICU4C.cmake

diff --git a/autobuild.xml b/autobuild.xml
index 8bd6491edd..131c7614c0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1519,6 +1519,96 @@
         <key>version</key>
         <string>2012.1-2</string>
       </map>
+      <key>icu4c</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1995-2011 International Business Machines Corporation and others &lt;http://source.icu-project.org&gt;</string>
+        <key>description</key>
+        <string>ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.</string>
+        <key>license</key>
+        <string>ICU, permissive non-copyleft free software license</string>
+        <key>license_file</key>
+        <string>LICENSES/icu.txt</string>
+        <key>name</key>
+        <string>icu4c</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>910edfc0b936389bc8804c42d1008aa8</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/icu4c_3p-update-icu4c/rev/295486/arch/Darwin/installer/icu4c-4.8.1-darwin-295486.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>2c34cb4e62d1f155d5dad798e69d03c8</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/466/1005/icu4c-4.8.1-darwin64-500388.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>0a4423cfd26409f33ae81fb9806a9972</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-icu4c/rev/314152/arch/Linux/installer/icu4c-4.8.1-linux-314152.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+          <key>linux64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>b327031733c36efe2eee4582aefb2d66</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/462/995/icu4c-4.8.1-linux64-500388.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+          <string>af354f6ab6d2cecf266c79031977e3e0</string>
+          <key>url</key>
+          <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/492/1078/icu4c-4.8.1-windows-500388.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>e8b20cea748b90ea18bb63dfba06e059</string>
+              <key>url</key>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/491/1075/icu4c-4.8.1-windows64-500388.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>4.8.1</string>
+      </map>
       <key>jpeglib</key>
       <map>
         <key>copyright</key>
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 84e1c5d6fd..d64c38b1b3 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -32,6 +32,7 @@ set(cmake_SOURCE_FILES
     FindGLH.cmake
     FindGoogleBreakpad.cmake
     FindHUNSPELL.cmake
+    FindICU4C.cmake
     FindJsonCpp.cmake
     FindNDOF.cmake
     FindOpenJPEG.cmake
@@ -49,6 +50,7 @@ set(cmake_SOURCE_FILES
     GoogleMock.cmake
     Havok.cmake
     Hunspell.cmake
+    ICU4C.cmake
     JPEG.cmake
     JsonCpp.cmake
     LLAddBuildTest.cmake
diff --git a/indra/cmake/FindICU4C.cmake b/indra/cmake/FindICU4C.cmake
new file mode 100644
index 0000000000..327d761a88
--- /dev/null
+++ b/indra/cmake/FindICU4C.cmake
@@ -0,0 +1,33 @@
+# -*- cmake -*-
+
+# - Find ICU4C
+# This module defines
+#  ICU4C_INCLUDE_DIR, where to find headers
+#  ICU4C_LIBRARY, the library needed to use ICU4C.
+#  ICU4C_FOUND, If false, do not try to use ICU4C.
+
+find_path(ICU4C_INCLUDE_DIR uchar.h
+  PATH_SUFFIXES unicode
+  )
+
+set(ICU4C_NAMES ${ICU4C_NAMES} icuuc)
+find_library(ICU4C_LIBRARY
+  NAMES ${ICU4C_NAMES}
+  )
+
+if (ICU4C_LIBRARY AND ICU4C_INCLUDE_DIR)
+  set(ICU4C_FOUND "YES")
+else (ICU4C_LIBRARY AND ICU4C_INCLUDE_DIR)
+  set(ICU4C_FOUND "NO")
+endif (ICU4C_LIBRARY AND ICU4C_INCLUDE_DIR)
+
+if (ICU4C_FOUND)
+    message(STATUS "Found ICU4C: Library in '${ICU4C_LIBRARY}' and header in '${ICU4C_INCLUDE_DIR}' ")
+else (ICU4C_FOUND)
+    message(FATAL_ERROR " * * *\nCould not find ICU4C library! * * *")
+endif (ICU4C_FOUND)
+
+mark_as_advanced(
+  ICU4C_LIBRARY
+  ICU4C_INCLUDE_DIR
+  )
diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
new file mode 100644
index 0000000000..007a9b6937
--- /dev/null
+++ b/indra/cmake/ICU4C.cmake
@@ -0,0 +1,22 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+set(ICU4C_FIND_QUIETLY ON)
+set(ICU4C_FIND_REQUIRED ON)
+
+if (USESYSTEMLIBS)
+  include(FindICU4C)
+else (USESYSTEMLIBS)
+  use_prebuilt_binary(icu4c)
+  if (WINDOWS)
+    set(ICU4C_LIBRARY icuuc)
+  #elseif(DARWIN)
+  #  set(ICU4C_LIBRARY ...)
+  #elseif(LINUX)
+  #  set(ICU4C_LIBRARY ...)
+  else()
+    message(FATAL_ERROR "Invalid platform")
+  endif()
+  set(ICU4C_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/unicode)
+  use_prebuilt_binary(dictionaries)
+endif (USESYSTEMLIBS)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index af41b9e460..ba87d93fec 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -4,6 +4,7 @@
 project(llcommon)
 
 include(00-Common)
+include(ICU4C)
 include(LLCommon)
 include(Linking)
 include(Boost)
@@ -288,6 +289,7 @@ target_link_libraries(
     ${APRUTIL_LIBRARIES}
     ${APR_LIBRARIES}
     ${EXPAT_LIBRARIES}
+    ${ICU4C_LIBRARY}
     ${JSONCPP_LIBRARIES}
     ${ZLIB_LIBRARIES}
     ${WINDOWS_LIBRARIES}
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 0174c411b4..b272728200 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -30,6 +30,7 @@
 #include "llerror.h"
 #include "llfasttimer.h"
 #include "llsd.h"
+#include <unicode/uchar.h>
 #include <vector>
 
 #if LL_WINDOWS
@@ -888,6 +889,31 @@ std::string LLStringOps::sDayFormat;
 std::string LLStringOps::sAM;
 std::string LLStringOps::sPM;
 
+// static
+bool LLStringOps::isEmoji(llwchar wch)
+{
+	switch (ublock_getCode(wch))
+	{
+		case UBLOCK_MISCELLANEOUS_SYMBOLS:
+		case UBLOCK_DINGBATS:
+		case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS:
+		case UBLOCK_EMOTICONS:
+		case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS:
+#if U_ICU_VERSION_MAJOR_NUM > 56
+		// Boost uses ICU so we can't update it independently
+		case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
+#endif // U_ICU_VERSION_MAJOR_NUM > 56
+			return true;
+		default:
+#if U_ICU_VERSION_MAJOR_NUM > 56
+			return false;
+#else
+			// See https://en.wikipedia.org/wiki/Supplemental_Symbols_and_Pictographs
+			return wch >= 0x1F900 && wch <= 0x1F9FF;
+#endif // U_ICU_VERSION_MAJOR_NUM > 56
+	}
+}
+
 
 S32	LLStringOps::collate(const llwchar* a, const llwchar* b)
 { 
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index b619a9e48c..d31d0cafc7 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -193,6 +193,8 @@ public:
 	static bool isAlnum(char a) { return isalnum((unsigned char)a) != 0; }
 	static bool isAlnum(llwchar a) { return iswalnum(a) != 0; }
 
+	static bool isEmoji(llwchar wch);
+
 	static S32	collate(const char* a, const char* b) { return strcoll(a, b); }
 	static S32	collate(const llwchar* a, const llwchar* b);
 
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 7d66965e57..25740a5f87 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -175,7 +175,7 @@ void ft_close_cb(FT_Stream stream) {
 }
 #endif
 
-BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n)
+BOOL LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n)
 {
 	// Don't leak face objects.  This is also needed to deal with
 	// changed font file names.
@@ -345,14 +345,11 @@ void LLFontFreetype::clearFontStreams()
 }
 #endif
 
-void LLFontFreetype::setFallbackFonts(const font_vector_t &font)
+void LLFontFreetype::addFallbackFont(const LLPointer<LLFontFreetype>& fallback_font, const char_functor_t& functor)
 {
-	mFallbackFonts = font;
-}
-
-const LLFontFreetype::font_vector_t &LLFontFreetype::getFallbackFonts() const
-{
-	return mFallbackFonts;
+	// Insert functor fallbacks before generic fallbacks
+	mFallbackFonts.insert((functor) ? std::find_if(mFallbackFonts.begin(), mFallbackFonts.end(), [](const fallback_font_t& fe) { return !fe.second; }) : mFallbackFonts.end(),
+	                      std::make_pair(fallback_font, functor));
 }
 
 F32 LLFontFreetype::getLineHeight() const
@@ -453,18 +450,31 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch, EFontGlyphType glyph_type
 
 	FT_UInt glyph_index;
 
+	// Fallback fonts with a functor have precedence over everything else
+	fallback_font_vector_t::const_iterator it_fallback = mFallbackFonts.cbegin();
+	for (; it_fallback != mFallbackFonts.cend() && it_fallback->second; ++it_fallback)
+	{
+		if (it_fallback->second(wch))
+		{
+			glyph_index = FT_Get_Char_Index(it_fallback->first->mFTFace, wch);
+			if (glyph_index)
+			{
+				return addGlyphFromFont(it_fallback->first, wch, glyph_index, glyph_type);
+			}
+		}
+	}
+
 	// Initialize char to glyph map
 	glyph_index = FT_Get_Char_Index(mFTFace, wch);
 	if (glyph_index == 0)
 	{
 		//LL_INFOS() << "Trying to add glyph from fallback font!" << LL_ENDL;
-		font_vector_t::const_iterator iter;
-		for(iter = mFallbackFonts.begin(); iter != mFallbackFonts.end(); iter++)
+		for (; it_fallback != mFallbackFonts.cend(); ++it_fallback)
 		{
-			glyph_index = FT_Get_Char_Index((*iter)->mFTFace, wch);
+			glyph_index = FT_Get_Char_Index(it_fallback->first->mFTFace, wch);
 			if (glyph_index)
 			{
-				return addGlyphFromFont(*iter, wch, glyph_index, glyph_type);
+				return addGlyphFromFont(it_fallback->first, wch, glyph_index, glyph_type);
 			}
 		}
 	}
@@ -653,7 +663,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) co
 void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi)
 {
 	resetBitmapCache(); 
-	loadFace(mName, mPointSize, vert_dpi ,horz_dpi, true, mIsFallback, 0);
+	loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mIsFallback, 0);
 	if (!mIsFallback)
 	{
 		// This is the head of the list - need to rebuild ourself and all fallbacks.
@@ -663,11 +673,9 @@ void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi)
 		}
 		else
 		{
-			for(font_vector_t::iterator it = mFallbackFonts.begin();
-				it != mFallbackFonts.end();
-				++it)
+			for (fallback_font_vector_t::iterator it = mFallbackFonts.begin(); it != mFallbackFonts.end(); ++it)
 			{
-				(*it)->reset(vert_dpi, horz_dpi);
+				it->first->reset(vert_dpi, horz_dpi);
 			}
 		}
 	}
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
index 8c2d2bc491..8afc5e3ed5 100644
--- a/indra/llrender/llfontfreetype.h
+++ b/indra/llrender/llfontfreetype.h
@@ -86,7 +86,7 @@ public:
 
 	// is_fallback should be true for fallback fonts that aren't used
 	// to render directly (Unicode backup, primarily)
-	BOOL loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n);
+	BOOL loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n);
 
 	S32 getNumFaces(const std::string& filename);
 
@@ -95,10 +95,8 @@ public:
 	void clearFontStreams();
 #endif
 
-	typedef std::vector<LLPointer<LLFontFreetype> > font_vector_t;
-
-	void setFallbackFonts(const font_vector_t &font);
-	const font_vector_t &getFallbackFonts() const;
+	typedef std::function<bool(llwchar)> char_functor_t;
+	void addFallbackFont(const LLPointer<LLFontFreetype>& fallback_font, const char_functor_t& functor = nullptr);
 
 	// Global font metrics - in units of pixels
 	F32 getLineHeight() const;
@@ -178,7 +176,9 @@ private:
 #endif
 
 	BOOL mIsFallback;
-	font_vector_t mFallbackFonts; // A list of fallback fonts to look for glyphs in (for Unicode chars)
+	typedef std::pair<LLPointer<LLFontFreetype>, char_functor_t> fallback_font_t;
+	typedef std::vector<fallback_font_t> fallback_font_vector_t;
+	fallback_font_vector_t mFallbackFonts; // A list of fallback fonts to look for glyphs in (for Unicode chars)
 
 	// *NOTE: the same glyph can be present with multiple representations (but the pointer is always unique)
 	typedef boost::unordered_multimap<llwchar, LLFontGlyphInfo*> char_glyph_info_map_t;
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 78017ecb3d..4770f79395 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -89,14 +89,14 @@ void LLFontGL::destroyGL()
 	mFontFreetype->destroyGL();
 }
 
-BOOL LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n)
+BOOL LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n)
 {
 	if(mFontFreetype == reinterpret_cast<LLFontFreetype*>(NULL))
 	{
 		mFontFreetype = new LLFontFreetype;
 	}
 
-	return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, use_color, is_fallback, face_n);
+	return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n);
 }
 
 S32 LLFontGL::getNumFaces(const std::string& filename)
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 68bf5db668..a60feb87cb 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -87,7 +87,7 @@ public:
 
 	void destroyGL();
 
-	BOOL loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool use_color, bool is_fallback, S32 face_n);
+	BOOL loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n);
 
 	S32 getNumFaces(const std::string& filename);
 
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 426b10b016..ac2b695a3e 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -46,6 +46,10 @@ bool init_from_xml(LLFontRegistry* registry, LLXMLNodePtr node);
 
 const std::string MACOSX_FONT_PATH_LIBRARY = "/Library/Fonts/";
 
+LLFontDescriptor::char_functor_map_t LLFontDescriptor::mCharFunctors({
+	{ "is_emoji", LLStringOps::isEmoji }
+});
+
 LLFontDescriptor::LLFontDescriptor():
 	mStyle(0)
 {
@@ -54,22 +58,22 @@ LLFontDescriptor::LLFontDescriptor():
 LLFontDescriptor::LLFontDescriptor(const std::string& name,
 								   const std::string& size, 
 								   const U8 style,
-								   const string_vec_t& file_names):
+								   const font_file_info_vec_t& font_files):
 	mName(name),
 	mSize(size),
 	mStyle(style),
-	mFileNames(file_names)
+	mFontFiles(font_files)
 {
 }
 
 LLFontDescriptor::LLFontDescriptor(const std::string& name,
 	const std::string& size,
 	const U8 style,
-	const string_vec_t& file_names,
-	const string_vec_t& ft_collection_listections) :
-	LLFontDescriptor(name, size, style, file_names)
+	const font_file_info_vec_t& font_list,
+	const font_file_info_vec_t& font_collection_files) :
+	LLFontDescriptor(name, size, style, font_list)
 {
-	mFontCollectionsList = ft_collection_listections;
+	mFontCollectionFiles = font_collection_files;
 }
 
 LLFontDescriptor::LLFontDescriptor(const std::string& name,
@@ -81,7 +85,6 @@ LLFontDescriptor::LLFontDescriptor(const std::string& name,
 {
 }
 
-
 bool LLFontDescriptor::operator<(const LLFontDescriptor& b) const
 {
 	if (mName < b.mName)
@@ -174,7 +177,19 @@ LLFontDescriptor LLFontDescriptor::normalize() const
 	if (removeSubString(new_name,"Italic"))
 		new_style |= LLFontGL::ITALIC;
 
-	return LLFontDescriptor(new_name,new_size,new_style,getFileNames(),getFontCollectionsList());
+	return LLFontDescriptor(new_name,new_size,new_style, getFontFiles(), getFontCollectionFiles());
+}
+
+void LLFontDescriptor::addFontFile(const std::string& file_name, const std::string& char_functor)
+{
+	char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor);
+	mFontFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr));
+}
+
+void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, const std::string& char_functor)
+{
+	char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor);
+	mFontCollectionFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr));
 }
 
 LLFontRegistry::LLFontRegistry(bool create_gl_textures)
@@ -272,17 +287,24 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc)
 		if (child->hasName("file"))
 		{
 			std::string font_file_name = child->getTextContents();
-			desc.getFileNames().push_back(font_file_name);
-			
+			std::string char_functor;
+
+			if (child->hasAttribute("functor"))
+			{
+				child->getAttributeString("functor", char_functor);
+			}
+
 			if (child->hasAttribute("load_collection"))
 			{
 				BOOL col = FALSE;
 				child->getAttributeBOOL("load_collection", col);
 				if (col)
 				{
-					desc.getFontCollectionsList().push_back(font_file_name);
+					desc.addFontCollectionFile(font_file_name, char_functor);
 				}
 			}
+
+			desc.addFontFile(font_file_name, char_functor);
 		}
 		else if (child->hasName("os"))
 		{
@@ -325,19 +347,19 @@ bool init_from_xml(LLFontRegistry* registry, LLXMLNodePtr node)
 					// A little roundabout because the map key is const,
 					// so we have to fetch it, make a new map key, and
 					// replace the old entry.
-					string_vec_t match_file_names = match_desc->getFileNames();
-					match_file_names.insert(match_file_names.begin(),
-											desc.getFileNames().begin(),
-											desc.getFileNames().end());
+					font_file_info_vec_t font_files = match_desc->getFontFiles();
+					font_files.insert(font_files.begin(),
+									  desc.getFontFiles().begin(),
+									  desc.getFontFiles().end());
 
-					string_vec_t collections_list = match_desc->getFontCollectionsList();
-					collections_list.insert(collections_list.begin(),
-						desc.getFontCollectionsList().begin(),
-						desc.getFontCollectionsList().end());
+					font_file_info_vec_t font_collection_files = match_desc->getFontCollectionFiles();
+					font_collection_files.insert(font_collection_files.begin(),
+						desc.getFontCollectionFiles().begin(),
+						desc.getFontCollectionFiles().end());
 
 					LLFontDescriptor new_desc = *match_desc;
-					new_desc.getFileNames() = match_file_names;
-					new_desc.getFontCollectionsList() = collections_list;
+					new_desc.setFontFiles(font_files);
+					new_desc.setFontCollectionFiles(font_collection_files);
 					registry->mFontMap.erase(*match_desc);
 					registry->mFontMap[new_desc] = NULL;
 				}
@@ -422,80 +444,78 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 
 	// Build list of font names to look for.
 	// Files specified for this font come first, followed by those from the default descriptor.
-	string_vec_t file_names = match_desc->getFileNames();
-	string_vec_t ft_collection_list = match_desc->getFontCollectionsList();
-	string_vec_t default_file_names;
+	font_file_info_vec_t font_files = match_desc->getFontFiles();
+	font_file_info_vec_t font_collection_files = match_desc->getFontCollectionFiles();
 	LLFontDescriptor default_desc("default",s_template_string,0);
 	const LLFontDescriptor *match_default_desc = getMatchingFontDesc(default_desc);
 	if (match_default_desc)
 	{
-		file_names.insert(file_names.end(),
-						  match_default_desc->getFileNames().begin(),
-						  match_default_desc->getFileNames().end());
-		ft_collection_list.insert(ft_collection_list.end(),
-			match_default_desc->getFontCollectionsList().begin(),
-			match_default_desc->getFontCollectionsList().end());
+		font_files.insert(font_files.end(),
+						  match_default_desc->getFontFiles().begin(),
+						  match_default_desc->getFontFiles().end());
+		font_collection_files.insert(font_collection_files.end(),
+			match_default_desc->getFontCollectionFiles().begin(),
+			match_default_desc->getFontCollectionFiles().end());
 	}
 
 	// Add ultimate fallback list - generated dynamically on linux,
 	// null elsewhere.
-	file_names.insert(file_names.end(),
-					  getUltimateFallbackList().begin(),
-					  getUltimateFallbackList().end());
+	std::transform(getUltimateFallbackList().begin(), getUltimateFallbackList().end(), std::back_inserter(font_files),
+	               [](const std::string& file_name) { return LLFontFileInfo(file_name); });
 
 	// Load fonts based on names.
-	if (file_names.empty())
+	if (font_files.empty())
 	{
 		LL_WARNS() << "createFont failed, no file names specified" << LL_ENDL;
 		return NULL;
 	}
 
-	LLFontFreetype::font_vector_t fontlist;
 	LLFontGL *result = NULL;
 
-	// Snarf all fonts we can into fontlist.  First will get pulled
-	// off the list and become the "head" font, set to non-fallback.
+	// The first font will get pulled will be the "head" font, set to non-fallback.
 	// Rest will consitute the fallback list.
 	BOOL is_first_found = TRUE;
 	
-	std::string local_path = LLFontGL::getFontPathLocal();
-	std::string sys_path = LLFontGL::getFontPathSystem();
-	
+	string_vec_t font_search_paths;
+	font_search_paths.push_back(LLFontGL::getFontPathLocal());
+	font_search_paths.push_back(LLFontGL::getFontPathSystem());
+#if LL_DARWIN
+	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY);
+#endif
+
 	// The fontname string may contain multiple font file names separated by semicolons.
 	// Break it apart and try loading each one, in order.
-	for(string_vec_t::iterator file_name_it = file_names.begin();
-		file_name_it != file_names.end(); 
-		++file_name_it)
+	for(font_file_info_vec_t::iterator font_file_it = font_files.begin();
+		font_file_it != font_files.end();
+		++font_file_it)
 	{
 		LLFontGL *fontp = NULL;
-		string_vec_t font_paths;
-		font_paths.push_back(local_path + *file_name_it);
-		font_paths.push_back(sys_path + *file_name_it);
-#if LL_DARWIN
-		font_paths.push_back(MACOSX_FONT_PATH_LIBRARY + *file_name_it);
-#endif
-		
-		bool is_ft_collection = (std::find(ft_collection_list.begin(), ft_collection_list.end(), *file_name_it) != ft_collection_list.end());
+
+		bool is_ft_collection = (std::find_if(font_collection_files.begin(), font_collection_files.end(),
+		                                      [&font_file_it](const LLFontFileInfo& ffi) { return font_file_it->FileName == ffi.FileName; }) != font_collection_files.end());
+
 		// *HACK: Fallback fonts don't render, so we can use that to suppress
 		// creation of OpenGL textures for test apps. JC
 		BOOL is_fallback = !is_first_found || !mCreateGLTextures;
 		F32 extra_scale = (is_fallback)?fallback_scale:1.0;
 		F32 point_size_scale = extra_scale * point_size;
 		bool is_font_loaded = false;
-		for(string_vec_t::iterator font_paths_it = font_paths.begin();
-			font_paths_it != font_paths.end();
-			++font_paths_it)
+		for(string_vec_t::iterator font_search_path_it = font_search_paths.begin();
+			font_search_path_it != font_search_paths.end();
+			++font_search_path_it)
 		{
+			const std::string font_path = *font_search_path_it + font_file_it->FileName;
+
 			fontp = new LLFontGL;
-			S32 num_faces = is_ft_collection ? fontp->getNumFaces(*font_paths_it) : 1;
+			S32 num_faces = is_ft_collection ? fontp->getNumFaces(font_path) : 1;
 			for (S32 i = 0; i < num_faces; i++)
 			{
 				if (fontp == NULL)
 				{
 					fontp = new LLFontGL;
 				}
-				if (fontp->loadFace(*font_paths_it, point_size_scale,
-								 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, true, is_fallback, i))
+				if (fontp->loadFace(font_path, point_size_scale,
+								 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i))
 				{
 					is_font_loaded = true;
 					if (is_first_found)
@@ -505,7 +525,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 					}
 					else
 					{
-						fontlist.push_back(fontp->mFontFreetype);
+						result->mFontFreetype->addFallbackFont(fontp->mFontFreetype, font_file_it->CharFunctor);
+
 						delete fontp;
 						fontp = NULL;
 					}
@@ -520,17 +541,12 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 		}
 		if(!is_font_loaded)
 		{
-			LL_INFOS_ONCE("LLFontRegistry") << "Couldn't load font " << *file_name_it <<  LL_ENDL;
+			LL_INFOS_ONCE("LLFontRegistry") << "Couldn't load font " << font_file_it->FileName <<  LL_ENDL;
 			delete fontp;
 			fontp = NULL;
 		}
 	}
 
-	if (result && !fontlist.empty())
-	{
-		result->mFontFreetype->setFallbackFonts(fontlist);
-	}
-
 	if (result)
 	{
 		result->mFontDescriptor = desc;
@@ -712,11 +728,11 @@ void LLFontRegistry::dump()
 				<< " size=[" << desc.getSize() << "]"
 				<< " fileNames="
 				<< LL_ENDL;
-		for (string_vec_t::const_iterator file_it=desc.getFileNames().begin();
-			 file_it != desc.getFileNames().end();
+		for (font_file_info_vec_t::const_iterator file_it=desc.getFontFiles().begin();
+			 file_it != desc.getFontFiles().end();
 			 ++file_it)
 		{
-			LL_INFOS() << "  file: " << *file_it <<LL_ENDL;
+			LL_INFOS() << "  file: " << file_it->FileName << LL_ENDL;
 		}
 	}
 }
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
index b1259ef4e7..b0ef72c5de 100644
--- a/indra/llrender/llfontregistry.h
+++ b/indra/llrender/llfontregistry.h
@@ -34,13 +34,32 @@ class LLFontGL;
 
 typedef std::vector<std::string> string_vec_t;
 
+struct LLFontFileInfo
+{
+	LLFontFileInfo(const std::string& file_name, const std::function<bool(llwchar)>& char_functor = nullptr)
+		: FileName(file_name)
+		, CharFunctor(char_functor)
+	{
+	}
+
+	LLFontFileInfo(const LLFontFileInfo& ffi)
+		: FileName(ffi.FileName)
+		, CharFunctor(ffi.CharFunctor)
+	{
+	}
+
+	std::string FileName;
+	std::function<bool(llwchar)> CharFunctor;
+};
+typedef std::vector<LLFontFileInfo> font_file_info_vec_t;
+
 class LLFontDescriptor
 {
 public:
 	LLFontDescriptor();
 	LLFontDescriptor(const std::string& name, const std::string& size, const U8 style);
-	LLFontDescriptor(const std::string& name, const std::string& size, const U8 style, const string_vec_t& file_names);
-	LLFontDescriptor(const std::string& name, const std::string& size, const U8 style, const string_vec_t& file_names, const string_vec_t& font_collections);
+	LLFontDescriptor(const std::string& name, const std::string& size, const U8 style, const font_file_info_vec_t& font_list);
+	LLFontDescriptor(const std::string& name, const std::string& size, const U8 style, const font_file_info_vec_t& font_list, const font_file_info_vec_t& font_collection_list);
 	LLFontDescriptor normalize() const;
 
 	bool operator<(const LLFontDescriptor& b) const;
@@ -51,19 +70,26 @@ public:
 	void setName(const std::string& name) { mName = name; }
 	const std::string& getSize() const { return mSize; }
 	void setSize(const std::string& size) { mSize = size; }
-	const std::vector<std::string>& getFileNames() const { return mFileNames; }
-	std::vector<std::string>& getFileNames() { return mFileNames; }
-	const std::vector<std::string>& getFontCollectionsList() const { return mFontCollectionsList; }
-	std::vector<std::string>& getFontCollectionsList() { return mFontCollectionsList; }
+
+	void addFontFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null);
+	const font_file_info_vec_t & getFontFiles() const { return mFontFiles; }
+	void setFontFiles(const font_file_info_vec_t& font_files) { mFontFiles = font_files; }
+	void addFontCollectionFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null);
+	const font_file_info_vec_t& getFontCollectionFiles() const { return mFontCollectionFiles; }
+	void setFontCollectionFiles(const font_file_info_vec_t& font_collection_files) { mFontCollectionFiles = font_collection_files; }
+
 	const U8 getStyle() const { return mStyle; }
 	void setStyle(U8 style) { mStyle = style; }
 
 private:
 	std::string mName;
 	std::string mSize;
-	string_vec_t mFileNames;
-	string_vec_t mFontCollectionsList;
+	font_file_info_vec_t mFontFiles;
+	font_file_info_vec_t mFontCollectionFiles;
 	U8 mStyle;
+
+	typedef std::map<std::string, std::function<bool(llwchar)>> char_functor_map_t;
+	static char_functor_map_t mCharFunctors;
 };
 
 class LLFontRegistry
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b83d3afadd..f03dcb4066 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -21,6 +21,7 @@ include(EXPAT)
 include(FMODEX)
 include(GLOD)
 include(Hunspell)
+include(ICU4C)
 include(JsonCpp)
 include(LLAppearance)
 include(LLAudio)
@@ -2003,6 +2004,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${NDOF_LIBRARY}
     ${NVAPI_LIBRARY}
     ${HUNSPELL_LIBRARY}
+    ${ICU4C_LIBRARY}
     ${viewer_LIBRARIES}
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 2d5263b78f..6df666a700 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -3,6 +3,7 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
+    <file functor="is_emoji">Twemoji.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>MSGOTHIC.TTC</file>
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 4fba26ab2f..d1de20a6a0 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -3,6 +3,7 @@
 project(win_crash_logger)
 
 include(00-Common)
+include(ICU4C)
 include(LLCommon)
 include(LLCoreHttp)
 include(LLCrashLogger)
@@ -74,6 +75,7 @@ add_executable(windows-crash-logger WIN32 ${win_crash_logger_SOURCE_FILES})
 
 target_link_libraries(windows-crash-logger
     ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES}
+    ${ICU4C_LIBRARY}
     ${LLCRASHLOGGER_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
     ${LLVFS_LIBRARIES}
-- 
cgit v1.2.3


From b44ade68e6eea656dc0e31738f9603caffe4d659 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 7 Nov 2019 20:33:53 +0100
Subject: FIXED Calling LLTextBase::insertStringNoUndo() with more than one
 segment results in overlapping segment ranges Text is only inserted into the
 view model *after* the segments are added so if seg1_pos_start is the current
 EOF:   -> 1st segment: getSegIterContaining(seg1_pos_start) returns the last
 segment and insertSegment() ends up properly adjusting its start/end position
   -> 2nd segment: getSegIterContaining(seg2_pos_start) returns
 mSegments.end() since its position is beyond the available and
 insertSegment() leaves the last 2 segments with overlapping ranges After the
 fix:   -> if index runs past the end of all segments then mSegments.end() is
 returned (no change)   -> if index is a position past the length of text but
 claimed by a segment then that segment is returned (change)   -> if index
 specifies a position in the middle of the document unclaimed by any segment
 then the first segment after that position is returned (no change)      (this
 does break the assertion that segment->mStart <= index <= segment->mEnd?)

---
 indra/llui/lltextbase.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 64b3a0ddcc..ecceb289f0 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1889,8 +1889,6 @@ LLTextBase::segment_set_t::iterator LLTextBase::getSegIterContaining(S32 index)
 		text_len = mLabel.getWString().length();
 	}
 
-	if (index > text_len) { return mSegments.end(); }
-
 	// when there are no segments, we return the end iterator, which must be checked by caller
 	if (mSegments.size() <= 1) { return mSegments.begin(); }
 
@@ -1914,8 +1912,6 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 i
 		text_len = mLabel.getWString().length();
 	}
 
-	if (index > text_len) { return mSegments.end(); }
-
 	// when there are no segments, we return the end iterator, which must be checked by caller
 	if (mSegments.size() <= 1) { return mSegments.begin(); }
 
-- 
cgit v1.2.3


From d58b530e805e2b3c943b1ff446ac84a10c500b32 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 7 Nov 2019 20:48:20 +0100
Subject: Add text_valign to LLTextBase to specify the vertical alignment
 within a single document line The existing font_valign property is used as to
 position the entire document so it's impossible to top align a text editor
 with each line's text centered within that line's extents

---
 indra/llui/lltextbase.cpp | 10 ++++++----
 indra/llui/lltextbase.h   |  7 +++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index ecceb289f0..cc44f46706 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -160,6 +160,7 @@ LLTextBase::Params::Params()
 	line_spacing("line_spacing"),
 	max_text_length("max_length", 255),
 	font_shadow("font_shadow"),
+	text_valign("text_valign"),
 	wrap("wrap"),
 	trusted_content("trusted_content", true),
 	use_ellipses("use_ellipses", false),
@@ -205,6 +206,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mVPad(p.v_pad),
 	mHAlign(p.font_halign),
 	mVAlign(p.font_valign),
+	mTextVAlign(p.text_valign.isProvided() ? p.text_valign : p.font_valign),
 	mLineSpacingMult(p.line_spacing.multiple),
 	mLineSpacingPixels(p.line_spacing.pixels),
 	mClip(p.clip),
@@ -515,7 +517,7 @@ void LLTextBase::drawCursor()
 				fontp = segmentp->getStyle()->getFont();
 				fontp->render(text, mCursorPos, cursor_rect, 
 					LLColor4(1.f - text_color.mV[VRED], 1.f - text_color.mV[VGREEN], 1.f - text_color.mV[VBLUE], alpha),
-					LLFontGL::LEFT, mVAlign,
+					LLFontGL::LEFT, mTextVAlign,
 					LLFontGL::NORMAL,
 					LLFontGL::NO_SHADOW,
 					1);
@@ -3191,7 +3193,7 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele
 		font->render(text, start, 
 				 rect, 
 				 color, 
-				 LLFontGL::LEFT, mEditor.mVAlign, 
+				 LLFontGL::LEFT, mEditor.mTextVAlign,
 				 LLFontGL::NORMAL, 
 				 mStyle->getShadowType(), 
 				 length,
@@ -3211,7 +3213,7 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele
 		font->render(text, start, 
 				 rect,
 				 mStyle->getSelectedColor().get(),
-				 LLFontGL::LEFT, mEditor.mVAlign, 
+				 LLFontGL::LEFT, mEditor.mTextVAlign,
 				 LLFontGL::NORMAL, 
 				 LLFontGL::NO_SHADOW, 
 				 length,
@@ -3229,7 +3231,7 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele
 		font->render(text, start, 
 				 rect, 
 				 color, 
-				 LLFontGL::LEFT, mEditor.mVAlign, 
+				 LLFontGL::LEFT, mEditor.mTextVAlign,
 				 LLFontGL::NORMAL, 
 				 mStyle->getShadowType(), 
 				 length,
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 6f1e178e36..99c243a346 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -333,6 +333,8 @@ public:
 
 		Optional<LLFontGL::ShadowType>	font_shadow;
 
+		Optional<LLFontGL::VAlign> text_valign;
+
 		Params();
 	};
 
@@ -673,8 +675,9 @@ protected:
 	// configuration
 	S32							mHPad;				// padding on left of text
 	S32							mVPad;				// padding above text
-	LLFontGL::HAlign			mHAlign;
-	LLFontGL::VAlign			mVAlign;
+	LLFontGL::HAlign			mHAlign;			// horizontal alignment of the document in its entirety
+	LLFontGL::VAlign			mVAlign;			// vertical alignment of the document in its entirety
+	LLFontGL::VAlign			mTextVAlign;		// vertical alignment of a text segment within a single line of text
 	F32							mLineSpacingMult;	// multiple of line height used as space for a single line of text (e.g. 1.5 to get 50% padding)
 	S32							mLineSpacingPixels;	// padding between lines
 	bool						mBorderVisible;
-- 
cgit v1.2.3


From bab70f6f152952ce755188d29bea1cfd8821a4be Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 29 Aug 2022 00:00:31 +0200
Subject: Review + resolve minor issues

---
 autobuild.xml                        |  8 ++++----
 indra/llrender/llfontbitmapcache.cpp | 29 +++++++++++------------------
 indra/llrender/llfontbitmapcache.h   | 12 ++++++------
 indra/llrender/llfontregistry.cpp    |  4 ++--
 indra/llui/lltextbase.cpp            |  2 +-
 indra/newview/viewer_manifest.py     |  2 +-
 6 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index ac7459ddca..babc7d73bc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -958,9 +958,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa8be83cdfcd5cda0343ea72e7d662ca</string>
+              <string>f3e63d80bd80da03aa7f87f7bd7c5f8b</string>
               <key>url</key>
-              <string>freetype-2.10.1.0-windows64-72.tar.bz2</string>
+              <string>freetype-2.10.1.0-windows64-222392239.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -1510,9 +1510,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e8b20cea748b90ea18bb63dfba06e059</string>
+              <string>340980c10153446b678625ec7af047c2</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/491/1075/icu4c-4.8.1-windows64-500388.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55243/513658/icu4c-4.8.1-windows64-539138.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp
index 754adb14cb..2d65ec47c6 100644
--- a/indra/llrender/llfontbitmapcache.cpp
+++ b/indra/llrender/llfontbitmapcache.cpp
@@ -31,17 +31,7 @@
 
 LLFontBitmapCache::LLFontBitmapCache()
 	: LLTrace::MemTrackable<LLFontBitmapCache>("LLFontBitmapCache")
-	, mBitmapWidth(0)
-	, mBitmapHeight(0)
-	, mMaxCharWidth(0)
-	, mMaxCharHeight(0)
 {
-	// *TODO: simplify with initializer after VS2017
-	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
-	{
-		mCurrentOffsetX[idx] = 1;
-		mCurrentOffsetY[idx] = 1;
-	}
 }
 
 LLFontBitmapCache::~LLFontBitmapCache()
@@ -123,6 +113,9 @@ BOOL LLFontBitmapCache::nextOpenPos(S32 width, S32& pos_x, S32& pos_y, EFontGlyp
 			// Attach corresponding GL texture. (*TODO: is this needed?)
 			gGL.getTexUnit(0)->bind(image_gl);
 			image_gl->setFilteringOption(LLTexUnit::TFO_POINT); // was setMipFilterNearest(TRUE, TRUE);
+
+			claimMem(image_raw);
+			claimMem(image_gl);
 		}
 		else
 		{
@@ -145,29 +138,29 @@ void LLFontBitmapCache::destroyGL()
 {
 	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
 	{
-		for (std::vector<LLPointer<LLImageGL> >::iterator it = mImageGLVec[idx].begin(); it != mImageGLVec[idx].end(); ++it)
+		for (LLImageGL* image_gl : mImageGLVec[idx])
 		{
-			(*it)->destroyGLTexture();
+			image_gl->destroyGLTexture();
 		}
 	}
 }
 
 void LLFontBitmapCache::reset()
 {
-	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
+	for (U32 kitty = 0, cnt = static_cast<U32>(EFontGlyphType::Count); kitty < cnt; kitty++)
 	{
-		for (std::vector<LLPointer<LLImageRaw> >::iterator it = mImageRawVec[idx].begin(), end_it = mImageRawVec[idx].end(); it != end_it; ++it)
+		for (LLImageRaw* image_raw : mImageRawVec[kitty])
 		{
-			disclaimMem(**it);
+			disclaimMem(image_raw);
 		}
-		mImageRawVec[idx].clear();
+		mImageRawVec[kitty].clear();
 	}
 
 	for (U32 idx = 0, cnt = static_cast<U32>(EFontGlyphType::Count); idx < cnt; idx++)
 	{
-		for (std::vector<LLPointer<LLImageGL> >::iterator it = mImageGLVec[idx].begin(), end_it = mImageGLVec[idx].end(); it != end_it; ++it)
+		for (LLImageGL* image_gl : mImageGLVec[idx])
 		{
-			disclaimMem(**it);
+			disclaimMem(image_gl);
 		}
 		mImageGLVec[idx].clear();
 		mCurrentOffsetX[idx] = 1;
diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
index 5d0094fd69..6b339e9afd 100644
--- a/indra/llrender/llfontbitmapcache.h
+++ b/indra/llrender/llfontbitmapcache.h
@@ -68,12 +68,12 @@ protected:
 	static U32 getNumComponents(EFontGlyphType bitmap_type);
 
 private:
-	S32 mBitmapWidth;
-	S32 mBitmapHeight;
-	S32 mCurrentOffsetX[static_cast<U32>(EFontGlyphType::Count)];
-	S32 mCurrentOffsetY[static_cast<U32>(EFontGlyphType::Count)];
-	S32 mMaxCharWidth;
-	S32 mMaxCharHeight;
+	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)];
 };
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index f2dc5771e9..1d7d930e6f 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -482,6 +482,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 	font_search_paths.push_back(LLFontGL::getFontPathSystem());
 #if LL_DARWIN
 	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY);
+	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY + MACOSX_FONT_SUPPLEMENTAL);
+	font_search_paths.push_back(sys_path + MACOSX_FONT_SUPPLEMENTAL);
 #endif
 
 	// The fontname string may contain multiple font file names separated by semicolons.
@@ -491,8 +493,6 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 		++font_file_it)
 	{
 		LLFontGL *fontp = NULL;
-		font_paths.push_back(MACOSX_FONT_PATH_LIBRARY + MACOSX_FONT_SUPPLEMENTAL + *file_name_it);
-		font_paths.push_back(sys_path +  MACOSX_FONT_SUPPLEMENTAL + *file_name_it);
 
 		bool is_ft_collection = (std::find_if(font_collection_files.begin(), font_collection_files.end(),
 		                                      [&font_file_it](const LLFontFileInfo& ffi) { return font_file_it->FileName == ffi.FileName; }) != font_collection_files.end());
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 9005d70b2e..0447e7070c 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -208,7 +208,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mVPad(p.v_pad),
 	mHAlign(p.font_halign),
 	mVAlign(p.font_valign),
-	mTextVAlign(p.text_valign.isProvided() ? p.text_valign : p.font_valign),
+	mTextVAlign(p.text_valign.isProvided() ? p.text_valign.getValue() : p.font_valign.getValue()),
 	mLineSpacingMult(p.line_spacing.multiple),
 	mLineSpacingPixels(p.line_spacing.pixels),
 	mClip(p.clip),
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 281777e492..85c9318b8a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -140,7 +140,7 @@ class ViewerManifest(LLManifest):
                 self.path("*.tga")
 
             # Include our fonts
-            with self.prefix(src="../packages/fonts"):
+            with self.prefix(src="../packages/fonts",src_dst="fonts"):
                 self.path("*.ttf")
                 self.path("*.txt")
 
-- 
cgit v1.2.3


From aa6f1ca698f1b8955843a11b91e2ec3623ccc948 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 3 Oct 2022 16:37:17 -0400
Subject: DRTVWR-489: Update to freetype build 575484

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5a5ffa2898..db7eb7f6d7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -698,9 +698,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8865739d8e530199dacb3c3042c1bc01</string>
+              <string>73c70c9e29b805b25d1df551e2c4f751</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87777/805782/freetype-2.4.4.563848-darwin64-563848.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105443/922863/freetype-2.12.1.575484-darwin64-575484.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -722,9 +722,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c0b3601e997553931cadc7d7ee94168b</string>
+              <string>2fbb9e2b35d38676d9cea5dd4b659609</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87779/805814/freetype-2.4.4.563848-windows-563848.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105444/922870/freetype-2.12.1.575484-windows-575484.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -734,16 +734,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e98e1e088cdcd20442e05e9abecdadf9</string>
+              <string>dc7f61388f375ead1395fd0189214ab3</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87778/805815/freetype-2.4.4.563848-windows64-563848.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105441/922858/freetype-2.12.1.575484-windows64-575484.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.4.4.563848</string>
+        <string>2.12.1.575484</string>
       </map>
       <key>glext</key>
       <map>
-- 
cgit v1.2.3


From 0cdb792d904198131187d6ead102f951b2894bd0 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Thu, 6 Oct 2022 15:06:06 -0700
Subject: SL-18230: PUll in new version of FreeType that turns off zlib
 requirment to avoid linker dupe errors in the Viewer against zlib

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index db7eb7f6d7..759f17f75d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -698,9 +698,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>73c70c9e29b805b25d1df551e2c4f751</string>
+              <string>6cc4791cda8bd22b31a7a5c6d6096444</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105443/922863/freetype-2.12.1.575484-darwin64-575484.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105572/923689/freetype-2.12.1.575556-darwin64-575556.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -722,9 +722,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2fbb9e2b35d38676d9cea5dd4b659609</string>
+              <string>89bfcc2fb628187cf6730a81f43c513e</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105444/922870/freetype-2.12.1.575484-windows-575484.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105574/923703/freetype-2.12.1.575556-windows-575556.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -734,16 +734,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>dc7f61388f375ead1395fd0189214ab3</string>
+              <string>cd2fb236e24aa912939c5e87b8a42ec7</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105441/922858/freetype-2.12.1.575484-windows64-575484.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105573/923695/freetype-2.12.1.575556-windows64-575556.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.12.1.575484</string>
+        <string>2.12.1.575556</string>
       </map>
       <key>glext</key>
       <map>
-- 
cgit v1.2.3


From cf2afdc541b540582650f89c6b95aacfeaef516f Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 11 Sep 2022 21:44:00 +0100
Subject: Add emoji as its own font to promote character reuse

---
 indra/llrender/llfontgl.cpp                  | 7 +++++++
 indra/llrender/llfontgl.h                    | 1 +
 indra/newview/skins/default/xui/en/fonts.xml | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 4770f79395..e9899c9567 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -1005,6 +1005,13 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
 	return gl_vfont_align;
 }
 
+ //static
+LLFontGL* LLFontGL::getFontEmoji()
+{
+	static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0));
+	return fontp;;
+}
+
 //static
 LLFontGL* LLFontGL::getFontMonospace()
 {
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index a60feb87cb..29bdb798e1 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -191,6 +191,7 @@ public:
 
 	static void setFontDisplay(BOOL flag) { sDisplayFont = flag; }
 		
+	static LLFontGL* getFontEmoji();
 	static LLFontGL* getFontMonospace();
 	static LLFontGL* getFontSansSerifSmall();
 	static LLFontGL* getFontSansSerif();
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index ed35546322..681f670f08 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -70,6 +70,11 @@
     <file>DejaVuSans-BoldOblique.ttf</file>
   </font>
 
+  <font name="Emoji"
+	comment="Name of emoji font">
+    <file>Twemoji.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
-- 
cgit v1.2.3


From 063fe5953ada75177c1668f8b805cd9b79724581 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 2 Nov 2022 14:25:27 +0100
Subject: Create a separate segment for emoji characters so that we can display
 them in a slightly larger font size than the surrounding text

---
 indra/llui/lltextbase.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++---
 indra/llui/lltextbase.h   | 12 ++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 0447e7070c..2a6e6901e4 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2302,6 +2302,36 @@ void LLTextBase::appendWidget(const LLInlineViewSegment::Params& params, const s
 	insertStringNoUndo(getLength(), widget_wide_text, &segments);
 }
 
+void LLTextBase::createTextWithEmojiSegment(const LLWString& text, S32 segment_start, LLStyleConstSP style, segment_vec_t& segments)
+{
+	LLStyleSP emoji_style;
+
+	S32 text_start = 0, text_kitty = 0, text_len = text.size();
+	for (; text_kitty < text_len; text_kitty++)
+	{
+		if (LLStringOps::isEmoji(text[text_kitty]))
+		{
+			if (text_kitty > text_start)
+			{
+				segments.push_back(new LLNormalTextSegment(style, segment_start + text_start, segment_start + text_kitty, *this));
+			}
+
+			if (!emoji_style)
+			{
+				emoji_style = new LLStyle(*style);
+				emoji_style->setFont(LLFontGL::getFontEmoji());
+			}
+			segments.push_back(new LLEmojiTextSegment(emoji_style, segment_start + text_kitty, segment_start + text_kitty + 1, *this));
+			text_start = text_kitty + 1;
+		}
+	}
+
+	if (text_start < text_len)
+	{
+		segments.push_back(new LLNormalTextSegment(style, segment_start + text_start, segment_start + text_len, *this));
+	}
+}
+
 void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only)
 {
 	// Save old state
@@ -2334,6 +2364,7 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 			S32 cur_length = getLength();
 			LLStyleConstSP sp(new LLStyle(highlight_params));
 			LLTextSegmentPtr segmentp;
+			segment_vec_t segments;
 			if (underline_on_hover_only || mSkipLinkUnderline)
 			{
 				highlight_params.font.style("NORMAL");
@@ -2342,9 +2373,8 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 			}
 			else
 			{
-				segmentp = new LLNormalTextSegment(sp, cur_length, cur_length + wide_text.size(), *this);
+				createTextWithEmojiSegment(wide_text, cur_length, sp, segments);
 			}
-			segment_vec_t segments;
 			segments.push_back(segmentp);
 			insertStringNoUndo(cur_length, wide_text, &segments);
 		}
@@ -2367,7 +2397,7 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 		}
 		else
 		{
-		segments.push_back(new LLNormalTextSegment(sp, segment_start, segment_end, *this ));
+			createTextWithEmojiSegment(wide_text, segment_start, sp, segments);
 		}
 
 		insertStringNoUndo(getLength(), wide_text, &segments);
@@ -3514,6 +3544,19 @@ const S32 LLLabelTextSegment::getLength() const
 	return mEditor.getWlabel().length();
 }
 
+//
+// LLEmojiTextSegment
+//
+LLEmojiTextSegment::LLEmojiTextSegment(LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor)
+	: LLNormalTextSegment(style, start, end, editor)
+{
+}
+
+LLEmojiTextSegment::LLEmojiTextSegment(const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible)
+	: LLNormalTextSegment(color, start, end, editor, is_visible)
+{
+}
+
 //
 // LLOnHoverChangeableTextSegment
 //
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 590e7c9dbb..fc999c4cca 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -178,6 +178,17 @@ protected:
 	/*virtual*/	const S32			getLength()	const;
 };
 
+// Text segment that represents a single emoji character that has a different style (=font size) than the rest of
+// the document it belongs to
+class LLEmojiTextSegment : public LLNormalTextSegment
+{
+public:
+	LLEmojiTextSegment(LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor);
+	LLEmojiTextSegment(const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible = TRUE);
+
+	bool canEdit() const override { return false; }
+};
+
 // Text segment that changes it's style depending of mouse pointer position ( is it inside or outside segment)
 class LLOnHoverChangeableTextSegment : public LLNormalTextSegment
 {
@@ -629,6 +640,7 @@ protected:
 	
 	void							appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params = LLStyle::Params());
 	void							appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only = false);
+	void							createTextWithEmojiSegment(const LLWString& wide_text, S32 segment_start, LLStyleConstSP style, segment_vec_t& segments);
 	S32 normalizeUri(std::string& uri);
 	
 protected:
-- 
cgit v1.2.3


From 8694f055b64eb7ce13897e49afe73c4d3295a29a Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:09:30 +0200
Subject: Add emoji helper support to LLTextEditor

---
 indra/llui/lltexteditor.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
 indra/llui/lltexteditor.h   |  5 +++++
 2 files changed, 45 insertions(+)

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index b1f8b00cab..889940cf9a 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -43,6 +43,7 @@
 #include "llmath.h"
 
 #include "llclipboard.h"
+#include "llemojihelper.h"
 #include "llscrollbar.h"
 #include "llstl.h"
 #include "llstring.h"
@@ -238,6 +239,7 @@ LLTextEditor::Params::Params()
 	default_color("default_color"),
     commit_on_focus_lost("commit_on_focus_lost", false),
 	show_context_menu("show_context_menu"),
+	show_emoji_helper("show_emoji_helper"),
 	enable_tooltip_paste("enable_tooltip_paste")
 {
 	addSynonym(prevalidate_callback, "text_type");
@@ -259,6 +261,7 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) :
 	mPrevalidateFunc(p.prevalidate_callback()),
 	mContextMenu(NULL),
 	mShowContextMenu(p.show_context_menu),
+	mShowEmojiHelper(p.show_emoji_helper),
 	mEnableTooltipPaste(p.enable_tooltip_paste),
 	mPassDelete(FALSE),
 	mKeepSelectionOnReturn(false)
@@ -501,6 +504,15 @@ void LLTextEditor::getSegmentsInRange(LLTextEditor::segment_vec_t& segments_out,
 	}
 }
 
+void LLTextEditor::setShowEmojiHelper(bool show) {
+	if (!mShowEmojiHelper)
+	{
+		LLEmojiHelper::instance().hideHelper(this);
+	}
+
+	mShowEmojiHelper = show;
+}
+
 BOOL LLTextEditor::selectionContainsLineBreaks()
 {
 	if (hasSelection())
@@ -930,6 +942,12 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 
 S32 LLTextEditor::execute( TextCmd* cmd )
 {
+	if (!mReadOnly && mShowEmojiHelper)
+	{
+		// Any change to our contents should always hide the helper
+		LLEmojiHelper::instance().hideHelper(this);
+	}
+
 	S32 delta = 0;
 	if( cmd->execute(this, &delta) )
 	{
@@ -1124,6 +1142,17 @@ void LLTextEditor::addChar(llwchar wc)
 
 	setCursorPos(mCursorPos + addChar( mCursorPos, wc ));
 
+	if (!mReadOnly && mShowEmojiHelper)
+	{
+		LLWString wtext(getWText()); S32 shortCodePos;
+		if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
+		{
+			const LLRect cursorRect = getLocalRectFromDocIndex(mCursorPos);
+			const LLWString shortCode = wtext.substr(shortCodePos, mCursorPos);
+			LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, wstring_to_utf8str(shortCode));
+		}
+	}
+
 	if (!mReadOnly && mAutoreplaceCallback != NULL)
 	{
 		// autoreplace the text, if necessary
@@ -1774,6 +1803,11 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask )
 	}
 	else 
 	{
+		if (!mReadOnly && mShowEmojiHelper && LLEmojiHelper::instance().handleKey(this, key, mask))
+		{
+			return TRUE;
+		}
+
 		if (mEnableTooltipPaste &&
 			LLToolTipMgr::instance().toolTipVisible() && 
 			KEY_TAB == key)
@@ -1815,6 +1849,12 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask )
 	{
 		resetCursorBlink();
 		needsScroll();
+
+		if (mShowEmojiHelper)
+		{
+			// Dismiss the helper whenever we handled a key that it didn't
+			LLEmojiHelper::instance().hideHelper(this);
+		}
 	}
 
 	return handled;
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 26702b2412..04910b6f68 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -60,6 +60,7 @@ public:
 								ignore_tab,
 								commit_on_focus_lost,
 								show_context_menu,
+								show_emoji_helper,
 								enable_tooltip_paste,
 								auto_indent;
 
@@ -201,6 +202,9 @@ public:
 	void			setShowContextMenu(bool show) { mShowContextMenu = show; }
 	bool			getShowContextMenu() const { return mShowContextMenu; }
 
+	void			setShowEmojiHelper(bool show);
+	bool			getShowEmojiHelper() const { return mShowEmojiHelper; }
+
 	void			setPassDelete(BOOL b) { mPassDelete = b; }
 
 protected:
@@ -317,6 +321,7 @@ private:
 
 	BOOL			mAllowEmbeddedItems;
 	bool			mShowContextMenu;
+	bool			mShowEmojiHelper;
 	bool			mEnableTooltipPaste;
 	bool			mPassDelete;
 	bool			mKeepSelectionOnReturn;	// disabling of removing selected text after pressing of Enter
-- 
cgit v1.2.3


From d95571cf7cd319e17338bc509d46ab5eab4eb968 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:10:06 +0200
Subject: Add mini emoji (auto-)complete helper

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llpanelemojicomplete.cpp             | 210 +++++++++++++++++++++
 indra/newview/llpanelemojicomplete.h               |  99 ++++++++++
 indra/newview/llviewerfloaterreg.cpp               |   2 +
 .../default/xui/en/floater_emoji_complete.xml      |  26 +++
 .../default/xui/en/widgets/emoji_complete.xml      |   7 +
 6 files changed, 346 insertions(+)
 create mode 100644 indra/newview/llpanelemojicomplete.cpp
 create mode 100644 indra/newview/llpanelemojicomplete.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_emoji_complete.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/emoji_complete.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 8d902ce618..0bb1814322 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -441,6 +441,7 @@ set(viewer_SOURCE_FILES
     llpaneleditsky.cpp
     llpaneleditwater.cpp
     llpaneleditwearable.cpp
+	llpanelemojicomplete.cpp
     llpanelenvironment.cpp
     llpanelexperiencelisteditor.cpp
     llpanelexperiencelog.cpp
@@ -1072,6 +1073,7 @@ set(viewer_HEADER_FILES
     llpaneleditsky.h
     llpaneleditwater.h
     llpaneleditwearable.h
+	llpanelemojicomplete.h
     llpanelenvironment.h
     llpanelexperiencelisteditor.h
     llpanelexperiencelog.h
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
new file mode 100644
index 0000000000..e1d80b62e2
--- /dev/null
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -0,0 +1,210 @@
+/**
+* @file llpanelemojicomplete.h
+* @brief Header file for LLPanelEmojiComplete
+*
+* $LicenseInfo:firstyear=2012&license=lgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2011, 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 "llviewerprecompiledheaders.h"
+
+#include "llemojidictionary.h"
+#include "llpanelemojicomplete.h"
+#include "lluictrlfactory.h"
+
+constexpr U32 MIN_MOUSE_MOVE_DELTA = 4;
+
+// ============================================================================
+// LLPanelEmojiComplete
+//
+
+static LLDefaultChildRegistry::Register<LLPanelEmojiComplete> r("emoji_complete");
+
+LLPanelEmojiComplete::Params::Params()
+	: selected_image("selected_image")
+{
+}
+
+LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p)
+	: LLUICtrl(p)
+	, mSelectedImage(p.selected_image)
+{
+	setFont(p.font);
+}
+
+LLPanelEmojiComplete::~LLPanelEmojiComplete()
+{
+}
+
+void LLPanelEmojiComplete::draw()
+{
+	if (!mEmojis.empty())
+	{
+		const S32 centerY = mRenderRect.getCenterY();
+		const size_t firstVisibleIdx = mScrollPos, lastVisibleIdx = llmin(mScrollPos + mVisibleEmojis, mEmojis.size()) - 1;
+
+		if (mCurSelected >= firstVisibleIdx && mCurSelected <= lastVisibleIdx)
+		{
+			const S32 emoji_left = mRenderRect.mLeft + (mCurSelected - firstVisibleIdx) * mEmojiWidth;
+			const S32 emoji_height = mFont->getLineHeight() + mPadding;
+			mSelectedImage->draw(emoji_left, centerY - emoji_height / 2, mEmojiWidth, emoji_height);
+		}
+
+		U32 left = mRenderRect.mLeft + mPadding;
+		for (U32 curIdx = firstVisibleIdx; curIdx <= lastVisibleIdx; curIdx++)
+		{
+			mFont->render(
+				mEmojis, curIdx,
+				left, centerY,
+				LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::DROP_SHADOW_SOFT,
+				1, S32_MAX, nullptr, false, true);
+			left += mEmojiWidth;
+		}
+	}
+}
+
+BOOL LLPanelEmojiComplete::handleHover(S32 x, S32 y, MASK mask)
+{
+	LLVector2 curHover(x, y);
+	if ((mLastHover - curHover).lengthSquared() > MIN_MOUSE_MOVE_DELTA)
+	{
+		mCurSelected = posToIndex(x, y);
+		mLastHover = curHover;
+	}
+
+	return TRUE;
+}
+
+BOOL LLPanelEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+{
+	if (MASK_NONE == mask)
+	{
+		bool handled = false;
+		switch (key)
+		{
+			case KEY_LEFT:
+			case KEY_UP:
+				selectPrevious();
+				handled = true;
+				break;
+			case KEY_RIGHT:
+			case KEY_DOWN:
+				selectNext();
+				handled = true;
+				break;
+		}
+		return handled;
+	}
+
+	return false;
+}
+
+void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+	LLUICtrl::reshape(width, height, called_from_parent);
+	updateConstraints();
+}
+
+void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
+{
+	mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint);
+	mScrollPos = llmin(mScrollPos, mEmojis.size());
+	updateConstraints();
+}
+
+size_t LLPanelEmojiComplete::posToIndex(S32 x, S32 y) const
+{
+	if (mRenderRect.pointInRect(x, y))
+	{
+		return llmin((size_t)x / mEmojiWidth, mEmojis.size() - 1);
+	}
+	return npos;
+}
+
+void LLPanelEmojiComplete::select(size_t emoji_idx)
+{
+	mCurSelected = llclamp<size_t>(emoji_idx, 0, mEmojis.size());
+	updateScrollPos();
+}
+
+void LLPanelEmojiComplete::selectNext()
+{
+	select(mCurSelected + 1 < mEmojis.size() ? mCurSelected + 1 : 0);
+}
+
+void LLPanelEmojiComplete::selectPrevious()
+{
+	select(mCurSelected - 1 >= 0 ? mCurSelected - 1 : mEmojis.size() - 1);
+}
+
+void LLPanelEmojiComplete::setFont(const LLFontGL* fontp)
+{
+	mFont = fontp;
+	updateConstraints();
+}
+
+void LLPanelEmojiComplete::updateConstraints()
+{
+	const S32 ctrlWidth = getLocalRect().getWidth();
+
+	mEmojiWidth = mFont->getWidthF32(u8"\U0001F431") + mPadding * 2;
+	mVisibleEmojis = ctrlWidth / mEmojiWidth;
+	mRenderRect = getLocalRect().stretch((ctrlWidth - mVisibleEmojis * mEmojiWidth) / -2, 0);
+
+	updateScrollPos();
+}
+
+void LLPanelEmojiComplete::updateScrollPos()
+{
+	const size_t cntEmoji = mEmojis.size();
+	if (0 == cntEmoji || cntEmoji < mVisibleEmojis || 0 == mCurSelected)
+	{
+		mScrollPos = 0;
+	}
+	else if (cntEmoji - 1 == mCurSelected)
+	{
+		mScrollPos = mCurSelected - mVisibleEmojis + 1;
+	}
+	else
+	{
+		mScrollPos = mCurSelected - ((float)mCurSelected / (cntEmoji - 2) * (mVisibleEmojis - 2));
+	}
+}
+
+// ============================================================================
+// LLFloaterEmojiComplete
+//
+
+LLFloaterEmojiComplete::LLFloaterEmojiComplete(const LLSD& sdKey)
+	: LLFloater(sdKey)
+{
+	// This floater should hover on top of our dependent (with the dependent having the focus)
+	setFocusStealsFrontmost(false);
+	setAutoFocus(false);
+	setBackgroundVisible(false);
+}
+
+void LLFloaterEmojiComplete::onOpen(const LLSD& key)
+{
+	findChild<LLPanelEmojiComplete>("emoji_complete_ctrl")->setEmojiHint(key["hint"].asString());
+}
+
+// ============================================================================
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
new file mode 100644
index 0000000000..85b0609ae9
--- /dev/null
+++ b/indra/newview/llpanelemojicomplete.h
@@ -0,0 +1,99 @@
+/**
+* @file llpanelemojicomplete.h
+* @brief Header file for LLPanelEmojiComplete
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, 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$
+*/
+
+#pragma once
+
+#include "llfloater.h"
+#include "lluictrl.h"
+
+// ============================================================================
+// LLPanelEmojiComplete
+//
+
+class LLPanelEmojiComplete : public LLUICtrl
+{
+	friend class LLUICtrlFactory;
+public:
+	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+	{
+		Optional<LLUIImage*> selected_image;
+
+		Params();
+	};
+
+protected:
+	LLPanelEmojiComplete(const LLPanelEmojiComplete::Params&);
+public:
+	virtual ~LLPanelEmojiComplete();
+
+	void draw() override;
+	BOOL handleHover(S32 x, S32 y, MASK mask) override;
+	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
+	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
+
+public:
+	void setEmojiHint(const std::string& hint);
+protected:
+	size_t posToIndex(S32 x, S32 y) const;
+	void select(size_t emoji_idx);
+	void selectNext();
+	void selectPrevious();
+	void setFont(const LLFontGL* fontp);
+	void updateConstraints();
+	void updateScrollPos();
+
+protected:
+	static constexpr auto npos = std::numeric_limits<size_t>::max();
+
+	const LLFontGL* mFont;
+	U16             mEmojiWidth = 0;
+	LLUIImagePtr	mSelectedImage;
+
+	LLWString       mEmojis;
+	U16             mVisibleEmojis = 0;
+	size_t          mFirstVisible = 0;
+	size_t          mScrollPos = 0;
+	size_t          mCurSelected = 0;
+	LLVector2       mLastHover;
+
+	S32             mPadding = 8;
+	LLRect          mRenderRect;
+};
+
+// ============================================================================
+// LLFloaterEmojiComplete
+//
+
+class LLFloaterEmojiComplete : public LLFloater
+{
+public:
+	LLFloaterEmojiComplete(const LLSD& sdKey);
+
+public:
+	void onOpen(const LLSD& key) override;
+};
+
+// ============================================================================
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 5a05f89758..a54b91030e 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -155,6 +155,7 @@
 #include "llfloaterimnearbychat.h"
 #include "llpanelblockedlist.h"
 #include "llpanelclassified.h"
+#include "llpanelemojicomplete.h"
 #include "llpreviewanim.h"
 #include "llpreviewgesture.h"
 #include "llpreviewnotecard.h"
@@ -229,6 +230,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("delete_pref_preset", "floater_delete_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDeletePrefPreset>);
 	LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDestinations>);
 
+	LLFloaterReg::add("emoji_complete", "floater_emoji_complete.xml", &LLFloaterReg::build<LLFloaterEmojiComplete>);
 	LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>);
 
     LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>);
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
new file mode 100644
index 0000000000..eb666bc32c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="false"
+ can_dock="false"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_resize="false"
+ can_tear_off="false"
+ header_height="0"
+ layout="topleft"
+ legacy_header_height="0"
+ height="40"
+ single_instance="true"
+ width="240"
+ >
+    <emoji_complete
+     height="30"
+     follows="top|left"
+     layout="topleft"
+     left="5"
+     top="5"
+     width="230"
+     name="emoji_complete_ctrl"
+     >
+    </emoji_complete>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
new file mode 100644
index 0000000000..f35105ff7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<emoji_complete
+  font="EmojiHuge"
+  hover_image="ListItem_Over"
+  selected_image="ListItem_Select"
+  >
+</emoji_complete>
-- 
cgit v1.2.3


From ec23b4bc633b853223d8442f60e769d44a25fe2d Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:06:41 +0200
Subject: Add the basic emoji dictionary class (responsible for loading them
 from disk and providing helpful lookup functions)

---
 indra/llui/CMakeLists.txt        |   2 +
 indra/llui/llemojidictionary.cpp | 177 +++++++++++++++++++++++++++++++++++++++
 indra/llui/llemojidictionary.h   |  71 ++++++++++++++++
 3 files changed, 250 insertions(+)
 create mode 100644 indra/llui/llemojidictionary.cpp
 create mode 100644 indra/llui/llemojidictionary.h

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index f781ff4110..4e007e429a 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -53,6 +53,7 @@ set(llui_SOURCE_FILES
     lldockcontrol.cpp
     lldraghandle.cpp
     lleditmenuhandler.cpp
+	llemojidictionary.cpp
     llf32uictrl.cpp
     llfiltereditor.cpp
     llflashtimer.cpp
@@ -163,6 +164,7 @@ set(llui_HEADER_FILES
     lldockablefloater.h
     lldockcontrol.h
     lleditmenuhandler.h
+	llemojidictionary.h
     llf32uictrl.h
     llfiltereditor.h 
     llflashtimer.h
diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
new file mode 100644
index 0000000000..e149832a8b
--- /dev/null
+++ b/indra/llui/llemojidictionary.cpp
@@ -0,0 +1,177 @@
+/**
+* @file llemojidictionary.cpp
+* @brief Implementation of LLEmojiDictionary
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, 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 "lldir.h"
+#include "llemojidictionary.h"
+#include "llsdserialize.h"
+
+#include <boost/algorithm/string.hpp>
+
+// ============================================================================
+// Constants
+//
+
+constexpr char SKINNED_EMOJI_FILENAME[] = "emoji_characters.xml";
+
+// ============================================================================
+// Helper functions
+//
+
+template<class T>
+std::list<T> llsd_array_to_list(const LLSD& sd, std::function<void(T&)> mutator = {});
+
+template<>
+std::list<std::string> llsd_array_to_list(const LLSD& sd, std::function<void(std::string&)> mutator)
+{
+	std::list<std::string> result;
+	for (LLSD::array_const_iterator it = sd.beginArray(), end = sd.endArray(); it != end; ++it)
+	{
+		const LLSD& entry = *it;
+		if (!entry.isString())
+			continue;
+
+		result.push_back(entry.asStringRef());
+		if (mutator)
+		{
+			mutator(result.back());
+		}
+	}
+	return result;
+}
+
+LLEmojiDescriptor::LLEmojiDescriptor(const LLSD& descriptor_sd)
+{
+	Name = descriptor_sd["Name"].asStringRef();
+
+	const LLWString emoji_string = utf8str_to_wstring(descriptor_sd["Character"].asString());
+	Character = (1 == emoji_string.size()) ? emoji_string[0] : L'\0'; // We don't currently support character composition
+
+	auto toLower = [](std::string& str) { LLStringUtil::toLower(str); };
+	ShortCodes = llsd_array_to_list<std::string>(descriptor_sd["ShortCodes"], toLower);
+	Categories = llsd_array_to_list<std::string>(descriptor_sd["Categories"], toLower);
+
+	if (Name.empty())
+	{
+		Name = ShortCodes.front();
+	}
+}
+
+bool LLEmojiDescriptor::isValid() const
+{
+	return
+		Character &&
+		!ShortCodes.empty() &&
+		!Categories.empty();
+}
+
+// ============================================================================
+// LLEmojiDictionary class
+//
+
+LLEmojiDictionary::LLEmojiDictionary()
+{
+}
+
+// static
+void LLEmojiDictionary::initClass()
+{
+	LLEmojiDictionary* pThis = &LLEmojiDictionary::initParamSingleton();
+
+	LLSD data;
+
+	const std::string filename = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_EMOJI_FILENAME, LLDir::CURRENT_SKIN).front();
+	llifstream file(filename.c_str());
+	if (file.is_open())
+	{
+		LL_DEBUGS() << "Loading emoji characters file at " << filename << LL_ENDL;
+		LLSDSerialize::fromXML(data, file);
+	}
+
+	if (data.isUndefined())
+	{
+		LL_WARNS() << "Emoji file characters missing or ill-formed" << LL_ENDL;
+		return;
+	}
+
+	for (LLSD::array_const_iterator descriptor_it = data.beginArray(), descriptor_end = data.endArray(); descriptor_it != descriptor_end; ++descriptor_it)
+	{
+		LLEmojiDescriptor descriptor(*descriptor_it);
+		if (!descriptor.isValid())
+		{
+			LL_WARNS() << "Skipping invalid emoji descriptor " << descriptor.Character << LL_ENDL;
+			continue;
+		}
+		pThis->addEmoji(std::move(descriptor));
+	}
+}
+
+LLWString LLEmojiDictionary::findMatchingEmojis(std::string needle)
+{
+	// Search without the colon (if present) so the user can type ':food' and see all emojis in the 'Food' category
+	LLStringUtil::toLower(needle);
+	const auto kitty_needle = boost::make_iterator_range((boost::starts_with(needle, ":")) ? needle.begin() + 1 : needle.begin(), needle.end());
+
+	LLWString wstr;
+	for (const auto& descr : mEmojis)
+	{
+		for (const auto& short_code : descr.ShortCodes)
+		{
+			if (boost::icontains(short_code, kitty_needle))
+			{
+				wstr.push_back(descr.Character);
+				continue;
+			}
+		}
+
+		for (const auto& category : descr.Categories)
+		{
+			if (boost::icontains(category, kitty_needle))
+			{
+				wstr.push_back(descr.Character);
+				continue;
+			}
+		}
+	}
+
+	return wstr;
+}
+
+std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch)
+{
+	const auto it = mEmoji2Descr.find(ch);
+	return (mEmoji2Descr.end() != it) ? it->second->Name : LLStringUtil::null;
+}
+
+void LLEmojiDictionary::addEmoji(LLEmojiDescriptor&& descr)
+{
+	mEmojis.push_back(descr);
+	const LLEmojiDescriptor& back = mEmojis.back();
+	mEmoji2Descr.insert(std::make_pair(descr.Character, &back));
+}
+
+// ============================================================================
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
new file mode 100644
index 0000000000..87ea4a5aef
--- /dev/null
+++ b/indra/llui/llemojidictionary.h
@@ -0,0 +1,71 @@
+/**
+* @file llemojidictionary.h
+* @brief Header file for LLEmojiDictionary
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, 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$
+*/
+
+#pragma once
+
+#include "lldictionary.h"
+#include "llinitdestroyclass.h"
+#include "llsingleton.h"
+
+// ============================================================================
+// LLEmojiDescriptor class
+//
+
+struct LLEmojiDescriptor
+{
+	LLEmojiDescriptor(const LLSD& descriptor_sd);
+
+	bool isValid() const;
+
+	std::string            Name;
+	llwchar                Character;
+	std::list<std::string> ShortCodes;
+	std::list<std::string> Categories;
+};
+
+// ============================================================================
+// LLEmojiDictionary class
+//
+
+class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLInitClass<LLEmojiDictionary>
+{
+	LLSINGLETON(LLEmojiDictionary);
+	~LLEmojiDictionary() override {};
+
+public:
+	static void initClass();
+	LLWString   findMatchingEmojis(std::string needle);
+	std::string getNameFromEmoji(llwchar ch);
+
+private:
+	void addEmoji(LLEmojiDescriptor&& descr);
+
+private:
+	std::list<LLEmojiDescriptor> mEmojis;
+	std::map<llwchar, const LLEmojiDescriptor*> mEmoji2Descr;
+};
+
+// ============================================================================
-- 
cgit v1.2.3


From dad25bcb1e17e3dc384a9fb35d21b669bc3bbacd Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:17:02 +0200
Subject: Add the emoji helper class which can be used by text-input controls
 to provide emoji picker support

---
 indra/llui/CMakeLists.txt    |   2 +
 indra/llui/llemojihelper.cpp | 142 +++++++++++++++++++++++++++++++++++++++++++
 indra/llui/llemojihelper.h   |  64 +++++++++++++++++++
 3 files changed, 208 insertions(+)
 create mode 100644 indra/llui/llemojihelper.cpp
 create mode 100644 indra/llui/llemojihelper.h

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 4e007e429a..68019734ab 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -54,6 +54,7 @@ set(llui_SOURCE_FILES
     lldraghandle.cpp
     lleditmenuhandler.cpp
 	llemojidictionary.cpp
+	llemojihelper.cpp
     llf32uictrl.cpp
     llfiltereditor.cpp
     llflashtimer.cpp
@@ -165,6 +166,7 @@ set(llui_HEADER_FILES
     lldockcontrol.h
     lleditmenuhandler.h
 	llemojidictionary.h
+	llemojihelper.h
     llf32uictrl.h
     llfiltereditor.h 
     llflashtimer.h
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
new file mode 100644
index 0000000000..d4c31ee986
--- /dev/null
+++ b/indra/llui/llemojihelper.cpp
@@ -0,0 +1,142 @@
+/**
+* @file llemojihelper.h
+* @brief Header file for LLEmojiHelper
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, 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 "llemojidictionary.h"
+#include "llemojihelper.h"
+#include "llfloater.h"
+#include "llfloaterreg.h"
+#include "lluictrl.h"
+
+// ============================================================================
+// Constants
+//
+
+constexpr char DEFAULT_EMOJI_HELPER_FLOATER[] = "emoji_complete";
+constexpr S32 HELPER_FLOATER_OFFSET_X = 20;
+constexpr S32 HELPER_FLOATER_OFFSET_Y = 0;
+
+// ============================================================================
+// LLEmojiHelper
+//
+
+std::string LLEmojiHelper::getToolTip(llwchar ch) const
+{
+	return LLEmojiDictionary::instance().getNameFromEmoji(ch);
+}
+
+bool LLEmojiHelper::isActive(const LLUICtrl* ctrl_p) const
+{
+	return mHostHandle.get() == ctrl_p;
+}
+
+// static
+bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S32* pShortCodePos)
+{
+	S32 shortCodePos = cursorPos;
+
+	while (shortCodePos > 1 &&
+		   (LLStringOps::isAlnum(wtext[shortCodePos - 1]) || wtext[shortCodePos - 1] == L'-' || wtext[shortCodePos - 1] == L'_') )
+	{
+		shortCodePos--;
+	}
+
+	bool isShortCode = (L':' == wtext[shortCodePos - 1]) && (cursorPos - shortCodePos >= 2);
+	if (pShortCodePos)
+		*pShortCodePos = (isShortCode) ? shortCodePos - 1 : -1;
+	return isShortCode;
+}
+
+void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(LLWString)> cb)
+{
+	if (mHelperHandle.isDead())
+	{
+		LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
+		mHelperHandle = pHelperFloater->getHandle();
+		mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())); }, std::placeholders::_2));
+	}
+	setHostCtrl(hostctrl_p);
+	mEmojiCommitCb = cb;
+
+	S32 floater_x, floater_y;
+	if (!hostctrl_p->localPointToOtherView(local_x, local_y, &floater_x, &floater_y, gFloaterView))
+	{
+		LL_ERRS() << "Cannot show emoji helper for non-floater controls." << LL_ENDL;
+		return;
+	}
+
+	LLFloater* pHelperFloater = mHelperHandle.get();
+	LLRect rct = pHelperFloater->getRect();
+	rct.setLeftTopAndSize(floater_x - HELPER_FLOATER_OFFSET_X, floater_y - HELPER_FLOATER_OFFSET_Y + rct.getHeight(), rct.getWidth(), rct.getHeight());
+	pHelperFloater->setRect(rct);
+	pHelperFloater->openFloater(LLSD().with("hint", short_code));
+}
+
+void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p)
+{
+	setHostCtrl(nullptr);
+}
+
+bool LLEmojiHelper::handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask)
+{
+	if (mHelperHandle.isDead() || !isActive(ctrl_p))
+	{
+		return false;
+	}
+
+	return mHelperHandle.get()->handleKey(key, mask, true);
+}
+
+void LLEmojiHelper::onCommitEmoji(const LLWString& wstr)
+{
+	if (!mHostHandle.isDead() && mEmojiCommitCb)
+	{
+		mEmojiCommitCb(wstr);
+	}
+}
+
+void LLEmojiHelper::setHostCtrl(LLUICtrl* hostctrl_p)
+{
+	const LLUICtrl* pCurHostCtrl = mHostHandle.get();
+	if (pCurHostCtrl != hostctrl_p)
+	{
+		mHostCtrlFocusLostConn.disconnect();
+		mHostHandle.markDead();
+		mEmojiCommitCb = {};
+
+		if (!mHelperHandle.isDead())
+		{
+			mHelperHandle.get()->closeFloater();
+		}
+
+		if (hostctrl_p)
+		{
+			mHostHandle = hostctrl_p->getHandle();
+			mHostCtrlFocusLostConn = hostctrl_p->setFocusLostCallback(std::bind([&]() { hideHelper(getHostCtrl()); }));
+		}
+	}
+}
diff --git a/indra/llui/llemojihelper.h b/indra/llui/llemojihelper.h
new file mode 100644
index 0000000000..7ed042fc5f
--- /dev/null
+++ b/indra/llui/llemojihelper.h
@@ -0,0 +1,64 @@
+/**
+* @file llemojihelper.h
+* @brief Header file for LLEmojiHelper
+*
+* $LicenseInfo:firstyear=2014&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2014, 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$
+*/
+
+#pragma once
+
+#include "llhandle.h"
+#include "llsingleton.h"
+
+#include <boost/signals2.hpp>
+
+class LLFloater;
+class LLUICtrl;
+
+class LLEmojiHelper : public LLSingleton<LLEmojiHelper>
+{
+	LLSINGLETON(LLEmojiHelper) {}
+	~LLEmojiHelper() override {}
+
+public:
+	// General
+	std::string getToolTip(llwchar ch) const;
+	bool        isActive(const LLUICtrl* ctrl_p) const;
+	static bool isCursorInEmojiCode(const LLWString& wtext, S32 cursor_pos, S32* short_code_pos_p = nullptr);
+	void        showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(LLWString)> commit_cb);
+	void        hideHelper(const LLUICtrl* ctrl_p);
+
+	// Eventing
+	bool handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask);
+	void onCommitEmoji(const LLWString& wstr);
+
+protected:
+	LLUICtrl* getHostCtrl() const { return mHostHandle.get(); }
+	void      setHostCtrl(LLUICtrl* hostctrl_p);
+
+private:
+	LLHandle<LLUICtrl>  mHostHandle;
+	LLHandle<LLFloater> mHelperHandle;
+	boost::signals2::connection mHostCtrlFocusLostConn;
+	boost::signals2::connection mHelperCommitConn;
+	std::function<void(LLWString)> mEmojiCommitCb;
+};
-- 
cgit v1.2.3


From 3acb4caa0fb9d381be6cfbe1693ace389d90a16c Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:18:22 +0200
Subject: Add emoji helper support to LLTextEditor

---
 indra/llui/lltexteditor.cpp | 21 ++++++++++++++++++---
 indra/llui/lltexteditor.h   |  2 ++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 889940cf9a..168c260c7d 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -676,6 +676,21 @@ void LLTextEditor::selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_p
 	endSelection();
 }
 
+void LLTextEditor::handleEmojiCommit(const LLWString& wstr)
+{
+	LLWString wtext(getWText()); S32 shortCodePos;
+	if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
+	{
+		remove(shortCodePos, mCursorPos - shortCodePos, true);
+
+		auto styleParams = LLStyle::Params();
+		styleParams.font = LLFontGL::getFontEmoji();
+		insert(shortCodePos, wstr, false, new LLEmojiTextSegment(new LLStyle(styleParams), shortCodePos, shortCodePos + wstr.size(), *this));
+
+		setCursorPos(shortCodePos + 1);
+	}
+}
+
 BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	BOOL	handled = FALSE;
@@ -1147,9 +1162,9 @@ void LLTextEditor::addChar(llwchar wc)
 		LLWString wtext(getWText()); S32 shortCodePos;
 		if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
 		{
-			const LLRect cursorRect = getLocalRectFromDocIndex(mCursorPos);
-			const LLWString shortCode = wtext.substr(shortCodePos, mCursorPos);
-			LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, wstring_to_utf8str(shortCode));
+			const LLRect cursorRect = getLocalRectFromDocIndex(mCursorPos - 1);
+			const LLWString shortCode = wtext.substr(shortCodePos, mCursorPos - shortCodePos);
+			LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, wstring_to_utf8str(shortCode), std::bind(&LLTextEditor::handleEmojiCommit, this, std::placeholders::_1));
 		}
 	}
 
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 04910b6f68..4c8175a286 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -92,6 +92,8 @@ public:
 
 	static S32		spacesPerTab();
 
+	        void    handleEmojiCommit(const LLWString& wstr);
+
 	// mousehandler overrides
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-- 
cgit v1.2.3


From 90e272993bb4c591fd2a98772d7fe1104dbff921 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:24:25 +0200
Subject: Autosize the mini emoji helper to fit the number of shown emojis

---
 indra/newview/llpanelemojicomplete.cpp             | 49 ++++++++++++++++++++--
 indra/newview/llpanelemojicomplete.h               | 17 ++++++--
 .../default/xui/en/floater_emoji_complete.xml      | 22 +++++-----
 3 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index e1d80b62e2..f6823befac 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -39,12 +39,18 @@ constexpr U32 MIN_MOUSE_MOVE_DELTA = 4;
 static LLDefaultChildRegistry::Register<LLPanelEmojiComplete> r("emoji_complete");
 
 LLPanelEmojiComplete::Params::Params()
-	: selected_image("selected_image")
+	: autosize("autosize")
+	, max_emoji("max_emoji")
+	, padding("padding")
+	, selected_image("selected_image")
 {
 }
 
 LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p)
 	: LLUICtrl(p)
+	, mAutoSize(p.autosize)
+	, mMaxVisible(p.max_emoji)
+	, mPadding(p.padding)
 	, mSelectedImage(p.selected_image)
 {
 	setFont(p.font);
@@ -125,9 +131,23 @@ void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_paren
 
 void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 {
+	llwchar curEmoji = (mCurSelected < mEmojis.size()) ? mEmojis.at(mCurSelected) : 0;
+	size_t curEmojiIdx = (curEmoji) ? mEmojis.find(curEmoji) : std::string::npos;
+
 	mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint);
+	mCurSelected = (std::string::npos != curEmojiIdx) ? curEmojiIdx : 0;
+
+	if (mAutoSize)
+	{
+		mVisibleEmojis = std::min(mEmojis.size(), mMaxVisible);
+		reshape(mVisibleEmojis * mEmojiWidth, getRect().getHeight(), false);
+	}
+	else
+	{
+		updateConstraints();
+	}
+
 	mScrollPos = llmin(mScrollPos, mEmojis.size());
-	updateConstraints();
 }
 
 size_t LLPanelEmojiComplete::posToIndex(S32 x, S32 y) const
@@ -200,11 +220,34 @@ LLFloaterEmojiComplete::LLFloaterEmojiComplete(const LLSD& sdKey)
 	setFocusStealsFrontmost(false);
 	setAutoFocus(false);
 	setBackgroundVisible(false);
+	setIsChrome(true);
 }
 
 void LLFloaterEmojiComplete::onOpen(const LLSD& key)
 {
-	findChild<LLPanelEmojiComplete>("emoji_complete_ctrl")->setEmojiHint(key["hint"].asString());
+	mEmojiCtrl->setEmojiHint(key["hint"].asString());
+}
+
+BOOL LLFloaterEmojiComplete::postBuild()
+{
+	mEmojiCtrl = findChild<LLPanelEmojiComplete>("emoji_complete_ctrl");
+	mEmojiCtrlHorz = getRect().getWidth() - mEmojiCtrl->getRect().getWidth();
+
+	return TRUE;
+}
+
+void LLFloaterEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+	if (!called_from_parent)
+	{
+		LLRect rctFloater = getRect(), rctCtrl = mEmojiCtrl->getRect();
+		rctFloater.mRight = rctFloater.mLeft + rctCtrl.getWidth() + mEmojiCtrlHorz;
+		setRect(rctFloater);
+
+		return;
+	}
+
+	LLFloater::reshape(width, height, called_from_parent);
 }
 
 // ============================================================================
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 85b0609ae9..b389ac9d53 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -39,6 +39,10 @@ class LLPanelEmojiComplete : public LLUICtrl
 public:
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
+		Optional<bool>       autosize;
+		Optional<S32>        max_emoji,
+		                     padding;
+
 		Optional<LLUIImage*> selected_image;
 
 		Params();
@@ -68,8 +72,12 @@ protected:
 protected:
 	static constexpr auto npos = std::numeric_limits<size_t>::max();
 
+	bool            mAutoSize = false;
 	const LLFontGL* mFont;
 	U16             mEmojiWidth = 0;
+	size_t          mMaxVisible = 0;
+	S32             mPadding = 8;
+	LLRect          mRenderRect;
 	LLUIImagePtr	mSelectedImage;
 
 	LLWString       mEmojis;
@@ -78,9 +86,6 @@ protected:
 	size_t          mScrollPos = 0;
 	size_t          mCurSelected = 0;
 	LLVector2       mLastHover;
-
-	S32             mPadding = 8;
-	LLRect          mRenderRect;
 };
 
 // ============================================================================
@@ -94,6 +99,12 @@ public:
 
 public:
 	void onOpen(const LLSD& key) override;
+	BOOL postBuild() override;
+	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
+
+protected:
+	LLPanelEmojiComplete* mEmojiCtrl = nullptr;
+	S32                   mEmojiCtrlHorz = 0;
 };
 
 // ============================================================================
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
index eb666bc32c..e9ea8f4de7 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
@@ -13,14 +13,16 @@
  single_instance="true"
  width="240"
  >
-    <emoji_complete
-     height="30"
-     follows="top|left"
-     layout="topleft"
-     left="5"
-     top="5"
-     width="230"
-     name="emoji_complete_ctrl"
-     >
-    </emoji_complete>
+	<emoji_complete
+	 autosize="true"
+	 height="30"
+	 follows="top|left"
+	 layout="topleft"
+	 left="5"
+	 max_emoji="7"
+	 name="emoji_complete_ctrl"
+	 top="5"
+	 width="230"
+	 >
+	</emoji_complete>
 </floater>
-- 
cgit v1.2.3


From f6f52d327be5f03265d66a95df6fc0716f91ca07 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:35:44 +0200
Subject: Provide a way for a floater to remain the topmost floater, even when
 focus is given to a different floater

---
 indra/llui/llfloater.cpp | 24 +++++++++++++++++++++++-
 indra/llui/llfloater.h   |  4 ++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 0e42922543..04f6b11b7c 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -3039,7 +3039,29 @@ void LLFloaterView::syncFloaterTabOrder()
 			LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
 			if (gFocusMgr.childHasKeyboardFocus(floaterp))
 			{
-				bringToFront(floaterp, FALSE);
+                if (mFrontChild != floaterp)
+                {
+                    // Grab a list of the top floaters that want to stay on top of the focused floater
+					std::list<LLView*> listTop;
+					if (mFrontChild && !mFrontChild->canFocusStealFrontmost())
+                    {
+                        for (LLView* childfloaterp : *getChildList())
+                        {
+                            if (static_cast<LLFloater*>(childfloaterp)->canFocusStealFrontmost())
+                                break;
+							listTop.push_back(childfloaterp);
+                        }
+                    }
+
+                    bringToFront(floaterp, FALSE);
+
+                    // Restore top floaters
+                    for (LLView* childp :listTop)
+                    {
+                        sendChildToFront(childp);
+                    }
+                }
+
 				break;
 			}
 		}
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 2672d600c6..1d4aff31eb 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -313,6 +313,9 @@ public:
 	/*virtual*/ void setVisible(BOOL visible); // do not override
 	/*virtual*/ void onVisibilityChange ( BOOL new_visibility ); // do not override
 	
+	bool            canFocusStealFrontmost() const { return mFocusStealsFrontmost; }
+	void            setFocusStealsFrontmost(bool wants_frontmost) { mFocusStealsFrontmost = wants_frontmost; }
+
 	void			setFrontmost(BOOL take_focus = TRUE, BOOL restore = TRUE);
      virtual void	setVisibleAndFrontmost(BOOL take_focus=TRUE, const LLSD& key = LLSD());
 	
@@ -478,6 +481,7 @@ private:
 	BOOL			mCanTearOff;
 	BOOL			mCanMinimize;
 	BOOL			mCanClose;
+    bool            mFocusStealsFrontmost = true;	// FALSE if we don't want the currently focused floater to cover this floater without user interaction
 	BOOL			mDragOnLeft;
 	BOOL			mResizable;
 
-- 
cgit v1.2.3


From 8d08f417dc1f5b2681774f000951993e0f0cf79f Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 16:37:10 +0200
Subject: Show tooltip when hovering over an emoji text segment (currently will
 show its shortcode)

---
 indra/llui/lltextbase.cpp | 14 ++++++++++++++
 indra/llui/lltextbase.h   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 2a6e6901e4..693dcb7b8d 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -3557,6 +3557,20 @@ LLEmojiTextSegment::LLEmojiTextSegment(const LLColor4& color, S32 start, S32 end
 {
 }
 
+BOOL LLEmojiTextSegment::handleToolTip(S32 x, S32 y, MASK mask)
+{
+	if (mTooltip.empty())
+	{
+		LLWString emoji = getWText().substr(getStart(), getEnd() - getStart());
+		if (!emoji.empty())
+		{
+			mTooltip = LLEmojiHelper::instance().getToolTip(emoji[0]);
+		}
+	}
+
+	return LLNormalTextSegment::handleToolTip(x, y, mask);
+}
+
 //
 // LLOnHoverChangeableTextSegment
 //
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index fc999c4cca..31e9f16110 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -187,6 +187,7 @@ public:
 	LLEmojiTextSegment(const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible = TRUE);
 
 	bool canEdit() const override { return false; }
+	BOOL handleToolTip(S32 x, S32 y, MASK mask);
 };
 
 // Text segment that changes it's style depending of mouse pointer position ( is it inside or outside segment)
-- 
cgit v1.2.3


From 58cdcd5dd23778c6fad9fa0da31b670ceff8eeeb Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 17:47:51 +0200
Subject: Handle return and escape in the mini emoji helper

---
 indra/llui/llemojihelper.cpp           |  5 ++++
 indra/llui/llemojihelper.h             |  2 +-
 indra/newview/llpanelemojicomplete.cpp | 48 +++++++++++++++++++++++++++++++---
 indra/newview/llpanelemojicomplete.h   |  1 +
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index d4c31ee986..54c801ab7b 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -98,6 +98,11 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
 
 void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p)
 {
+	if (ctrl_p && !isActive(ctrl_p))
+	{
+		return;
+	}
+
 	setHostCtrl(nullptr);
 }
 
diff --git a/indra/llui/llemojihelper.h b/indra/llui/llemojihelper.h
index 7ed042fc5f..63f5c640c9 100644
--- a/indra/llui/llemojihelper.h
+++ b/indra/llui/llemojihelper.h
@@ -45,7 +45,7 @@ public:
 	bool        isActive(const LLUICtrl* ctrl_p) const;
 	static bool isCursorInEmojiCode(const LLWString& wtext, S32 cursor_pos, S32* short_code_pos_p = nullptr);
 	void        showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(LLWString)> commit_cb);
-	void        hideHelper(const LLUICtrl* ctrl_p);
+	void        hideHelper(const LLUICtrl* ctrl_p = nullptr);
 
 	// Eventing
 	bool handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask);
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index f6823befac..61b08ad48d 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -27,6 +27,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llemojidictionary.h"
+#include "llemojihelper.h"
 #include "llpanelemojicomplete.h"
 #include "lluictrlfactory.h"
 
@@ -101,9 +102,9 @@ BOOL LLPanelEmojiComplete::handleHover(S32 x, S32 y, MASK mask)
 
 BOOL LLPanelEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
+	bool handled = false;
 	if (MASK_NONE == mask)
 	{
-		bool handled = false;
 		switch (key)
 		{
 			case KEY_LEFT:
@@ -116,11 +117,24 @@ BOOL LLPanelEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent
 				selectNext();
 				handled = true;
 				break;
+			case KEY_RETURN:
+				if (!mEmojis.empty())
+				{
+					LLWString wstr;
+					wstr.push_back(mEmojis.at(mCurSelected));
+					setValue(wstring_to_utf8str(wstr));
+					onCommit();
+					handled = true;
+				}
+				break;
 		}
-		return handled;
 	}
 
-	return false;
+	if (handled)
+	{
+		return TRUE;
+	}
+	return LLUICtrl::handleKey(key, mask, called_from_parent);
 }
 
 void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
@@ -223,6 +237,26 @@ LLFloaterEmojiComplete::LLFloaterEmojiComplete(const LLSD& sdKey)
 	setIsChrome(true);
 }
 
+BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+{
+	bool handled = false;
+	if (MASK_NONE == mask)
+	{
+		switch (key)
+		{
+			case KEY_ESCAPE:
+				LLEmojiHelper::instance().hideHelper();
+				handled = true;
+				break;
+		}
+
+	}
+
+	if (handled)
+		return TRUE;
+	return LLFloater::handleKey(key, mask, called_from_parent);
+}
+
 void LLFloaterEmojiComplete::onOpen(const LLSD& key)
 {
 	mEmojiCtrl->setEmojiHint(key["hint"].asString());
@@ -231,9 +265,15 @@ void LLFloaterEmojiComplete::onOpen(const LLSD& key)
 BOOL LLFloaterEmojiComplete::postBuild()
 {
 	mEmojiCtrl = findChild<LLPanelEmojiComplete>("emoji_complete_ctrl");
+	mEmojiCtrl->setCommitCallback(
+		std::bind([&](const LLSD& sdValue)
+		{
+			setValue(sdValue);
+			onCommit();
+		}, std::placeholders::_2));
 	mEmojiCtrlHorz = getRect().getWidth() - mEmojiCtrl->getRect().getWidth();
 
-	return TRUE;
+	return LLFloater::postBuild();
 }
 
 void LLFloaterEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index b389ac9d53..361a2dc9b7 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -98,6 +98,7 @@ public:
 	LLFloaterEmojiComplete(const LLSD& sdKey);
 
 public:
+	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
 	void onOpen(const LLSD& key) override;
 	BOOL postBuild() override;
 	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
-- 
cgit v1.2.3


From cb0bb91108b628e1134f1f655eaca9d305961cda Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 17:51:22 +0200
Subject: Mini emoji helper shows as a small slice when there are no matching
 emojis

---
 indra/newview/llpanelemojicomplete.cpp | 4 ++++
 indra/newview/llpanelemojicomplete.h   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 61b08ad48d..a7058a6724 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -260,6 +260,10 @@ BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_pare
 void LLFloaterEmojiComplete::onOpen(const LLSD& key)
 {
 	mEmojiCtrl->setEmojiHint(key["hint"].asString());
+	if (0 == mEmojiCtrl->getEmojiCount())
+	{
+		LLEmojiHelper::instance().hideHelper();
+	}
 }
 
 BOOL LLFloaterEmojiComplete::postBuild()
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 361a2dc9b7..138cc465ba 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -59,7 +59,8 @@ public:
 	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 public:
-	void setEmojiHint(const std::string& hint);
+	size_t getEmojiCount() const { return mEmojis.size(); }
+	void   setEmojiHint(const std::string& hint);
 protected:
 	size_t posToIndex(S32 x, S32 y) const;
 	void select(size_t emoji_idx);
-- 
cgit v1.2.3


From fb1553d8cf704eeb222de7ebd520a81fa242b317 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 17:55:13 +0200
Subject: Cannot use the :+1 emoji shortcode

---
 indra/llui/llemojihelper.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 54c801ab7b..551f0331e7 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -59,8 +59,18 @@ bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S
 {
 	S32 shortCodePos = cursorPos;
 
-	while (shortCodePos > 1 &&
-		   (LLStringOps::isAlnum(wtext[shortCodePos - 1]) || wtext[shortCodePos - 1] == L'-' || wtext[shortCodePos - 1] == L'_') )
+	auto isPartOfShortcode = [](llwchar ch) {
+		switch (ch)
+		{
+			case L'-':
+			case L'_':
+			case L'+':
+				return true;
+			default:
+				return LLStringOps::isAlnum(ch);
+		}
+	};
+	while (shortCodePos > 1 && isPartOfShortcode(wtext[shortCodePos - 1]))
 	{
 		shortCodePos--;
 	}
-- 
cgit v1.2.3


From d1dbefc09b77990563d22aaf08d0c5708cc6cbbe Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 19:05:19 +0200
Subject: Refactor emoji matching

---
 indra/llui/llemojidictionary.cpp | 70 ++++++++++++++++++++++++----------------
 indra/llui/llemojidictionary.h   |  2 +-
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index e149832a8b..eefa4047a2 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -31,6 +31,8 @@
 #include "llsdserialize.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/range/adaptor/filtered.hpp>
+#include <boost/range/algorithm/transform.hpp>
 
 // ============================================================================
 // Constants
@@ -89,6 +91,41 @@ bool LLEmojiDescriptor::isValid() const
 		!Categories.empty();
 }
 
+struct emoji_filter_base
+{
+	emoji_filter_base(const std::string& needle)
+	{
+		// Search without the colon (if present) so the user can type ':food' and see all emojis in the 'Food' category
+		mNeedle = (boost::starts_with(needle, ":")) ? needle.substr(1) : needle;
+		LLStringUtil::toLower(mNeedle);
+	}
+
+protected:
+	std::string mNeedle;
+};
+
+struct emoji_filter_shortcode_or_category_contains : public emoji_filter_base
+{
+	emoji_filter_shortcode_or_category_contains(const std::string& needle) : emoji_filter_base(needle) {}
+
+	bool operator()(const LLEmojiDescriptor& descr) const
+	{
+		for (const auto& short_code : descr.ShortCodes)
+		{
+			if (boost::icontains(short_code, mNeedle))
+				return true;
+		}
+
+		for (const auto& category : descr.Categories)
+		{
+			if (boost::icontains(category, mNeedle))
+				return true;
+		}
+
+		return false;
+	}
+};
+
 // ============================================================================
 // LLEmojiDictionary class
 //
@@ -130,35 +167,12 @@ void LLEmojiDictionary::initClass()
 	}
 }
 
-LLWString LLEmojiDictionary::findMatchingEmojis(std::string needle)
+LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
 {
-	// Search without the colon (if present) so the user can type ':food' and see all emojis in the 'Food' category
-	LLStringUtil::toLower(needle);
-	const auto kitty_needle = boost::make_iterator_range((boost::starts_with(needle, ":")) ? needle.begin() + 1 : needle.begin(), needle.end());
-
-	LLWString wstr;
-	for (const auto& descr : mEmojis)
-	{
-		for (const auto& short_code : descr.ShortCodes)
-		{
-			if (boost::icontains(short_code, kitty_needle))
-			{
-				wstr.push_back(descr.Character);
-				continue;
-			}
-		}
-
-		for (const auto& category : descr.Categories)
-		{
-			if (boost::icontains(category, kitty_needle))
-			{
-				wstr.push_back(descr.Character);
-				continue;
-			}
-		}
-	}
-
-	return wstr;
+	LLWString result;
+	boost::transform(mEmojis | boost::adaptors::filtered(emoji_filter_shortcode_or_category_contains(needle)),
+		             std::back_inserter(result), [](const auto& descr) { return descr.Character; });
+	return result;
 }
 
 std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch)
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index 87ea4a5aef..3fa55cd417 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -57,7 +57,7 @@ class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLI
 
 public:
 	static void initClass();
-	LLWString   findMatchingEmojis(std::string needle);
+	LLWString   findMatchingEmojis(const std::string& needle) const;
 	std::string getNameFromEmoji(llwchar ch);
 
 private:
-- 
cgit v1.2.3


From 12433b11fce9f9e19ea7c2831096038a4a807d6d Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Wed, 26 Oct 2022 16:10:39 -0700
Subject: SL-18232 Library changes needed for emoji support from Kitty Barnett
 (updates for FreeType and ICU4C

---
 autobuild.xml | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 759f17f75d..837e40d895 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -698,9 +698,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6cc4791cda8bd22b31a7a5c6d6096444</string>
+              <string>66c308642234797ef82b1e22b96b5ae6</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105572/923689/freetype-2.12.1.575556-darwin64-575556.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106497/930538/freetype-2.12.1.576084-darwin64-576084.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -722,9 +722,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>89bfcc2fb628187cf6730a81f43c513e</string>
+              <string>fb161e641d4f4bfdeefed6021c192331</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105574/923703/freetype-2.12.1.575556-windows-575556.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106496/930532/freetype-2.12.1.576084-windows-576084.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -734,16 +734,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>cd2fb236e24aa912939c5e87b8a42ec7</string>
+              <string>fe29d0aa898b534f3083ad53f04afd40</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105573/923695/freetype-2.12.1.575556-windows64-575556.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106495/930523/freetype-2.12.1.576084-windows64-576084.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.12.1.575556</string>
+        <string>2.12.1.576084</string>
       </map>
       <key>glext</key>
       <map>
@@ -1029,6 +1029,62 @@
         <key>version</key>
         <string>2012.1-2</string>
       </map>
+      <key>icu4c</key>
+      <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-icu4c</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1995-2011 International Business Machines Corporation and others &lt;http://source.icu-project.org&gt;</string>
+        <key>description</key>
+        <string>ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.</string>
+        <key>license</key>
+        <string>ICU, permissive non-copyleft free software license</string>
+        <key>license_file</key>
+        <string>LICENSES/icu.txt</string>
+        <key>name</key>
+        <string>icu4c</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>8fc61ee230e63db756e14415573f604d</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106176/928492/icu4c-4.8.1-darwin64-575914.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>9898b1f45bc92d4fc75b1d1a68c59514</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106438/930144/icu4c-4.8.1-windows-575914.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>8ad662698b5d99ce169517ce11cf2bef</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106439/930151/icu4c-4.8.1-windows64-575914.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>4.8.1</string>
+      </map>
       <key>jpegencoderbasic</key>
       <map>
         <key>copyright</key>
-- 
cgit v1.2.3


From b52d54c8ca971872839f3595bc5cccd87ba2a7b4 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Wed, 26 Oct 2022 17:30:48 -0700
Subject: SL-18468 - pull in the (new) 3P package containing the Viewer fonts
 that are required for Kitty's work

---
 autobuild.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/autobuild.xml b/autobuild.xml
index 837e40d895..c9820ecedd 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2708,6 +2708,60 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>version</key>
         <string>0.9.4</string>
       </map>
+      <key>viewer-fonts</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright various</string>
+        <key>description</key>
+        <string>Viewer fonts</string>
+        <key>license</key>
+        <string>Various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/fonts.txt</string>
+        <key>name</key>
+        <string>viewer-fonts</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>9655e501340262e1feea9e71543d3eab</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106526/930682/viewer_fonts-1.576098-darwin64-576098.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>eb98887e363854810e03861f258e534d</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106533/930714/viewer_fonts-1.576098-windows-576098.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>365c0d38cde826c3c1e31bc68b5d1194</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106527/930690/viewer_fonts-1.576098-windows64-576098.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>1.576098</string>
+      </map>
       <key>viewer-manager</key>
       <map>
         <key>copyright</key>
-- 
cgit v1.2.3


From b0a3381b2f1c11299a8166ab94170d8f8151927a Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 27 Oct 2022 12:46:32 -0700
Subject: SL-18230 - pull in updated 3p-freetype package for macOS/Darwin to
 build to prevent linker errors in Viewer

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index c9820ecedd..09c6bf3522 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -698,9 +698,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>66c308642234797ef82b1e22b96b5ae6</string>
+              <string>4390c5182b5d6c397ef0396828093600</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106497/930538/freetype-2.12.1.576084-darwin64-576084.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106585/931193/freetype-2.12.1.576132-darwin64-576132.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -722,9 +722,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fb161e641d4f4bfdeefed6021c192331</string>
+              <string>6ad01c23db703cd6ad2a491aae937379</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106496/930532/freetype-2.12.1.576084-windows-576084.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106586/931203/freetype-2.12.1.576132-windows-576132.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -734,16 +734,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fe29d0aa898b534f3083ad53f04afd40</string>
+              <string>db5f433b65a268a1ea601d7e29766cb1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106495/930523/freetype-2.12.1.576084-windows64-576084.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106587/931202/freetype-2.12.1.576132-windows64-576132.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.12.1.576084</string>
+        <string>2.12.1.576132</string>
       </map>
       <key>glext</key>
       <map>
-- 
cgit v1.2.3


From c40d3351d511b19f4468f7467be38499bf16588f Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 2 Nov 2022 19:05:24 +0100
Subject: Commit immediately if the user already typed a full shortcode

---
 indra/llui/llemojidictionary.cpp | 17 +++++++++++++----
 indra/llui/llemojidictionary.h   |  6 ++++--
 indra/llui/llemojihelper.cpp     |  8 ++++++++
 indra/llui/lltextbase.cpp        |  1 +
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index eefa4047a2..c31638b0bf 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -175,17 +175,26 @@ LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
 	return result;
 }
 
-std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch)
+const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromShortCode(const std::string& short_code) const
+{
+	const auto it = mShortCode2Descr.find(short_code);
+	return (mShortCode2Descr.end() != it) ? &it->second : nullptr;
+}
+
+std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch) const
 {
 	const auto it = mEmoji2Descr.find(ch);
-	return (mEmoji2Descr.end() != it) ? it->second->Name : LLStringUtil::null;
+	return (mEmoji2Descr.end() != it) ? it->second.Name : LLStringUtil::null;
 }
 
 void LLEmojiDictionary::addEmoji(LLEmojiDescriptor&& descr)
 {
 	mEmojis.push_back(descr);
-	const LLEmojiDescriptor& back = mEmojis.back();
-	mEmoji2Descr.insert(std::make_pair(descr.Character, &back));
+	mEmoji2Descr.insert(std::make_pair(descr.Character, mEmojis.back()));
+	for (const std::string& shortCode : descr.ShortCodes)
+	{
+		mShortCode2Descr.insert(std::make_pair(shortCode, mEmojis.back()));
+	}
 }
 
 // ============================================================================
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index 3fa55cd417..0cde663719 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -58,14 +58,16 @@ class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLI
 public:
 	static void initClass();
 	LLWString   findMatchingEmojis(const std::string& needle) const;
-	std::string getNameFromEmoji(llwchar ch);
+	const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
+	std::string getNameFromEmoji(llwchar ch) const;
 
 private:
 	void addEmoji(LLEmojiDescriptor&& descr);
 
 private:
 	std::list<LLEmojiDescriptor> mEmojis;
-	std::map<llwchar, const LLEmojiDescriptor*> mEmoji2Descr;
+	std::map<llwchar, const LLEmojiDescriptor&> mEmoji2Descr;
+	std::map<std::string, const LLEmojiDescriptor&> mShortCode2Descr;
 };
 
 // ============================================================================
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 551f0331e7..32471e59a8 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -83,6 +83,14 @@ bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S
 
 void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(LLWString)> cb)
 {
+	// Commit immediately if the user already typed a full shortcode
+	if (const auto* emojiDescrp = LLEmojiDictionary::instance().getDescriptorFromShortCode(short_code))
+	{
+		cb(LLWString(1, emojiDescrp->Character));
+		hideHelper();
+		return;
+	}
+
 	if (mHelperHandle.isDead())
 	{
 		LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 693dcb7b8d..b88c7ced40 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -29,6 +29,7 @@
 
 #include "lltextbase.h"
 
+#include "llemojihelper.h"
 #include "lllocalcliprect.h"
 #include "llmenugl.h"
 #include "llscrollcontainer.h"
-- 
cgit v1.2.3


From 97300c608153d21a441ed34b0a5b9a2ea815df2e Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 2 Nov 2022 19:11:20 +0100
Subject: Add (partial) emoji set descriptors

---
 .../skins/default/xui/en/emoji_characters.xml      | 10955 +++++++++++++++++++
 1 file changed, 10955 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/emoji_characters.xml

diff --git a/indra/newview/skins/default/xui/en/emoji_characters.xml b/indra/newview/skins/default/xui/en/emoji_characters.xml
new file mode 100644
index 0000000000..55aefe6745
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/emoji_characters.xml
@@ -0,0 +1,10955 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+	<array>
+		<map>
+			<key>Character</key>
+			<string>😀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:grinning:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smile:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:laughing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rofl:</string>
+				<string>:satisfied:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:slightly_smiling_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😉</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:wink:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:innocent:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smiley:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😁</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:grin:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sweat_smile:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:joy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:upside_down_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blush:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Smiling</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smiling_face_with_three_hearts:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:star_struck:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kissing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kissing_closed_eyes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smiling_face_with_tear:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heart_eyes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kissing_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>☺️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:relaxed:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kissing_smiling_eyes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Affection</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:yum:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Tongue</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:stuck_out_tongue_winking_eye:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Tongue</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:stuck_out_tongue_closed_eyes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Tongue</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:stuck_out_tongue:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Tongue</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤪</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:zany_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Tongue</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:money_mouth_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Tongue</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hugs:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Hand</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:shushing_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Hand</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hand_over_mouth:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Hand</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:thinking:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Hand</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:zipper_mouth_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:neutral_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:no_mouth:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smirk:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:roll_eyes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😮‍💨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:face_exhaling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raised_eyebrow:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:expressionless:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😶‍🌫️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:face_in_clouds:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:unamused:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:grimacing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lying_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Neutral Skeptical</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:relieved:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Sleepy</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😪</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sleepy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Sleepy</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sleeping:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Sleepy</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pensive:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Sleepy</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:drooling_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Sleepy</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😷</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mask:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:face_with_head_bandage:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:vomiting_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hot_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woozy_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😵‍💫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:face_with_spiral_eyes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:face_with_thermometer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤢</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:nauseated_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sneezing_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cold_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dizzy_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:exploding_head:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Unwell</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤠</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cowboy_hat_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Hat</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥸</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:disguised_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Hat</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:partying_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Hat</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sunglasses:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Glasses</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:monocle_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Glasses</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:nerd_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Glasses</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:confused:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙁</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:slightly_frowning_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:open_mouth:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:astonished:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pleading_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:anguished:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cold_sweat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😢</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cry:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:scream:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:persevere:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sweat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tired_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:worried:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>☹️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:frowning_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hushed:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:flushed:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:frowning:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fearful:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:disappointed_relieved:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sob:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:confounded:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😞</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:disappointed:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:weary:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:yawning_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Concerned</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:triumph:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😠</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:angry:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😈</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smiling_imp:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:skull:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😡</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pout:</string>
+				<string>:rage:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cursing_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👿</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:imp:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>☠️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:skull_and_crossbones:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Negative</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hankey:</string>
+				<string>:poop:</string>
+				<string>:shit:</string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👹</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:japanese_ogre:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ghost:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:space_invader:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤡</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:clown_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:japanese_goblin:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:alien:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:robot:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Face Costume</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smiley_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😹</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:joy_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smirk_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:scream_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pouting_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😸</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:smile_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heart_eyes_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kissing_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>😿</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:crying_cat_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Cat Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙈</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:see_no_evil:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Monkey Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:speak_no_evil:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Monkey Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙉</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hear_no_evil:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Smiley</string>
+				<string>Monkey Face</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kiss:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cupid:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sparkling_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heartbeat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:two_hearts:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>❣️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heavy_heart_exclamation:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>❤️‍🔥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heart_on_fire:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>❤️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:yellow_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blue_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:brown_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:white_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💢</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:anger:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dizzy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dash:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bomb:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👁️‍🗨️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:eye_speech_bubble:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🗯️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:right_anger_bubble:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:zzz:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:love_letter:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:gift_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heartpulse:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💞</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:revolving_hearts:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:heart_decoration:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:broken_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>❤️‍🩹</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mending_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧡</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:orange_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:green_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:purple_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🖤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:black_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:100:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:boom:</string>
+				<string>:collision:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sweat_drops:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕳️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hole:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:speech_balloon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🗨️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:left_speech_bubble:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:thought_balloon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Emotion</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:wave:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Open</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🖐️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raised_hand_with_fingers_splayed:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Open</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🖖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:vulcan_salute:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Open</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raised_back_of_hand:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Open</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>✋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hand:</string>
+				<string>:raised_hand:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Open</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ok_hand:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pinching_hand:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤞</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:crossed_fingers:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:metal:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pinched_fingers:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>✌️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:v:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:love_you_gesture:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:call_me_hand:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Partial</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👈</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:point_left:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Single Finger</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:point_up_2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Single Finger</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:point_down:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Single Finger</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👉</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:point_right:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Single Finger</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🖕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fu:</string>
+				<string>:middle_finger:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Single Finger</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>☝️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:point_up:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Single Finger</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:+1:</string>
+				<string>:thumbsup:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Closed</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>✊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fist:</string>
+				<string>:fist_raised:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Closed</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fist_left:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Closed</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:-1:</string>
+				<string>:thumbsdown:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Closed</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:facepunch:</string>
+				<string>:fist_oncoming:</string>
+				<string>:punch:</string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Closed</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fist_right:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Fingers Closed</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:clap:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hands</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:open_hands:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hands</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:handshake:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hands</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raised_hands:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hands</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:palms_up_together:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hands</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pray:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hands</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>✍️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:writing_hand:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Prop</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:selfie:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Prop</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:nail_care:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Hand Prop</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💪</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:muscle:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦿</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mechanical_leg:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:foot:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ear_with_hearing_aid:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧠</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:brain:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫁</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lungs:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bone:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👁️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:eye:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lips:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mechanical_arm:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:leg:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ear:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:nose:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:anatomical_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦷</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tooth:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:eyes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tongue:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Body</string>
+				<string>Body Parts</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:baby:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:adult:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧔‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_beard:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🦰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:red_haired_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🦳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:white_haired_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🦰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_red_hair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🦱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_curly_hair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🦳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_white_hair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🦲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_bald:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👱‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blond_haired_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:older_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:child:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blond_haired_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bearded_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧔‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_beard:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🦱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:curly_haired_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🦲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bald_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🦰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:red_haired_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🦱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:curly_haired_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🦳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:white_haired_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🦲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bald_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👱‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blond_haired_woman:</string>
+				<string>:blonde_woman:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:older_adult:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:older_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:frowning_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙍‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:frowning_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙎‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pouting_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:no_good:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙅‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ng_woman:</string>
+				<string>:no_good_woman:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙆‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ok_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💁</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:information_desk_person:</string>
+				<string>:tipping_hand_person:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💁‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sassy_woman:</string>
+				<string>:tipping_hand_woman:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙋‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raising_hand_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:deaf_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧏‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:deaf_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙇‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bowing_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:facepalm:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤦‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_facepalming:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤷‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_shrugging:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙍‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:frowning_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pouting_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙎‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pouting_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙅‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ng_man:</string>
+				<string>:no_good_man:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ok_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙆‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ok_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💁‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sassy_man:</string>
+				<string>:tipping_hand_man:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raising_hand:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙋‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raising_hand_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧏‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:deaf_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bow:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🙇‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bowing_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤦‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_facepalming:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤷</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:shrug:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤷‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_shrugging:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Gesture</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍⚕️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:health_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍⚕️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_health_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🎓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_student:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🏫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:teacher:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🏫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_teacher:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍⚖️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_judge:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🌾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:farmer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🌾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_farmer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🍳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_cook:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🔧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mechanic:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🔧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_mechanic:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🏭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_factory_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍💼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:office_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍💼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_office_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🔬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_scientist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍💻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:technologist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍💻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_technologist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🎤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_singer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🎨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:artist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🎨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_artist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍✈️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_pilot:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🚀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:astronaut:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🚀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_astronaut:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🚒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_firefighter:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cop:</string>
+				<string>:police_officer:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👮‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:policewoman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕵️‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:male_detective:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:guard:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💂‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:guardswoman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👷</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:construction_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👷‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:construction_worker_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👸</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:princess:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👳‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_with_turban:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_with_gua_pi_mao:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_in_tuxedo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤵‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_in_tuxedo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👰‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_with_veil:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pregnant_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🍼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_feeding_baby:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🍼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_feeding_baby:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍⚕️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_health_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🎓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:student:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🎓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_student:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🏫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_teacher:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍⚖️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:judge:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍⚖️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_judge:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🌾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_farmer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🍳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cook:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🍳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_cook:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🔧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_mechanic:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🏭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:factory_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🏭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_factory_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍💼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_office_worker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🔬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:scientist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🔬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_scientist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍💻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_technologist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🎤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:singer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🎤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_singer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🎨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_artist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍✈️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pilot:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍✈️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_pilot:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🚀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_astronaut:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🚒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:firefighter:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🚒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_firefighter:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👮‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:policeman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕵️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:detective:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕵️‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:female_detective:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💂‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:guardsman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥷</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ninja:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👷‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:construction_worker_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:prince:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_with_turban:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👳‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_with_turban:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_with_headscarf:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤵‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_in_tuxedo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_with_veil:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👰‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bride_with_veil:</string>
+				<string>:woman_with_veil:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:breast_feeding:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🍼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_feeding_baby:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Role</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:angel:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mrs_claus:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦸</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:superhero:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦸‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:superhero_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦹‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:supervillain_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mage:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧙‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mage_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧚‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fairy_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:vampire:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧛‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:vampire_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧜‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:merman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:elf:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧝‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:elf_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧞‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:genie_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:zombie:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧟‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:zombie_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🎅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:santa:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🎄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mx_claus:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦸‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:superhero_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦹</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:supervillain:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦹‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:supervillain_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧙‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mage_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fairy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧚‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fairy_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧛‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:vampire_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:merperson:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧜‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mermaid:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧝‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:elf_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧞</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:genie:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧞‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:genie_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧟‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:zombie_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Fantasy</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:massage:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💆‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:massage_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💇‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:haircut_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:walking:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚶‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:walking_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧍‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:standing_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kneeling_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧎‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kneeling_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🦯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_with_probing_cane:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🦼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_in_motorized_wheelchair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🦼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_in_motorized_wheelchair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🦽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_in_manual_wheelchair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:runner:</string>
+				<string>:running:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏃‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:running_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_dancing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dancers:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👯‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dancing_women:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧖‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sauna_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:climbing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧗‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:climbing_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💆‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:massage_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:haircut:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💇‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:haircut_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚶‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:walking_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:standing_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧍‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:standing_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧎‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kneeling_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🦯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_with_probing_cane:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🦯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_with_probing_cane:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍🦼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_in_motorized_wheelchair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🦽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_in_manual_wheelchair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍🦽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_in_manual_wheelchair:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏃‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:running_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dancer:</string>
+				<string>:woman_dancing:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕴️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:business_suit_levitating:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👯‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dancing_men:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sauna_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧖‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sauna_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧗‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:climbing_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Activity</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:person_fencing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>⛷️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:skier:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏌️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:golfing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏌️‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:golfing_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏄‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:surfing_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rowboat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚣‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rowing_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏊‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:swimming_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>⛹️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bouncing_ball_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>⛹️‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:basketball_woman:</string>
+				<string>:bouncing_ball_woman:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏋️‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:weight_lifting_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bicyclist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚴‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:biking_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚵‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mountain_biking_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤸</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cartwheeling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤸‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_cartwheeling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤼‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:men_wrestling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:water_polo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤽‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_playing_water_polo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤾‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_playing_handball:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤹</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:juggling_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤹‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_juggling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:horse_racing:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:snowboarder:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏌️‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:golfing_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:surfer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏄‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:surfing_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚣‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rowing_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:swimmer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏊‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:swimming_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>⛹️‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:basketball_man:</string>
+				<string>:bouncing_ball_man:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏋️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:weight_lifting:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏋️‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:weight_lifting_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚴‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:biking_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mountain_bicyclist:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🚵‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mountain_biking_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤸‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_cartwheeling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:wrestling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤼‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:women_wrestling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤽‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_playing_water_polo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:handball_person:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤾‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:woman_playing_handball:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🤹‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:man_juggling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Sport</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lotus_position:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Resting</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧘‍♀️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lotus_position_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Resting</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🛌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sleeping_bed:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Resting</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧘‍♂️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lotus_position_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Resting</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🛀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bath:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Resting</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧑‍🤝‍🧑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:people_holding_hands:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couple:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couplekiss:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍❤️‍💋‍👨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couplekiss_man_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couple_with_heart:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍❤️‍👨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couple_with_heart_man_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👪</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👩‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_woman_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👩‍👦‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_woman_boy_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👨‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_man_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👨‍👧‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_man_girl_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👨‍👧‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_man_girl_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👩‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_woman_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👩‍👦‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_woman_boy_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👧‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_girl_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👦‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_boy_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👧‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_girl_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:two_women_holding_hands:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:two_men_holding_hands:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍❤️‍💋‍👨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couplekiss_man_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍❤️‍💋‍👩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couplekiss_woman_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍❤️‍👨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couple_with_heart_woman_man:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍❤️‍👩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:couple_with_heart_woman_woman:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👩‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_woman_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👩‍👧‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_woman_girl_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👩‍👧‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_woman_girl_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👨‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_man_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👨‍👦‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_man_boy_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👩‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_woman_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👩‍👧‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_woman_girl_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👩‍👧‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_woman_girl_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👦‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_boy_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👨‍👧‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_man_girl_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_boy:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👩‍👧‍👧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:family_woman_girl_girl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person</string>
+				<string>Family</string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🗣️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:speaking_head:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Symbol</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:busts_in_silhouette:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Symbol</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:footprints:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Symbol</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>👤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bust_in_silhouette:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Symbol</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:people_hugging:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Person Symbol</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:monkey_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:gorilla:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dog:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:guide_dog:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:poodle:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fox_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐈‍⬛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:black_cat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tiger:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:leopard:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:racehorse:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:zebra:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bison:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ox:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cow2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pig2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pig_nose:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sheep:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐪</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dromedary_camel:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:llama:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:elephant:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rhinoceros:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mouse:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rabbit:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐿️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:chipmunk:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hedgehog:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bear:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:koala:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sloth:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:skunk:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦡</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:badger:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:monkey:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:orangutan:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dog2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐕‍🦺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:service_dog:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:wolf:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:raccoon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐈</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cat2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦁</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lion:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tiger2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:horse:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:unicorn:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:deer:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cow:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:water_buffalo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐷</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pig:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:boar:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ram:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:goat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:camel:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:giraffe:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mammoth:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hippopotamus:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐁</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mouse2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐹</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hamster:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rabbit2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:beaver:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐻‍❄️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:polar_bear:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:panda_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:otter:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kangaroo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:feet:</string>
+				<string>:paw_prints:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Mammal</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:turkey:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rooster:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:baby_chick:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bird:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕊️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dove:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:duck:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦉</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:owl:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🪶</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:feather:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:peacock:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:chicken:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hatching_chick:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hatched_chick:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐧</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:penguin:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:eagle:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦢</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:swan:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dodo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:flamingo:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:parrot:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bird</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐸</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:frog:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Amphibian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:crocodile:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lizard:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dragon_face:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sauropod:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐢</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:turtle:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:snake:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐉</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dragon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:t-rex:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Reptile</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:whale:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dolphin:</string>
+				<string>:flipper:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fish:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐡</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blowfish:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:octopus:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:whale2:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:seal:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐠</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tropical_fish:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦈</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:shark:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:shell:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Marine</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:snail:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bug:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bee:</string>
+				<string>:honeybee:</string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐞</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lady_beetle:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🪳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cockroach:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕸️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:spider_web:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mosquito:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🪱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:worm:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:butterfly:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🐜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ant:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🪲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:beetle:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cricket:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🕷️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:spider:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:scorpion:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🪰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fly:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🦠</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:microbe:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Animal Bug</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bouquet:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>💮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:white_flower:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌹</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rose:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌺</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hibiscus:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌼</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blossom:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌸</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cherry_blossom:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🏵️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rosette:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:wilted_flower:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌻</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sunflower:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌷</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tulip:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Flower</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:seedling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:evergreen_tree:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:palm_tree:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌾</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ear_of_rice:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>☘️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:shamrock:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍁</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:maple_leaf:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍃</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:leaves:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🪴</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:potted_plant:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:deciduous_tree:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌵</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cactus:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌿</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:herb:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:four_leaf_clover:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fallen_leaf:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Plant Other</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:grapes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍉</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:watermelon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍋</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:lemon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍍</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pineapple:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍎</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:apple:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pear:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cherries:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:blueberries:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tomato:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:coconut:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍈</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:melon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍊</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mandarin:</string>
+				<string>:orange:</string>
+				<string>:tangerine:</string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍌</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:banana:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mango:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍏</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:green_apple:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:peach:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:strawberry:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:kiwi_fruit:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:olive:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Fruit</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:avocado:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:potato:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌽</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:corn:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫑</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bell_pepper:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥬</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:leafy_green:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:garlic:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍄</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:mushroom:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌰</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:chestnut:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:eggplant:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:carrot:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌶️</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hot_pepper:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥒</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cucumber:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥦</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:broccoli:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧅</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:onion:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:peanuts:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Vegetable</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍞</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bread:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:baguette_bread:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥨</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pretzel:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥞</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pancakes:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧀</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cheese:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:poultry_leg:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bacon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fries:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌭</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hotdog:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:taco:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:tamale:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧆</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:falafel:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍳</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fried_egg:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍲</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:stew:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bowl_with_spoon:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍿</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:popcorn:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧂</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:salt:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥐</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:croissant:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫓</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:flatbread:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bagel:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧇</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:waffle:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍖</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:meat_on_bone:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥩</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:cut_of_meat:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍔</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:hamburger:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:pizza:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥪</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sandwich:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🌯</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:burrito:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:stuffed_flatbread:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:egg:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:shallow_pan_of_food:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🫕</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fondue:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥗</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:green_salad:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🧈</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:butter:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥫</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:canned_food:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Prepared</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍱</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:bento:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍙</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rice_ball:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍛</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:curry:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍝</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:spaghetti:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍢</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:oden:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍤</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fried_shrimp:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥮</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:moon_cake:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥟</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dumpling:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥡</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:takeout_box:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍘</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rice_cracker:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍚</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:rice:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍜</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:ramen:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍠</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sweet_potato:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍣</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:sushi:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍥</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fish_cake:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🍡</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:dango:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+		<map>
+			<key>Character</key>
+			<string>🥠</string>
+			<key>ShortCodes</key>
+			<array>
+				<string>:fortune_cookie:</string>
+				<string></string>
+				<string></string>
+			</array>
+			<key>Categories</key>
+			<array>
+				<string>Food Asian</string>
+				<string></string>
+			</array>
+		</map>
+	</array>
+</llsd>
-- 
cgit v1.2.3


From 24bd7b2311e6fdd8bcf0a223d6dafaf4266ca4c7 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 6 Nov 2022 16:25:35 +0100
Subject: Add support for OT-SVG fonts

---
 autobuild.xml                        |  34 +++++-
 indra/cmake/ViewerMiscLibs.cmake     |   1 +
 indra/llrender/CMakeLists.txt        |   2 +
 indra/llrender/llfontfreetype.cpp    |  13 +++
 indra/llrender/llfontfreetypesvg.cpp | 205 +++++++++++++++++++++++++++++++++++
 indra/llrender/llfontfreetypesvg.h   |  54 +++++++++
 6 files changed, 307 insertions(+), 2 deletions(-)
 create mode 100644 indra/llrender/llfontfreetypesvg.cpp
 create mode 100644 indra/llrender/llfontfreetypesvg.h

diff --git a/autobuild.xml b/autobuild.xml
index babc7d73bc..6fe7620112 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -958,9 +958,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f3e63d80bd80da03aa7f87f7bd7c5f8b</string>
+              <string>2fee8d8320ab6bd180f0acf4d2b24bff</string>
               <key>url</key>
-              <string>freetype-2.10.1.0-windows64-222392239.tar.bz2</string>
+              <string>freetype-2.12.1.0-windows64-223091759.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -2423,6 +2423,36 @@
         </map>
         <key>version</key>
         <string>7.11.1.297294</string>
+      </map>
+	  <key>nanosvg</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2013-14 Mikko Mononen</string>
+        <key>description</key>
+        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
+        <key>license</key>
+        <string>Zlib</string>
+        <key>license_file</key>
+        <string>LICENSES/nanosvg.txt</string>
+        <key>name</key>
+        <string>nanosvg</string>
+        <key>platforms</key>
+        <map>
+          <key>common</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>aa73d8b6c45168b74e2cc4640ec01f95</string>
+              <key>url</key>
+              <string>nanosvg-2022.09.27-common-223101446.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>common</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>2022.09.27</string>
       </map>
       <key>nghttp2</key>
       <map>
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index f213de100c..aa204a7406 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -11,3 +11,4 @@ if (NOT USESYSTEMLIBS)
 endif(NOT USESYSTEMLIBS)
 
 use_prebuilt_binary(fonts)
+use_prebuilt_binary(nanosvg)
\ No newline at end of file
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 47e7ad915b..282a5c70ad 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -35,6 +35,7 @@ set(llrender_SOURCE_FILES
     llcubemap.cpp
     llfontbitmapcache.cpp
     llfontfreetype.cpp
+    llfontfreetypesvg.cpp
     llfontgl.cpp
     llfontregistry.cpp
     llgl.cpp
@@ -62,6 +63,7 @@ set(llrender_HEADER_FILES
     llcubemap.h
     llfontgl.h
     llfontfreetype.h
+    llfontfreetypesvg.h
     llfontbitmapcache.h
     llfontregistry.h
     llgl.h
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 25740a5f87..d3a49339da 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -34,6 +34,7 @@
 #ifdef LL_WINDOWS
 #include <freetype2\freetype\ftsystem.h>
 #endif
+#include "llfontfreetypesvg.h"
 
 // For some reason, this won't work if it's not wrapped in the ifdef
 #ifdef FT_FREETYPE_H
@@ -51,6 +52,8 @@
 #include "llfontbitmapcache.h"
 #include "llgl.h"
 
+#define ENABLE_OT_SVG_SUPPORT
+
 FT_Render_Mode gFontRenderMode = FT_RENDER_MODE_NORMAL;
 
 LLFontManager *gFontManagerp = NULL;
@@ -83,6 +86,16 @@ LLFontManager::LLFontManager()
 		LL_ERRS() << "Freetype initialization failure!" << LL_ENDL;
 		FT_Done_FreeType(gFTLibrary);
 	}
+
+#ifdef ENABLE_OT_SVG_SUPPORT
+	SVG_RendererHooks hooks = {
+		LLFontFreeTypeSvgRenderer::OnInit,
+		LLFontFreeTypeSvgRenderer::OnFree,
+		LLFontFreeTypeSvgRenderer::OnRender,
+		LLFontFreeTypeSvgRenderer::OnPresetGlypthSlot,
+	};
+	FT_Property_Set(gFTLibrary, "ot-svg", "svg-hooks", &hooks);
+#endif
 }
 
 LLFontManager::~LLFontManager()
diff --git a/indra/llrender/llfontfreetypesvg.cpp b/indra/llrender/llfontfreetypesvg.cpp
new file mode 100644
index 0000000000..19d327a4c9
--- /dev/null
+++ b/indra/llrender/llfontfreetypesvg.cpp
@@ -0,0 +1,205 @@
+/**
+ * @file llfontfreetypesvg.cpp
+ * @brief Freetype font library SVG glyph rendering
+ *
+ * $LicenseInfo:firstyear=2002&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 "llfontfreetypesvg.h"
+
+#if LL_WINDOWS
+#pragma warning (push)
+#pragma warning (disable : 4702)
+#endif
+
+#define NANOSVG_IMPLEMENTATION
+#include <nanosvg/nanosvg.h>
+#define NANOSVGRAST_IMPLEMENTATION
+#include <nanosvg/nanosvgrast.h>
+
+#if LL_WINDOWS
+#pragma warning (pop)
+#endif
+
+struct LLSvgRenderData
+{
+	FT_UInt    GlyphIndex = 0;
+	FT_Error   Error = FT_Err_Ok; // FreeType currently (@2.12.1) ignores the error value returned by the preset glyph slot callback so we return it at render time
+	// (See https://github.com/freetype/freetype/blob/5faa1df8b93ebecf0f8fd5fe8fda7b9082eddced/src/base/ftobjs.c#L1170)
+	NSVGimage* pNSvgImage = nullptr;
+	float      Scale = 0.f;
+};
+
+// static
+FT_Error LLFontFreeTypeSvgRenderer::OnInit(FT_Pointer* state)
+{
+	// The SVG driver hook state is shared across all callback invocations; since our state is lightweight
+	// we store it in the glyph instead.
+	*state = nullptr;
+
+	return FT_Err_Ok;
+}
+
+// static
+void LLFontFreeTypeSvgRenderer::OnFree(FT_Pointer* state)
+{
+}
+
+// static
+void LLFontFreeTypeSvgRenderer::OnDataFinalizer(void* objectp)
+{
+	FT_GlyphSlot glyph_slot = static_cast<FT_GlyphSlot>(objectp);
+
+	LLSvgRenderData* pData = static_cast<LLSvgRenderData*>(glyph_slot->generic.data);
+	glyph_slot->generic.data = nullptr;
+	glyph_slot->generic.finalizer = nullptr;
+	delete(pData);
+}
+
+//static
+FT_Error LLFontFreeTypeSvgRenderer::OnPresetGlypthSlot(FT_GlyphSlot glyph_slot, FT_Bool cache, FT_Pointer*)
+{
+	FT_SVG_Document document = static_cast<FT_SVG_Document>(glyph_slot->other);
+
+	llassert(!glyph_slot->generic.data || !cache || glyph_slot->glyph_index == ((LLSvgRenderData*)glyph_slot->generic.data)->GlyphIndex);
+	if (!glyph_slot->generic.data)
+	{
+		glyph_slot->generic.data = new LLSvgRenderData();
+		glyph_slot->generic.finalizer = LLFontFreeTypeSvgRenderer::OnDataFinalizer;
+	}
+	LLSvgRenderData* datap = static_cast<LLSvgRenderData*>(glyph_slot->generic.data);
+	if (!cache)
+	{
+		datap->GlyphIndex = glyph_slot->glyph_index;
+		datap->Error = FT_Err_Ok;
+	}
+
+	// NOTE: nsvgParse modifies the input string so we need a temporary copy
+	llassert(!datap->pNSvgImage || cache);
+	if (!datap->pNSvgImage)
+	{
+		char* document_buffer = new char[document->svg_document_length + 1];
+		memcpy(document_buffer, document->svg_document, document->svg_document_length);
+		document_buffer[document->svg_document_length] = '\0';
+
+		datap->pNSvgImage = nsvgParse(document_buffer, "px", 0.);
+
+		delete[] document_buffer;
+	}
+
+	if (!datap->pNSvgImage)
+	{
+		datap->Error = FT_Err_Invalid_SVG_Document;
+		return FT_Err_Invalid_SVG_Document;
+	}
+
+	// We don't (currently) support transformations so test for an identity rotation matrix + zero translation
+	if (document->transform.xx != 1 << 16 || document->transform.yx != 0 ||
+		document->transform.xy != 0 || document->transform.yy != 1 << 16 ||
+		document->delta.x > 0 || document->delta.y > 0)
+	{
+		datap->Error = FT_Err_Unimplemented_Feature;
+		return FT_Err_Unimplemented_Feature;
+	}
+
+	float svg_width = datap->pNSvgImage->width;
+	float svg_height = datap->pNSvgImage->height;
+	if (svg_width == 0.f || svg_height == 0.f)
+	{
+		svg_width = document->units_per_EM;
+		svg_height = document->units_per_EM;
+	}
+
+	float svg_x_scale = (float)document->metrics.x_ppem / floorf(svg_width);
+	float svg_y_scale = (float)document->metrics.y_ppem / floorf(svg_height);
+	float svg_scale = llmin(svg_x_scale, svg_y_scale);
+	datap->Scale = svg_scale;
+
+	glyph_slot->bitmap.width = floorf(svg_width) * svg_scale;
+	glyph_slot->bitmap.rows = floorf(svg_height) * svg_scale;
+	glyph_slot->bitmap_left = (document->metrics.x_ppem - glyph_slot->bitmap.width) / 2;
+	glyph_slot->bitmap_top = glyph_slot->face->size->metrics.ascender / 64.f;
+	glyph_slot->bitmap.pitch = glyph_slot->bitmap.width * 4;
+	glyph_slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA;
+
+	/* Copied as-is from fcft (MIT license) */
+
+	// Compute all the bearings and set them correctly. The outline is scaled already, we just need to use the bounding box.
+	float horiBearingX = 0.;
+	float horiBearingY = -glyph_slot->bitmap_top;
+
+	// XXX parentheses correct?
+	float vertBearingX = glyph_slot->metrics.horiBearingX / 64.0f - glyph_slot->metrics.horiAdvance / 64.0f / 2;
+	float vertBearingY = (glyph_slot->metrics.vertAdvance / 64.0f - glyph_slot->metrics.height / 64.0f) / 2;
+
+	// Do conversion in two steps to avoid 'bad function cast' warning
+	glyph_slot->metrics.width = glyph_slot->bitmap.width * 64;
+	glyph_slot->metrics.height = glyph_slot->bitmap.rows * 64;
+	glyph_slot->metrics.horiBearingX = horiBearingX * 64;
+	glyph_slot->metrics.horiBearingY = horiBearingY * 64;
+	glyph_slot->metrics.vertBearingX = vertBearingX * 64;
+	glyph_slot->metrics.vertBearingY = vertBearingY * 64;
+	if (glyph_slot->metrics.vertAdvance == 0)
+	{
+		glyph_slot->metrics.vertAdvance = glyph_slot->bitmap.rows * 1.2f * 64;
+	}
+
+	return FT_Err_Ok;
+}
+
+// static
+FT_Error LLFontFreeTypeSvgRenderer::OnRender(FT_GlyphSlot glyph_slot, FT_Pointer*)
+{
+	LLSvgRenderData* datap = static_cast<LLSvgRenderData*>(glyph_slot->generic.data);
+	llassert(FT_Err_Ok == datap->Error);
+	if (FT_Err_Ok != datap->Error)
+	{
+		return datap->Error;
+	}
+
+	// Render to glyph bitmap
+	NSVGrasterizer* nsvgRasterizer = nsvgCreateRasterizer();
+	nsvgRasterize(nsvgRasterizer, datap->pNSvgImage, 0, 0, datap->Scale, glyph_slot->bitmap.buffer, glyph_slot->bitmap.width, glyph_slot->bitmap.rows, glyph_slot->bitmap.pitch);
+	nsvgDeleteRasterizer(nsvgRasterizer);
+	nsvgDelete(datap->pNSvgImage);
+	datap->pNSvgImage = nullptr;
+
+	// Convert from RGBA to BGRA
+	U32* pixel_buffer = (U32*)glyph_slot->bitmap.buffer; U8* byte_buffer = glyph_slot->bitmap.buffer;
+	for (size_t y = 0, h = glyph_slot->bitmap.rows; y < h; y++)
+	{
+		for (size_t x = 0, w = glyph_slot->bitmap.pitch / 4; x < w; x++)
+		{
+			size_t pixel_idx = y * w + x;
+			size_t byte_idx = pixel_idx * 4;
+			U8 alpha = byte_buffer[byte_idx + 3];
+			// Store as ARGB (*TODO - do we still have to care about endianness?)
+			pixel_buffer[y * w + x] = alpha << 24 | (byte_buffer[byte_idx] * alpha / 0xFF) << 16 | (byte_buffer[byte_idx + 1] * alpha / 0xFF) << 8 | (byte_buffer[byte_idx + 2] * alpha / 0xFF);
+		}
+	}
+
+	glyph_slot->format = FT_GLYPH_FORMAT_BITMAP;
+	glyph_slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA;
+	return FT_Err_Ok;
+}
diff --git a/indra/llrender/llfontfreetypesvg.h b/indra/llrender/llfontfreetypesvg.h
new file mode 100644
index 0000000000..b5f541991a
--- /dev/null
+++ b/indra/llrender/llfontfreetypesvg.h
@@ -0,0 +1,54 @@
+/**
+ * @file llfontfreetypesvg.h
+ * @brief Freetype font library SVG glyph rendering
+ *
+ * $LicenseInfo:firstyear=2002&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$
+ */
+
+#pragma once
+
+#include <ft2build.h>
+#include FT_TYPES_H
+#include FT_MODULE_H
+#include FT_OTSVG_H
+
+ // See https://freetype.org/freetype2/docs/reference/ft2-svg_fonts.html
+class LLFontFreeTypeSvgRenderer
+{
+public:
+	// Called when the very first OT-SVG glyph is rendered (across the entire lifetime of our FT_Library object)
+	static FT_Error OnInit(FT_Pointer* state);
+
+	// Called when the ot-svg module is being freed (but only called if the init hook was called previously)
+	static void     OnFree(FT_Pointer* state);
+
+	// Called to preset the glyph slot, twice per glyph:
+	//   - when FT_Load_Glyph needs to preset the glyph slot (with cache == false)
+	//   - right before the svg module calls the render callback hook. (with cache == true)
+	static FT_Error OnPresetGlypthSlot(FT_GlyphSlot glyph_slot, FT_Bool cache, FT_Pointer* state);
+
+	// Called to render an OT-SVG glyph (right after the preset hook OnPresetGlypthSlot was called with cache set to TRUE)
+	static FT_Error OnRender(FT_GlyphSlot glyph_slot, FT_Pointer* state);
+
+	// Called to deallocate our per glyph slot data
+	static void OnDataFinalizer(void* objectp);
+};
-- 
cgit v1.2.3


From ec6c4f102f8b23e0c79dd2c1c0ecbad54f019566 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 6 Nov 2022 16:30:44 +0100
Subject: Switch to using the Twemoji OT-SVG font

---
 indra/newview/skins/default/xui/en/fonts.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 681f670f08..40045625fd 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -3,7 +3,7 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
-    <file functor="is_emoji">Twemoji.ttf</file>
+    <file functor="is_emoji">TwemojiSVG.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>MSGOTHIC.TTC</file>
@@ -72,7 +72,7 @@
 
   <font name="Emoji"
 	comment="Name of emoji font">
-    <file>Twemoji.ttf</file>
+    <file>TwemojiSVG.ttf</file>
   </font>
 
   <font name="Monospace"
-- 
cgit v1.2.3


From 81dd143d0d901e8e5234cff01fbda246e4621628 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Tue, 8 Nov 2022 00:16:58 +0100
Subject: [FIXED] Various minor issues   - Typing :+1: doesn't replace the
 short code with the thumbs-up emoji   - Moving the mouse over the emoji
 complete panel highlights the wrong emoji when mScrollPos > 0   - Emoji
 complete panel is missing attributes   - Crash when attempting to show the
 tooltip for an emoji text segment   - Emoji autocomplete panel can sometimes
 show empty (type ':cat', select the heart eyed one, Ctrl-Z and then type 2
 which should show the emoji for :cat2 but shows an empty square instead)

---
 indra/llui/llemojidictionary.cpp                              | 8 ++++----
 indra/llui/llemojidictionary.h                                | 4 ++--
 indra/llui/llemojihelper.cpp                                  | 3 ++-
 indra/newview/llpanelemojicomplete.cpp                        | 4 ++--
 indra/newview/skins/default/xui/en/widgets/emoji_complete.xml | 3 +++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index c31638b0bf..b70a9b2e7a 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -178,22 +178,22 @@ LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
 const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromShortCode(const std::string& short_code) const
 {
 	const auto it = mShortCode2Descr.find(short_code);
-	return (mShortCode2Descr.end() != it) ? &it->second : nullptr;
+	return (mShortCode2Descr.end() != it) ? it->second : nullptr;
 }
 
 std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch) const
 {
 	const auto it = mEmoji2Descr.find(ch);
-	return (mEmoji2Descr.end() != it) ? it->second.Name : LLStringUtil::null;
+	return (mEmoji2Descr.end() != it) ? it->second->Name : LLStringUtil::null;
 }
 
 void LLEmojiDictionary::addEmoji(LLEmojiDescriptor&& descr)
 {
 	mEmojis.push_back(descr);
-	mEmoji2Descr.insert(std::make_pair(descr.Character, mEmojis.back()));
+	mEmoji2Descr.insert(std::make_pair(descr.Character, &mEmojis.back()));
 	for (const std::string& shortCode : descr.ShortCodes)
 	{
-		mShortCode2Descr.insert(std::make_pair(shortCode, mEmojis.back()));
+		mShortCode2Descr.insert(std::make_pair(shortCode, &mEmojis.back()));
 	}
 }
 
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index 0cde663719..46a61f1cd7 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -66,8 +66,8 @@ private:
 
 private:
 	std::list<LLEmojiDescriptor> mEmojis;
-	std::map<llwchar, const LLEmojiDescriptor&> mEmoji2Descr;
-	std::map<std::string, const LLEmojiDescriptor&> mShortCode2Descr;
+	std::map<llwchar, const LLEmojiDescriptor*> mEmoji2Descr;
+	std::map<std::string, const LLEmojiDescriptor*> mShortCode2Descr;
 };
 
 // ============================================================================
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 32471e59a8..1e4c19a183 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -57,7 +57,8 @@ bool LLEmojiHelper::isActive(const LLUICtrl* ctrl_p) const
 // static
 bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S32* pShortCodePos)
 {
-	S32 shortCodePos = cursorPos;
+	// If the cursor is currently on a colon start the check one character further back
+	S32 shortCodePos = (cursorPos == 0 || L':' != wtext[cursorPos - 1]) ? cursorPos : cursorPos - 1;
 
 	auto isPartOfShortcode = [](llwchar ch) {
 		switch (ch)
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index a7058a6724..f890a14e8e 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -146,9 +146,9 @@ void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_paren
 void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 {
 	llwchar curEmoji = (mCurSelected < mEmojis.size()) ? mEmojis.at(mCurSelected) : 0;
-	size_t curEmojiIdx = (curEmoji) ? mEmojis.find(curEmoji) : std::string::npos;
 
 	mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint);
+	size_t curEmojiIdx = (curEmoji) ? mEmojis.find(curEmoji) : std::string::npos;
 	mCurSelected = (std::string::npos != curEmojiIdx) ? curEmojiIdx : 0;
 
 	if (mAutoSize)
@@ -168,7 +168,7 @@ size_t LLPanelEmojiComplete::posToIndex(S32 x, S32 y) const
 {
 	if (mRenderRect.pointInRect(x, y))
 	{
-		return llmin((size_t)x / mEmojiWidth, mEmojis.size() - 1);
+		return mScrollPos + llmin((size_t)x / mEmojiWidth, mEmojis.size() - 1);
 	}
 	return npos;
 }
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
index f35105ff7e..370f1d174e 100644
--- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <emoji_complete
+  autosize="false"
   font="EmojiHuge"
   hover_image="ListItem_Over"
+  max_emoji="7"
+  padding="8"
   selected_image="ListItem_Select"
   >
 </emoji_complete>
-- 
cgit v1.2.3


From 17a3924a28770e6910022ad8f627bb8e2b667730 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Tue, 8 Nov 2022 01:10:09 +0100
Subject: Add proper mouse down handler to the emoji complete panel   -> the
 previous commit didn't properly set mFrontChild after restoring the topmost
 floaters   -> additionally we don't want mouse clicks in "can't steal focus
 from frontmost" floaters to set focus to them

---
 indra/llui/llfloater.cpp               | 23 ++++++++++++++---------
 indra/newview/llpanelemojicomplete.cpp | 30 +++++++++++++++++++++++++++---
 indra/newview/llpanelemojicomplete.h   |  3 +++
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 04f6b11b7c..6f341bc0cd 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2486,7 +2486,7 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 
 	if (mFrontChild == child)
 	{
-		if (give_focus && !gFocusMgr.childHasKeyboardFocus(child))
+		if (give_focus && child->canFocusStealFrontmost() && !gFocusMgr.childHasKeyboardFocus(child))
 		{
 			child->setFocus(TRUE);
 		}
@@ -3042,24 +3042,29 @@ void LLFloaterView::syncFloaterTabOrder()
                 if (mFrontChild != floaterp)
                 {
                     // Grab a list of the top floaters that want to stay on top of the focused floater
-					std::list<LLView*> listTop;
+					std::list<LLFloater*> listTop;
 					if (mFrontChild && !mFrontChild->canFocusStealFrontmost())
                     {
-                        for (LLView* childfloaterp : *getChildList())
+                        for (LLView* childp : *getChildList())
                         {
-                            if (static_cast<LLFloater*>(childfloaterp)->canFocusStealFrontmost())
+							LLFloater* child_floaterp = static_cast<LLFloater*>(childp);
+                            if (child_floaterp->canFocusStealFrontmost())
                                 break;
-							listTop.push_back(childfloaterp);
+							listTop.push_back(child_floaterp);
                         }
                     }
 
                     bringToFront(floaterp, FALSE);
 
                     // Restore top floaters
-                    for (LLView* childp :listTop)
-                    {
-                        sendChildToFront(childp);
-                    }
+					if (!listTop.empty())
+					{
+						for (LLView* childp : listTop)
+						{
+							sendChildToFront(childp);
+						}
+						mFrontChild = listTop.back();
+					}
                 }
 
 				break;
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index f890a14e8e..8b89e3aa14 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -120,9 +120,6 @@ BOOL LLPanelEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent
 			case KEY_RETURN:
 				if (!mEmojis.empty())
 				{
-					LLWString wstr;
-					wstr.push_back(mEmojis.at(mCurSelected));
-					setValue(wstring_to_utf8str(wstr));
 					onCommit();
 					handled = true;
 				}
@@ -137,6 +134,33 @@ BOOL LLPanelEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent
 	return LLUICtrl::handleKey(key, mask, called_from_parent);
 }
 
+BOOL LLPanelEmojiComplete::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	mCurSelected = posToIndex(x, y);
+	mLastHover = LLVector2(x, y);
+
+	return TRUE;
+}
+
+BOOL LLPanelEmojiComplete::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+	mCurSelected = posToIndex(x, y);
+	onCommit();
+
+	return TRUE;
+}
+
+void LLPanelEmojiComplete::onCommit()
+{
+	if (npos != mCurSelected)
+	{
+		LLWString wstr;
+		wstr.push_back(mEmojis.at(mCurSelected));
+		setValue(wstring_to_utf8str(wstr));
+		LLUICtrl::onCommit();
+	}
+}
+
 void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	LLUICtrl::reshape(width, height, called_from_parent);
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 138cc465ba..2116b350be 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -56,6 +56,9 @@ public:
 	void draw() override;
 	BOOL handleHover(S32 x, S32 y, MASK mask) override;
 	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
+	BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
+	BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
+	void onCommit() override;
 	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 public:
-- 
cgit v1.2.3


From f3e7c7454f6647aa09f220baa20c9bbc7480a37b Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Tue, 8 Nov 2022 01:14:10 +0100
Subject: Enable color emojis (and the emoji helper) on the chat history and
 editor

---
 indra/newview/llchathistory.cpp                            | 2 ++
 indra/newview/skins/default/xui/en/widgets/chat_editor.xml | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index c110e0d815..f07d4658f9 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -1010,6 +1010,8 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p)
 	editor_params.enabled = false; // read only
 	editor_params.show_context_menu = "true";
 	editor_params.trusted_content = false;
+	editor_params.text_valign = LLFontGL::VAlign::VCENTER;
+	editor_params.use_color = true;
 	mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this);
 	mEditor->setIsFriendCallback(LLAvatarActions::isFriend);
 	mEditor->setIsObjectBlockedCallback(boost::bind(&LLMuteList::isMuted, LLMuteList::getInstance(), _1, _2, 0));
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
index f9facb593a..c550f634e5 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chat_editor
   name="chat_editor"
-  show_context_menu="true"/>
+  show_context_menu="true"
+  show_emoji_helper="true"
+  use_color="true"
+  />
-- 
cgit v1.2.3


From 62d62abe9c35066bb7bb29155046311245854563 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 9 Nov 2022 00:08:43 +0100
Subject: [FIXED] Using the Windows emoji picker or pasting text containing
 emojis doesn't create emoji segments (=emoji size is same size as the text
 size)   -> Partial revert of 063fe59

---
 indra/llui/lltextbase.cpp | 55 +++++++++++++++++++----------------------------
 indra/llui/lltextbase.h   |  1 -
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index b88c7ced40..28165aa1ef 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -834,6 +834,25 @@ S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::s
 		}
 	}
 
+	// Insert special segments where necessary (insertSegment takes care of splitting normal text segments around them for us)
+	{
+		LLStyleSP emoji_style;
+		for (S32 text_kitty = 0, text_len = wstr.size(); text_kitty < text_len; text_kitty++)
+		{
+			if (LLStringOps::isEmoji(wstr[text_kitty]))
+			{
+				if (!emoji_style)
+				{
+					emoji_style = new LLStyle(getStyleParams());
+					emoji_style->setFont(LLFontGL::getFontEmoji());
+				}
+
+				S32 new_seg_start = pos + text_kitty;
+				insertSegment(new LLEmojiTextSegment(emoji_style, new_seg_start, new_seg_start + 1, *this));
+			}
+		}
+	}
+
 	getViewModel()->getEditableDisplay().insert(pos, wstr);
 
 	if ( truncate() )
@@ -2303,36 +2322,6 @@ void LLTextBase::appendWidget(const LLInlineViewSegment::Params& params, const s
 	insertStringNoUndo(getLength(), widget_wide_text, &segments);
 }
 
-void LLTextBase::createTextWithEmojiSegment(const LLWString& text, S32 segment_start, LLStyleConstSP style, segment_vec_t& segments)
-{
-	LLStyleSP emoji_style;
-
-	S32 text_start = 0, text_kitty = 0, text_len = text.size();
-	for (; text_kitty < text_len; text_kitty++)
-	{
-		if (LLStringOps::isEmoji(text[text_kitty]))
-		{
-			if (text_kitty > text_start)
-			{
-				segments.push_back(new LLNormalTextSegment(style, segment_start + text_start, segment_start + text_kitty, *this));
-			}
-
-			if (!emoji_style)
-			{
-				emoji_style = new LLStyle(*style);
-				emoji_style->setFont(LLFontGL::getFontEmoji());
-			}
-			segments.push_back(new LLEmojiTextSegment(emoji_style, segment_start + text_kitty, segment_start + text_kitty + 1, *this));
-			text_start = text_kitty + 1;
-		}
-	}
-
-	if (text_start < text_len)
-	{
-		segments.push_back(new LLNormalTextSegment(style, segment_start + text_start, segment_start + text_len, *this));
-	}
-}
-
 void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only)
 {
 	// Save old state
@@ -2365,7 +2354,6 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 			S32 cur_length = getLength();
 			LLStyleConstSP sp(new LLStyle(highlight_params));
 			LLTextSegmentPtr segmentp;
-			segment_vec_t segments;
 			if (underline_on_hover_only || mSkipLinkUnderline)
 			{
 				highlight_params.font.style("NORMAL");
@@ -2374,8 +2362,9 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 			}
 			else
 			{
-				createTextWithEmojiSegment(wide_text, cur_length, sp, segments);
+				segmentp = new LLNormalTextSegment(sp, cur_length, cur_length + wide_text.size(), *this);
 			}
+			segment_vec_t segments;
 			segments.push_back(segmentp);
 			insertStringNoUndo(cur_length, wide_text, &segments);
 		}
@@ -2398,7 +2387,7 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 		}
 		else
 		{
-			createTextWithEmojiSegment(wide_text, segment_start, sp, segments);
+		segments.push_back(new LLNormalTextSegment(sp, segment_start, segment_end, *this ));
 		}
 
 		insertStringNoUndo(getLength(), wide_text, &segments);
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 31e9f16110..a047db25b2 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -641,7 +641,6 @@ protected:
 	
 	void							appendTextImpl(const std::string &new_text, const LLStyle::Params& input_params = LLStyle::Params());
 	void							appendAndHighlightTextImpl(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only = false);
-	void							createTextWithEmojiSegment(const LLWString& wide_text, S32 segment_start, LLStyleConstSP style, segment_vec_t& segments);
 	S32 normalizeUri(std::string& uri);
 	
 protected:
-- 
cgit v1.2.3


From 1727a31db0e3434adec087d6442fc5eca0ea68cf Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 9 Nov 2022 00:11:22 +0100
Subject: Show color emojis and emoji helper in notecards

---
 indra/newview/skins/default/xui/en/floater_preview_notecard.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index dcbdfa8794..ac5467c036 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -73,6 +73,8 @@
      spellcheck="true"
      tab_group="1"
      top="46"
+     use_color="true"
+     show_emoji_helper="true"
      width="392"
      word_wrap="true">
         Loading...
-- 
cgit v1.2.3


From b5033a8859b38df045cc74e074aaee864985f145 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 9 Nov 2022 00:14:51 +0100
Subject: Enable color on HUD text

---
 indra/newview/llhudrender.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp
index dff310ecf9..c1f17c9d33 100644
--- a/indra/newview/llhudrender.cpp
+++ b/indra/newview/llhudrender.cpp
@@ -138,7 +138,7 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
 	LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f));
 	F32 right_x;
 	
-	font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x);
+	font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true);
 
 	LLUI::popMatrix();
 	gGL.popMatrix();
-- 
cgit v1.2.3


From bf5a5948b2e03b71954b1e6e66b32624afc79b3c Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 9 Nov 2022 23:25:21 +0100
Subject: [FIXED] Viewer's ICU4C package must match the one used to build boost

---
 autobuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 4581d078ca..aeea64fc12 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1080,9 +1080,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8fc61ee230e63db756e14415573f604d</string>
+              <string>e60373858787f9939f2128fc24b2f84e</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106176/928492/icu4c-4.8.1-darwin64-575914.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55242/513651/icu4c-4.8.1-darwin64-539138.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1092,9 +1092,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9898b1f45bc92d4fc75b1d1a68c59514</string>
+              <string>984bef5ad98e2fdd8592c6075aee78ab</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106438/930144/icu4c-4.8.1-windows-575914.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55244/513665/icu4c-4.8.1-windows-539138.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1104,9 +1104,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8ad662698b5d99ce169517ce11cf2bef</string>
+              <string>340980c10153446b678625ec7af047c2</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106439/930151/icu4c-4.8.1-windows64-575914.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55243/513658/icu4c-4.8.1-windows64-539138.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From b6066a1b1630c432e757afb99de583ae6ff19f1d Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Wed, 9 Nov 2022 17:19:42 -0800
Subject: Add support for the 3p-nanosvg SVG library that will be used to
 rfender the emoji glyphs

---
 autobuild.xml | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/autobuild.xml b/autobuild.xml
index c9820ecedd..aca22f576f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1984,6 +1984,74 @@
         <key>version</key>
         <string>3.0.2.569217</string>
       </map>
+      <key>nanosvg</key>
+      <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-nanosvg</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2013-14 Mikko Mononen</string>
+        <key>description</key>
+        <string>NanoSVG is a simple single-header-file SVG parser and rasterizer</string>
+        <key>license</key>
+        <string>Zlib</string>
+        <key>license_file</key>
+        <string>LICENSES/LICENSE.txt</string>
+        <key>name</key>
+        <string>nanosvg</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>94b8670d171700f24af2fcfc8bf7d608</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107183/935568/nanosvg-2022.09.27-darwin64-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>c5a2ae5ecc8ade5a85b674e4426d6403</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107186/935576/nanosvg-2022.09.27-linux-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>8fa416e04ca768c1d8fa4ad3a0104b24</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107184/935580/nanosvg-2022.09.27-windows-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>08ea3f1d23cf78d1eb65597cef5913b4</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107182/935563/nanosvg-2022.09.27-windows64-576467.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>2022.09.27</string>
+      </map>
       <key>nghttp2</key>
       <map>
         <key>copyright</key>
-- 
cgit v1.2.3


From a849c51837c9fad2a6929564f4b3a3446a2f4e9a Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Wed, 9 Nov 2022 17:28:47 -0800
Subject: Pull in latest version of the fonts used in kitty catznip's emoji
 contribution

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 723b0bf6c1..dcf503c455 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2795,9 +2795,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9655e501340262e1feea9e71543d3eab</string>
+              <string>64dfdcfb6f5c98f134c128ed64fe810c</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106526/930682/viewer_fonts-1.576098-darwin64-576098.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107187/935585/viewer_fonts-1.576468-darwin64-576468.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2807,9 +2807,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>eb98887e363854810e03861f258e534d</string>
+              <string>50f83d09145601df7f0f51e503f071d7</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106533/930714/viewer_fonts-1.576098-windows-576098.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107188/935596/viewer_fonts-1.576468-windows-576468.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2819,16 +2819,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>365c0d38cde826c3c1e31bc68b5d1194</string>
+              <string>212833fe0e054874cceaec567a46a851</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106527/930690/viewer_fonts-1.576098-windows64-576098.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107189/935597/viewer_fonts-1.576468-windows64-576468.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.576098</string>
+        <string>1.576468</string>
       </map>
       <key>viewer-manager</key>
       <map>
-- 
cgit v1.2.3


From 0dd7b362a6e77d8f3dff450376ddf2d4ffaf752c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 30 Nov 2022 17:26:14 -0500
Subject: DRTVWR-575: In a new build tree, first make the parent directory

before trying to create symlink.
---
 indra/cmake/Copy3rdPartyLibs.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index c2e1bb4b85..30a33c948c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -151,6 +151,7 @@ elseif(DARWIN)
     set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
+    file(MAKE_DIRECTORY "${SHARED_LIB_STAGING_DIR}")
     # Support our "@executable_path/../Resources" load path for executables
     # that end up in any of the above SHARED_LIB_STAGING_DIR_MUMBLE
     # directories.
-- 
cgit v1.2.3


From 7a3ef9e5acd2b219b21234117dd18ae3e92b05df Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Thu, 19 Jan 2023 17:40:16 -0800
Subject: DRTVWR-489-emoji: following kitty's recipe for emoji viewer - this
 pulls in 3p library changes for steps 1-5 (boost, colladom, googlemock,
 nanosvg, viewer-fonts) - final 3p change (ICU4C) coming later

---
 autobuild.xml | 64 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 707c3d9b82..9c1124d391 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -118,9 +118,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fedc8d63856f534b6098102e059dc548</string>
+              <string>cae490999f05151e3a048b00d64237bb</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87776/805857/boost-1.72-darwin64-563847.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109513/952781/boost-1.72-darwin64-577704.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -142,9 +142,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6cc9fb4ca21365c4470a3e516544ba71</string>
+              <string>aa0f955996442b8d7097447de1f5a9fe</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87784/805850/boost-1.72-windows-563847.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109516/952793/boost-1.72-windows-577704.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -154,9 +154,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0c526efc3f8825cd25cdf635e238fab3</string>
+              <string>d3738a7ea84e2569017ae0237526da36</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87783/805851/boost-1.72-windows64-563847.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109515/952797/boost-1.72-windows64-577704.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -236,9 +236,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4699b8389dfb754da0393ddb5d325722</string>
+              <string>b923ca041271446592b3b10e678b93b6</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95882/856117/colladadom-2.3.569219-darwin64-569219.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109517/952832/colladadom-2.3.577706-darwin64-577706.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -260,9 +260,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>343e46ea49a08ad6596d3dc702d5b812</string>
+              <string>2b3c9c1fe86c2b5bad6619c021bb11a8</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95883/856128/colladadom-2.3.569219-windows-569219.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109518/952846/colladadom-2.3.577706-windows-577706.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -272,16 +272,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>de5bdfb61b31db56c5fe7d0962ad11e2</string>
+              <string>8ece469892029506759420ac531bd675</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/95884/856129/colladadom-2.3.569219-windows64-569219.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109519/952847/colladadom-2.3.577706-windows64-577706.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.3.569219</string>
+        <string>2.3.577706</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
@@ -884,9 +884,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7d267050970ec6e28749178597bc8af0</string>
+              <string>47303c9bb9a06c6f488f9d7b2b2282c4</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87793/805930/googlemock-1.7.0.563853-windows-563853.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109524/952870/googlemock-1.7.0.577708-windows-577708.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -896,16 +896,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>27638c692f0ec6121e54bf75f2d45e49</string>
+              <string>c166bbd8787a68c1a4ba75179c58dda6</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87792/805936/googlemock-1.7.0.563853-windows64-563853.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109525/952878/googlemock-1.7.0.577708-windows64-577708.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.7.0.563853</string>
+        <string>1.7.0.577708</string>
       </map>
       <key>gstreamer</key>
       <map>
@@ -1995,7 +1995,7 @@
         <key>license</key>
         <string>Zlib</string>
         <key>license_file</key>
-        <string>LICENSES/LICENSE.txt</string>
+        <string>LICENSES/nanosvg.txt</string>
         <key>name</key>
         <string>nanosvg</string>
         <key>platforms</key>
@@ -2005,9 +2005,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>94b8670d171700f24af2fcfc8bf7d608</string>
+              <string>bee6bf71cec184ab26c89c486fc5f427</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107183/935568/nanosvg-2022.09.27-darwin64-576467.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109526/952883/nanosvg-2022.09.27-darwin64-577709.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2029,9 +2029,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8fa416e04ca768c1d8fa4ad3a0104b24</string>
+              <string>b7d1baa8003f64bed4efc2c163ee7e26</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107184/935580/nanosvg-2022.09.27-windows-576467.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109529/952902/nanosvg-2022.09.27-windows-577709.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2041,9 +2041,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>08ea3f1d23cf78d1eb65597cef5913b4</string>
+              <string>b8b51ad6b65be5bbc1470ee939c6bfae</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107182/935563/nanosvg-2022.09.27-windows64-576467.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109528/952895/nanosvg-2022.09.27-windows64-577709.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -2795,9 +2795,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>64dfdcfb6f5c98f134c128ed64fe810c</string>
+              <string>7846ea2be3ee6f991f181ec451b02ef5</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107187/935585/viewer_fonts-1.576468-darwin64-576468.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109530/952907/viewer_fonts-1.577710-darwin64-577710.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2807,9 +2807,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>50f83d09145601df7f0f51e503f071d7</string>
+              <string>6c41e98423d0fdc29b80f5c2d9ccd8bf</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107188/935596/viewer_fonts-1.576468-windows-576468.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109532/952921/viewer_fonts-1.577710-windows-577710.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2819,16 +2819,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>212833fe0e054874cceaec567a46a851</string>
+              <string>48e4986d8c61e80d672439507602cbba</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107189/935597/viewer_fonts-1.576468-windows64-576468.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109531/952914/viewer_fonts-1.577710-windows64-577710.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.576468</string>
+        <string>1.577710</string>
       </map>
       <key>viewer-manager</key>
       <map>
-- 
cgit v1.2.3


From 80bc32c3efe77b49adcd4cc00320ce5523f90fb9 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Fri, 20 Jan 2023 15:17:45 -0800
Subject: Pull in (a) version of ICU4C - this one was built with VS 2019 and
 not VS 2017 like everything else.  The work to do this is large and we are
 switching soon to VS 2022 so this will do for now

---
 autobuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 9c1124d391..b8351e5c3a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1050,9 +1050,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8fc61ee230e63db756e14415573f604d</string>
+              <string>544273564b480d24ead8e3ab35b64f47</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106176/928492/icu4c-4.8.1-darwin64-575914.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109563/953191/icu4c-4.8.1-darwin64-577732.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1062,9 +1062,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9898b1f45bc92d4fc75b1d1a68c59514</string>
+              <string>740b11e15eb3d908b18c547c43cd507e</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106438/930144/icu4c-4.8.1-windows-575914.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109565/953208/icu4c-4.8.1-windows-577732.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1074,9 +1074,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8ad662698b5d99ce169517ce11cf2bef</string>
+              <string>8d6668733a098a74e89d3c69fa11cada</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106439/930151/icu4c-4.8.1-windows64-575914.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109564/953209/icu4c-4.8.1-windows64-577732.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From 44a5519fb0fa433dd926ae7fe1deea83b02a6390 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Fri, 20 Jan 2023 17:18:13 -0800
Subject: DRTVWR-489-emoji: Pull in an updated version of 3p-icu4c that
 correctly copies over the Windows DLLs as part of the build process

---
 autobuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index b8351e5c3a..bda67de60a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1050,9 +1050,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>544273564b480d24ead8e3ab35b64f47</string>
+              <string>635f18fa4de7f38308d10da0cb645a4d</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109563/953191/icu4c-4.8.1-darwin64-577732.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109596/953629/icu4c-4.8.1-darwin64-577750.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1062,9 +1062,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>740b11e15eb3d908b18c547c43cd507e</string>
+              <string>2a2cc981da2565d0e797c7af19891a9b</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109565/953208/icu4c-4.8.1-windows-577732.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109597/953636/icu4c-4.8.1-windows-577750.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1074,9 +1074,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8d6668733a098a74e89d3c69fa11cada</string>
+              <string>d30663c985b40a638a9a58ba21745fe2</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109564/953209/icu4c-4.8.1-windows64-577732.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109598/953645/icu4c-4.8.1-windows64-577750.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From 64e84924d43b64fd799e619cc3c5c9aac2d23ce1 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Mon, 23 Jan 2023 12:36:37 -0800
Subject: DRTVWR-489-emoji: Pull in updated viewer-fonts package that includes
 'missing' Tweenmoji SVG font

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index bda67de60a..1b3365cc81 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2795,9 +2795,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7846ea2be3ee6f991f181ec451b02ef5</string>
+              <string>d47e0ed35dad11f0a5dc821758e2ae46</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109530/952907/viewer_fonts-1.577710-darwin64-577710.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109658/953998/viewer_fonts-1.577782-darwin64-577782.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2807,9 +2807,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6c41e98423d0fdc29b80f5c2d9ccd8bf</string>
+              <string>7dc39bb7cd8133d251eaff9c9e16bdfd</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109532/952921/viewer_fonts-1.577710-windows-577710.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109660/954010/viewer_fonts-1.577782-windows-577782.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2819,16 +2819,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>48e4986d8c61e80d672439507602cbba</string>
+              <string>86134368c16c7d685156403e15a7cbcd</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109531/952914/viewer_fonts-1.577710-windows64-577710.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109659/954009/viewer_fonts-1.577782-windows64-577782.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.577710</string>
+        <string>1.577782</string>
       </map>
       <key>viewer-manager</key>
       <map>
-- 
cgit v1.2.3


From f9fbd0333abb474ed265e1be67b2c5b1a4174444 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Mon, 23 Jan 2023 15:10:17 -0800
Subject: DRTVWR-489-emoji: Update the machinery that copies over the ICU4C
 DLLs into the right place in Windows builds

---
 indra/cmake/Copy3rdPartyLibs.cmake |  9 +++++++++
 indra/newview/viewer_manifest.py   | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index ff705101de..439bec865c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -61,6 +61,15 @@ if(WINDOWS)
         uriparser.dll
         )
 
+    # ICU4C (same filenames for 32 and 64 bit builds)
+    set(release_files ${release_files} icudt48.dll)
+    set(release_files ${release_files} icuin48.dll)
+    set(release_files ${release_files} icuio48.dll)
+    set(release_files ${release_files} icule48.dll)
+    set(release_files ${release_files} iculx48.dll)
+    set(release_files ${release_files} icutu48.dll)
+    set(release_files ${release_files} icuuc48.dll)
+
     # OpenSSL
     if(ADDRESS_SIZE EQUAL 64)
         set(release_files ${release_files} libcrypto-1_1-x64.dll)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8cc1cc5bb4..26983bbba8 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -517,6 +517,16 @@ class WindowsManifest(ViewerManifest):
                 self.path("OpenAL32.dll")
                 self.path("alut.dll")
 
+            # For ICU4C
+            self.path("")
+            self.path("icudt48.dll")
+            self.path("icuin48.dll")
+            self.path("icuio48.dll")
+            self.path("icule48.dll")
+            self.path("iculx48.dll")
+            self.path("icutu48.dll")
+            self.path("icuuc48.dll")
+
             # For textures
             self.path("openjpeg.dll")
 
-- 
cgit v1.2.3


From 68b59629c421cfce760d9a57ec053b95e6987d40 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Mon, 23 Jan 2023 17:21:52 -0800
Subject: DRTVWR-489-emoji: Pull in the updated ICU4C package that puts the
 libs and dlls in the right place for the Windows builds

---
 autobuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 1b3365cc81..6d874b3bdc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1050,9 +1050,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>635f18fa4de7f38308d10da0cb645a4d</string>
+              <string>dc09e870c8419979d748855c2d956711</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109596/953629/icu4c-4.8.1-darwin64-577750.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109675/954163/icu4c-4.8.1-darwin64-577789.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1062,9 +1062,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2a2cc981da2565d0e797c7af19891a9b</string>
+              <string>08749d1f7f0a96b1951eecdae5dc11ba</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109597/953636/icu4c-4.8.1-windows-577750.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109679/954178/icu4c-4.8.1-windows-577789.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1074,9 +1074,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d30663c985b40a638a9a58ba21745fe2</string>
+              <string>98bca5c137e6d47c5b57827e156b1857</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109598/953645/icu4c-4.8.1-windows64-577750.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109678/954182/icu4c-4.8.1-windows64-577789.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From a3e80762f1724388fc6e892a337895966cf942e8 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Tue, 24 Jan 2023 11:07:56 -0800
Subject: DRTVWR-489-emoji: Fix a warning when packaging Viewer installer.
 TeamCity builds fail because of 'compiler error' in NSIS - wondering if this
 warning triggers the error (it doesn't locally) - yes, grasphing at straws

---
 indra/newview/installers/windows/lang_zh.nsi | Bin 10144 -> 10154 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index 7922d9df52..0985663041 100755
Binary files a/indra/newview/installers/windows/lang_zh.nsi and b/indra/newview/installers/windows/lang_zh.nsi differ
-- 
cgit v1.2.3


From 054f57151541654ab8b68fc935e184377747ab75 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Tue, 24 Jan 2023 13:14:25 -0800
Subject: DRTVWR-489-emoji: Trying to get to the bottom of a TeamCity build
 failure with access to TeramCity - one theory is that the extra size of these
 DLLs consumes too much disk space and results in the NSIS internal compiler
 error we observe - removing these tempoorarily to see what difference that
 makes

---
 indra/newview/viewer_manifest.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 26983bbba8..76cd4ce049 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -518,14 +518,13 @@ class WindowsManifest(ViewerManifest):
                 self.path("alut.dll")
 
             # For ICU4C
-            self.path("")
-            self.path("icudt48.dll")
-            self.path("icuin48.dll")
-            self.path("icuio48.dll")
-            self.path("icule48.dll")
-            self.path("iculx48.dll")
-            self.path("icutu48.dll")
-            self.path("icuuc48.dll")
+            # self.path("icudt48.dll")
+            # self.path("icuin48.dll")
+            # self.path("icuio48.dll")
+            # self.path("icule48.dll")
+            # self.path("iculx48.dll")
+            # self.path("icutu48.dll")
+            # self.path("icuuc48.dll")
 
             # For textures
             self.path("openjpeg.dll")
-- 
cgit v1.2.3


From 5dcdf8330409779591d35c05888efd02e412cf50 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Tue, 24 Jan 2023 16:00:53 -0800
Subject: DRTVWR-489-emoji: Trying to get to the bottom of a TeamCity build
 failure with access to TeramCity - with all the ICU4C DLLs removed, the
 viewer builds fine which does suggest a size/disk space issue.  Trying with
 the (porposed) minimum set to see if this helps. Likely it won't because the
 main one (icudt48.dll) is much, much bigger than the others combined - but we
 shall see

---
 indra/newview/viewer_manifest.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 76cd4ce049..60f8cfc26b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -518,13 +518,8 @@ class WindowsManifest(ViewerManifest):
                 self.path("alut.dll")
 
             # For ICU4C
-            # self.path("icudt48.dll")
-            # self.path("icuin48.dll")
-            # self.path("icuio48.dll")
-            # self.path("icule48.dll")
-            # self.path("iculx48.dll")
-            # self.path("icutu48.dll")
-            # self.path("icuuc48.dll")
+            self.path("icudt48.dll")
+            self.path("icuuc48.dll")
 
             # For textures
             self.path("openjpeg.dll")
-- 
cgit v1.2.3


From 66f59478d09122ddf43c4ba3445754d1698bf016 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Wed, 25 Jan 2023 10:57:29 -0800
Subject: DRTVWR-489-emoji: declaring this variable as a U16 leads to a warning
 (and therefore an error) but only on 32bit Windows builds - 64bit is fine.  I
 don't know why that's the case (should be both surely) but in any case, I
 think the variable should be declared as a size_t

---
 indra/newview/llpanelemojicomplete.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 2116b350be..aa0f806525 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -85,7 +85,7 @@ protected:
 	LLUIImagePtr	mSelectedImage;
 
 	LLWString       mEmojis;
-	U16             mVisibleEmojis = 0;
+	size_t          mVisibleEmojis = 0;
 	size_t          mFirstVisible = 0;
 	size_t          mScrollPos = 0;
 	size_t          mCurSelected = 0;
-- 
cgit v1.2.3


From da0335c864477036ba996fbab4db2194535466d7 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 25 Jan 2023 20:31:04 +0100
Subject: Fix Mac build   - Link against ICU4C   - Font files were only copied
 on Windows builds   - Replace missing variable

---
 indra/cmake/ICU4C.cmake           |  4 ++--
 indra/llrender/llfontregistry.cpp |  2 +-
 indra/newview/CMakeLists.txt      | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index 007a9b6937..b51087e0e7 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -10,8 +10,8 @@ else (USESYSTEMLIBS)
   use_prebuilt_binary(icu4c)
   if (WINDOWS)
     set(ICU4C_LIBRARY icuuc)
-  #elseif(DARWIN)
-  #  set(ICU4C_LIBRARY ...)
+  elseif(DARWIN)
+    set(ICU4C_LIBRARY icuuc)
   #elseif(LINUX)
   #  set(ICU4C_LIBRARY ...)
   else()
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 44f2bd4cc5..c9a9ee3a03 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -483,7 +483,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 #if LL_DARWIN
 	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY);
 	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY + MACOSX_FONT_SUPPLEMENTAL);
-	font_search_paths.push_back(sys_path + MACOSX_FONT_SUPPLEMENTAL);
+	font_search_paths.push_back(LLFontGL::getFontPathSystem() + MACOSX_FONT_SUPPLEMENTAL);
 #endif
 
 	// The fontname string may contain multiple font file names separated by semicolons.
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 36f4680c44..bca8e98c87 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1506,12 +1506,6 @@ if (WINDOWS)
         set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
     endif(USE_PRECOMPILED_HEADERS)
 
-    message("Copying fonts")
-    file(GLOB FONT_FILE_GLOB_LIST
-      "${AUTOBUILD_INSTALL_DIR}/fonts/*"
-    )
-    file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
-
     # Replace the icons with the appropriate ones for the channel
     # ('test' is the default)
     set(ICON_PATH "test")
@@ -2087,6 +2081,12 @@ endif (USE_BUGSPLAT)
 set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
     "Path to artwork files.")
 
+message("Copying fonts")
+file(GLOB FONT_FILE_GLOB_LIST
+  "${AUTOBUILD_INSTALL_DIR}/fonts/*"
+)
+file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
+
 if (LINUX)
   set(product SecondLife-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
 
-- 
cgit v1.2.3


From 3185bdea27b19e155c2ccc03c80624e113d312a6 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 14:45:45 -0800
Subject: DRTVWR-489-emoji: As part of the work to get macOS version of the
 Viewer working, the flag was introduced to warn (and therefore error out)
 when a virtual override was not marked with the 'override' keyword. Fixing
 this up involved a large number of changes and this commit represents just
 those changes - nothing specially from the DRTVWR-489 viewer

---
 indra/llappearance/llwearabletype.h          |   2 +-
 indra/llcommon/llcoros.h                     |   2 +-
 indra/llcommon/llsingleton.h                 |   2 +-
 indra/llinventory/llfoldertype.cpp           |   2 +-
 indra/llinventory/llinventorysettings.cpp    |   2 +-
 indra/llmessage/llexperiencecache.h          |   2 +-
 indra/llmessage/llproxy.h                    |   2 +-
 indra/llui/llnotifications.h                 |   6 +-
 indra/llui/llspellcheck.h                    |   2 +-
 indra/llui/lltextbase.cpp                    |  21 ----
 indra/llui/lltextbase.h                      |   2 +-
 indra/llui/lluictrl.h                        |   2 +-
 indra/llui/llview.cpp                        |   4 +-
 indra/llui/llviewquery.h                     |  12 +--
 indra/newview/llautoreplace.h                |   2 +-
 indra/newview/llchannelmanager.h             |   2 +-
 indra/newview/llchicletbar.h                 |   4 +-
 indra/newview/llconversationlog.h            |  10 +-
 indra/newview/llfeaturemanager.h             |   2 +-
 indra/newview/llfriendcard.h                 |   2 +-
 indra/newview/llgesturemgr.h                 |   4 +-
 indra/newview/llimagefiltersmanager.h        |   2 +-
 indra/newview/llimview.h                     |   2 +-
 indra/newview/llmutelist.h                   |   2 +-
 indra/newview/llnavigationbar.h              |   8 +-
 indra/newview/lloutfitobserver.h             |   2 +-
 indra/newview/llpaneltopinfobar.h            |   6 +-
 indra/newview/llpathfindingpathtool.h        |  18 ++--
 indra/newview/llproductinforequest.h         |   2 +-
 indra/newview/llrecentpeople.h               |   2 +-
 indra/newview/llspeakers.h                   |   4 +-
 indra/newview/llspeakingindicatormanager.cpp |   2 +-
 indra/newview/lltoolbrush.h                  |  20 ++--
 indra/newview/lltoolcomp.h                   |  72 ++++++-------
 indra/newview/lltooldraganddrop.h            |  12 +--
 indra/newview/lltoolface.h                   |  10 +-
 indra/newview/lltoolfocus.h                  |  14 +--
 indra/newview/lltoolindividual.h             |   8 +-
 indra/newview/lltoolobjpicker.h              |  14 +--
 indra/newview/lltoolpie.h                    |  32 +++---
 indra/newview/lltoolpipette.h                |   8 +-
 indra/newview/lltoolselectland.h             |  16 +--
 indra/newview/llversioninfo.h                |   2 +-
 indra/newview/llviewerhelp.h                 |  10 +-
 indra/newview/llviewermedia.h                |   2 +-
 indra/newview/llviewermediafocus.h           |  16 +--
 indra/newview/llviewerparcelaskplay.h        |   4 +-
 indra/newview/llviewerparcelmedia.h          |   2 +-
 indra/newview/llviewerparcelmediaautoplay.h  |   2 +-
 indra/newview/llviewertexturelist.h          |   6 +-
 indra/newview/llvoicechannel.h               |  22 ++--
 indra/newview/llvoicevivox.h                 | 146 +++++++++++++--------------
 indra/newview/llwearableitemslist.h          |   6 +-
 indra/newview/llwindebug.h                   |   4 +-
 54 files changed, 272 insertions(+), 295 deletions(-)

diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
index 793a33cc87..1fbe19ddd1 100644
--- a/indra/llappearance/llwearabletype.h
+++ b/indra/llappearance/llwearabletype.h
@@ -37,7 +37,7 @@ class LLWearableType : public LLParamSingleton<LLWearableType>
 {
 	LLSINGLETON(LLWearableType, LLTranslationBridge::ptr_t &trans);
 	~LLWearableType();
-	void initSingleton();
+	void initSingleton() override;
 public: 
 	enum EType
 	{
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h
index dbff921f16..a6da94005b 100644
--- a/indra/llcommon/llcoros.h
+++ b/indra/llcommon/llcoros.h
@@ -92,7 +92,7 @@ class LL_COMMON_API LLCoros: public LLSingleton<LLCoros>
     LLSINGLETON(LLCoros);
     ~LLCoros();
 
-    void cleanupSingleton();
+    void cleanupSingleton() override;
 public:
     /// The viewer's use of the term "coroutine" became deeply embedded before
     /// the industry term "fiber" emerged to distinguish userland threads from
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 51ef514cf7..cbe5ab6406 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -802,7 +802,7 @@ public:
 private:                                                                \
     /* implement LLSingleton pure virtual method whose sole purpose */  \
     /* is to remind people to use this macro */                         \
-    virtual void you_must_use_LLSINGLETON_macro() {}                    \
+    virtual void you_must_use_LLSINGLETON_macro() override {}                    \
     friend class LLSingleton<DERIVED_CLASS>;                            \
     DERIVED_CLASS(__VA_ARGS__)
 
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index 675da65af2..818a8b5cc3 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -60,7 +60,7 @@ class LLFolderDictionary : public LLSingleton<LLFolderDictionary>,
 {
 	LLSINGLETON(LLFolderDictionary);
 protected:
-	virtual LLFolderType::EType notFound() const
+	virtual LLFolderType::EType notFound() const override
 	{
 		return LLFolderType::FT_NONE;
 	}
diff --git a/indra/llinventory/llinventorysettings.cpp b/indra/llinventory/llinventorysettings.cpp
index 81485b3a97..bc604097da 100644
--- a/indra/llinventory/llinventorysettings.cpp
+++ b/indra/llinventory/llinventorysettings.cpp
@@ -62,7 +62,7 @@ class LLSettingsDictionary : public LLSingleton<LLSettingsDictionary>,
 {
     LLSINGLETON(LLSettingsDictionary);
 
-    void initSingleton();
+    void initSingleton() override;
 };
 
 LLSettingsDictionary::LLSettingsDictionary() 
diff --git a/indra/llmessage/llexperiencecache.h b/indra/llmessage/llexperiencecache.h
index 1c97133723..8be4c64dfc 100644
--- a/indra/llmessage/llexperiencecache.h
+++ b/indra/llmessage/llexperiencecache.h
@@ -106,7 +106,7 @@ public:
 private:
     virtual ~LLExperienceCache();
 
-    virtual void initSingleton();
+    virtual void initSingleton() override;
 
     typedef boost::function<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &, LLCore::HttpRequest::ptr_t, std::string)> permissionInvoker_fn;
 
diff --git a/indra/llmessage/llproxy.h b/indra/llmessage/llproxy.h
index 25f6977e14..8a64cdbfaa 100644
--- a/indra/llmessage/llproxy.h
+++ b/indra/llmessage/llproxy.h
@@ -226,7 +226,7 @@ class LLProxy: public LLSingleton<LLProxy>
 	LLSINGLETON(LLProxy);
 	LOG_CLASS(LLProxy);
 
-    /*virtual*/ void initSingleton();
+    /*virtual*/ void initSingleton() override;
 
 public:
 	// Static check for enabled status for UDP packets. Call from main thread only.
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 921398a693..4d9a33f1d7 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -913,7 +913,7 @@ public:
 	/* virtual */ LLNotificationPtr add(const std::string& name, 
 						const LLSD& substitutions, 
 						const LLSD& payload, 
-						LLNotificationFunctorRegistry::ResponseFunctor functor);
+						LLNotificationFunctorRegistry::ResponseFunctor functor) override;
 	LLNotificationPtr add(const LLNotification::Params& p);
 
 	void add(const LLNotificationPtr pNotif);
@@ -964,8 +964,8 @@ public:
 	bool isVisibleByRules(LLNotificationPtr pNotification);
 	
 private:
-	/*virtual*/ void initSingleton();
-	/*virtual*/ void cleanupSingleton();
+	/*virtual*/ void initSingleton() override;
+	/*virtual*/ void cleanupSingleton() override;
 	
 	void loadPersistentNotifications();
 
diff --git a/indra/llui/llspellcheck.h b/indra/llui/llspellcheck.h
index 3da5e30955..14f9b44fe4 100644
--- a/indra/llui/llspellcheck.h
+++ b/indra/llui/llspellcheck.h
@@ -47,7 +47,7 @@ public:
 protected:
 	void addToDictFile(const std::string& dict_path, const std::string& word);
 	void initHunspell(const std::string& dict_language);
-	void initSingleton();
+	void initSingleton() override;
 
 public:
 	typedef std::list<std::string> dict_list_t;
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index b2c0577604..dff4bf9617 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1997,19 +1997,8 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getEditableSegIterContaini
 
 LLTextBase::segment_set_t::iterator LLTextBase::getSegIterContaining(S32 index)
 {
-
 	static LLPointer<LLIndexSegment> index_segment = new LLIndexSegment();
 
-	S32 text_len = 0;
-	if (!useLabel())
-	{
-		text_len = getLength();
-	}
-	else
-	{
-		text_len = mLabel.getWString().length();
-	}
-
 	// when there are no segments, we return the end iterator, which must be checked by caller
 	if (mSegments.size() <= 1) { return mSegments.begin(); }
 
@@ -2023,16 +2012,6 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 i
 {
 	static LLPointer<LLIndexSegment> index_segment = new LLIndexSegment();
 
-	S32 text_len = 0;
-	if (!useLabel())
-	{
-		text_len = getLength();
-	}
-	else
-	{
-		text_len = mLabel.getWString().length();
-	}
-
 	// when there are no segments, we return the end iterator, which must be checked by caller
 	if (mSegments.size() <= 1) { return mSegments.begin(); }
 
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 7e1f727607..9b3691e404 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -187,7 +187,7 @@ public:
 	LLEmojiTextSegment(const LLColor4& color, S32 start, S32 end, LLTextBase& editor, BOOL is_visible = TRUE);
 
 	bool canEdit() const override { return false; }
-	BOOL handleToolTip(S32 x, S32 y, MASK mask);
+	BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
 };
 
 // Text segment that changes it's style depending of mouse pointer position ( is it inside or outside segment)
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 67dd24341c..d71dc8d859 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -263,7 +263,7 @@ public:
 	class LLTextInputFilter : public LLQueryFilter, public LLSingleton<LLTextInputFilter>
 	{
 		LLSINGLETON_EMPTY_CTOR(LLTextInputFilter);
-		/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
+		/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override
 		{
 			return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->acceptsTextInput(), TRUE);
 		}
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 74abe54690..2b7f05dcda 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1953,7 +1953,7 @@ private:
 class SortByTabOrder : public LLQuerySorter, public LLSingleton<SortByTabOrder>
 {
 	LLSINGLETON_EMPTY_CTOR(SortByTabOrder);
-	/*virtual*/ void sort(LLView * parent, LLView::child_list_t &children) const 
+	/*virtual*/ void sort(LLView * parent, LLView::child_list_t &children) const override
 	{
 		children.sort(CompareByTabOrder(parent->getTabOrder(), parent->getDefaultTabGroup()));
 	}
@@ -1977,7 +1977,7 @@ const LLViewQuery & LLView::getTabOrderQuery()
 class LLFocusRootsFilter : public LLQueryFilter, public LLSingleton<LLFocusRootsFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLFocusRootsFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override
 	{
 		return filterResult_t(view->isCtrl() && view->isFocusRoot(), !view->isFocusRoot());
 	}
diff --git a/indra/llui/llviewquery.h b/indra/llui/llviewquery.h
index 21bb1be26f..4bc9c4a08e 100644
--- a/indra/llui/llviewquery.h
+++ b/indra/llui/llviewquery.h
@@ -55,37 +55,37 @@ public:
 class LLLeavesFilter : public LLQueryFilter, public LLSingleton<LLLeavesFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLLeavesFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLRootsFilter : public LLQueryFilter, public LLSingleton<LLRootsFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLRootsFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLVisibleFilter : public LLQueryFilter, public LLSingleton<LLVisibleFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLVisibleFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLEnabledFilter : public LLQueryFilter, public LLSingleton<LLEnabledFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLEnabledFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLTabStopFilter : public LLQueryFilter, public LLSingleton<LLTabStopFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLTabStopFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLCtrlFilter : public LLQueryFilter, public LLSingleton<LLCtrlFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLCtrlFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 template <class T>
diff --git a/indra/newview/llautoreplace.h b/indra/newview/llautoreplace.h
index 23cc313646..a1eebf9dcb 100644
--- a/indra/newview/llautoreplace.h
+++ b/indra/newview/llautoreplace.h
@@ -203,7 +203,7 @@ public:
     void setSettings(const LLAutoReplaceSettings& settings);
 
 private:
-    /*virtual*/ void initSingleton();
+    /*virtual*/ void initSingleton() override;
 
     LLAutoReplaceSettings mSettings; ///< configuration information
 	
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index 8abe350196..22ae595d66 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -46,7 +46,7 @@ class LLChannelManager : public LLSingleton<LLChannelManager>
 	LLSINGLETON(LLChannelManager);
 	virtual ~LLChannelManager();
 
-	void cleanupSingleton();
+	void cleanupSingleton() override;
 public:
 
 
diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h
index 6c521dc1d5..c295b99962 100644
--- a/indra/newview/llchicletbar.h
+++ b/indra/newview/llchicletbar.h
@@ -43,11 +43,11 @@ class LLChicletBar
 
 public:
 
-	BOOL postBuild();
+	BOOL postBuild() override;
 
 	LLChicletPanel*	getChicletPanel() { return mChicletPanel; }
 
-	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
+	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 
 	/**
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h
index 820a5db491..54aeedcf9a 100644
--- a/indra/newview/llconversationlog.h
+++ b/indra/newview/llconversationlog.h
@@ -125,11 +125,11 @@ public:
 	void removeObserver(LLConversationLogObserver* observer);
 
 	// LLIMSessionObserver triggers
-	virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg);
-    virtual void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) {}; // Stub
-	virtual void sessionRemoved(const LLUUID& session_id){}											// Stub
-	virtual void sessionVoiceOrIMStarted(const LLUUID& session_id){};								// Stub
-	virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id){};	// Stub
+	virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) override;
+    virtual void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) override {}; // Stub
+	virtual void sessionRemoved(const LLUUID& session_id) override{}											// Stub
+	virtual void sessionVoiceOrIMStarted(const LLUUID& session_id) override{};								// Stub
+	virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) override{};	// Stub
 
 	void notifyObservers();
 
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index 42a226cd18..d9269224af 100644
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -101,7 +101,7 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag
 	~LLFeatureManager() {cleanupFeatureTables();}
 
 	// initialize this by loading feature table and gpu table
-	void initSingleton();
+	void initSingleton() override;
 
 public:
 
diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
index f5679d7d85..ef0dda7949 100644
--- a/indra/newview/llfriendcard.h
+++ b/indra/newview/llfriendcard.h
@@ -55,7 +55,7 @@ public:
     };
 
 	// LLFriendObserver implementation
-	void changed(U32 mask)
+	void changed(U32 mask) override
 	{
 		onFriendListUpdate(mask);
 	}
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index 7c8e8279c2..7bb60f00e2 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -135,7 +135,7 @@ public:
 	void notifyObservers();
 
 	// Overriding so we can update active gesture names and notify observers 
-	void changed(U32 mask); 
+	void changed(U32 mask) override;
 
 	BOOL matchPrefix(const std::string& in_str, std::string* out_str);
 
@@ -150,7 +150,7 @@ protected:
 	void runStep(LLMultiGesture* gesture, LLGestureStep* step);
 
 	// LLInventoryCompletionObserver trigger
-	void done();
+	void done() override;
 
 	// Used by loadGesture
 	static void onLoadComplete(const LLUUID& asset_uuid,
diff --git a/indra/newview/llimagefiltersmanager.h b/indra/newview/llimagefiltersmanager.h
index d06212d85a..05d1806da4 100644
--- a/indra/newview/llimagefiltersmanager.h
+++ b/indra/newview/llimagefiltersmanager.h
@@ -45,7 +45,7 @@ private:
 	void loadAllFilters();
 	void loadFiltersFromDir(const std::string& dir);
     
-	/*virtual*/ void initSingleton();
+	/*virtual*/ void initSingleton() override;
     
 	// List of filters : first is the user friendly localized name, second is the xml file name
     std::map<std::string,std::string> mFiltersList;
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 326e8f22e3..353373f3b4 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -506,7 +506,7 @@ public:
 	static void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent);
 
 private:
-	void initSingleton();
+	void initSingleton() override;
 	void onVoiceChannelChangedInt(const LLUUID &session_id);
 	void onVoiceChannelStateChangedInt(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent);
 
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index 0d426fbd48..f86c2acd10 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -73,7 +73,7 @@ class LLMuteList : public LLSingleton<LLMuteList>
 {
 	LLSINGLETON(LLMuteList);
 	~LLMuteList();
-	/*virtual*/ void cleanupSingleton();
+	/*virtual*/ void cleanupSingleton() override;
 public:
 	// reasons for auto-unmuting a resident
 	enum EAutoReason 
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index 11c671294a..4649f5bcb0 100755
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -92,10 +92,10 @@ class LLNavigationBar
 
 public:
 	
-	/*virtual*/ void	draw();
-	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL	postBuild();
-	/*virtual*/ void	setVisible(BOOL visible);
+	/*virtual*/ void	draw() override;
+	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL	postBuild() override;
+	/*virtual*/ void	setVisible(BOOL visible) override;
 
 	void handleLoginComplete();
 	void clearHistoryCache();
diff --git a/indra/newview/lloutfitobserver.h b/indra/newview/lloutfitobserver.h
index 77041db68d..77bb3543aa 100644
--- a/indra/newview/lloutfitobserver.h
+++ b/indra/newview/lloutfitobserver.h
@@ -41,7 +41,7 @@ class LLOutfitObserver: public LLInventoryObserver, public LLSingleton<LLOutfitO
 
 public:
 
-	virtual void changed(U32 mask);
+	virtual void changed(U32 mask) override;
 
 	void notifyOutfitLockChanged() { mOutfitLockChanged();  }
 
diff --git a/indra/newview/llpaneltopinfobar.h b/indra/newview/llpaneltopinfobar.h
index 78dd997029..b6c263e331 100644
--- a/indra/newview/llpaneltopinfobar.h
+++ b/indra/newview/llpaneltopinfobar.h
@@ -46,8 +46,8 @@ class LLPanelTopInfoBar : public LLPanel, public LLSingleton<LLPanelTopInfoBar>,
 public:
 	typedef boost::signals2::signal<void ()> resize_signal_t;
 
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void draw();
+	/*virtual*/ BOOL postBuild() override;
+	/*virtual*/ void draw() override;
 
 	/**
 	 * Updates location and parcel icons on login complete
@@ -83,7 +83,7 @@ private:
 	 */
 	void initParcelIcons();
 
-	BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+	BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
 
 	/**
 	 * Handles clicks on the parcel icons.
diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h
index 88cb3a15f8..f98624e30d 100644
--- a/indra/newview/llpathfindingpathtool.h
+++ b/indra/newview/llpathfindingpathtool.h
@@ -66,17 +66,17 @@ public:
 	typedef boost::signals2::signal<void (void)> path_event_signal_t;
 	typedef boost::signals2::connection          path_event_slot_t;
 
-	virtual BOOL      handleMouseDown(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleMouseUp(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleRightMouseDown(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleRightMouseUp(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL      handleMouseDown(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleMouseUp(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleRightMouseDown(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleRightMouseUp(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleDoubleClick(S32 x, S32 y, MASK mask) override;
 
-	virtual BOOL      handleHover(S32 pX, S32 pY, MASK pMask);
+	virtual BOOL      handleHover(S32 pX, S32 pY, MASK pMask) override;
 
-	virtual BOOL      handleKey(KEY pKey, MASK pMask);
+	virtual BOOL      handleKey(KEY pKey, MASK pMask) override;
 
 	EPathStatus       getPathStatus() const;
 
diff --git a/indra/newview/llproductinforequest.h b/indra/newview/llproductinforequest.h
index d1036374e8..0b94c39d11 100644
--- a/indra/newview/llproductinforequest.h
+++ b/indra/newview/llproductinforequest.h
@@ -46,7 +46,7 @@ public:
 	std::string getDescriptionForSku(const std::string& sku);
 
 private:
-	/* virtual */ void initSingleton();
+	/* virtual */ void initSingleton() override;
 
     void getLandDescriptionsCoro(std::string url);
     LLSD mSkuDescriptions;
diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h
index 1b322f2c0a..0c04222a9f 100644
--- a/indra/newview/llrecentpeople.h
+++ b/indra/newview/llrecentpeople.h
@@ -106,7 +106,7 @@ public:
 	/**
 	 * LLSimpleListener interface.
 	 */
-	/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
+	/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata) override;
 
 	void updateAvatarsArrivalTime(uuid_vec_t& uuids);
 	F32 getArrivalTimeByID(const LLUUID& id);
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index ed795b5155..22c9481687 100644
--- a/indra/newview/llspeakers.h
+++ b/indra/newview/llspeakers.h
@@ -338,7 +338,7 @@ class LLActiveSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLActiveSpeak
 	LOG_CLASS(LLActiveSpeakerMgr);
 
 protected:
-	virtual void updateSpeakerList();
+	virtual void updateSpeakerList() override;
 };
 
 class LLLocalSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLLocalSpeakerMgr>
@@ -347,7 +347,7 @@ class LLLocalSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLLocalSpeaker
 	~LLLocalSpeakerMgr ();
 	LOG_CLASS(LLLocalSpeakerMgr);
 protected:
-	virtual void updateSpeakerList();
+	virtual void updateSpeakerList() override;
 };
 
 #endif // LL_LLSPEAKERS_H
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
index 5ca1d4b4a5..94b7470c66 100644
--- a/indra/newview/llspeakingindicatormanager.cpp
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -84,7 +84,7 @@ public:
 	 * So, method does not calculate difference between these list it only switches off already 
 	 * switched on indicators and switches on indicators of voice channel participants
 	 */
-	void onParticipantsChanged();
+	void onParticipantsChanged() override;
 	
 private:
 	typedef std::set<LLUUID> speaker_ids_t;
diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h
index c108d83256..6545ee3611 100644
--- a/indra/newview/lltoolbrush.h
+++ b/indra/newview/lltoolbrush.h
@@ -49,27 +49,27 @@ class LLToolBrushLand : public LLTool, public LLEditMenuHandler, public LLSingle
 public:
 	
 	// x,y in window coords, 0,0 = left,bot
-	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
-	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );		
-	virtual BOOL handleHover( S32 x, S32 y, MASK mask );
-	virtual void handleSelect();
-	virtual void handleDeselect();
+	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask ) override;
+	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask ) override;
+	virtual BOOL handleHover( S32 x, S32 y, MASK mask ) override;
+	virtual void handleSelect() override;
+	virtual void handleDeselect() override;
 
 	// isAlwaysRendered() - return true if this is a tool that should
 	// always be rendered regardless of selection.
-	virtual BOOL isAlwaysRendered() { return TRUE; }
+	virtual BOOL isAlwaysRendered()  override { return TRUE; }
 
 	// Draw the area that will be affected.
-	virtual void render();
+	virtual void render() override;
 
 	// on Idle is where the land modification actually occurs
 	static void onIdle(void* brush_tool);  
 
-	void			onMouseCaptureLost();
+	void onMouseCaptureLost() override;
 
 	void modifyLandInSelectionGlobal();
-	virtual void	undo();
-	virtual BOOL	canUndo() const	{ return TRUE; }
+	virtual void	undo() override;
+	virtual BOOL	canUndo() const	 override { return TRUE; }
 
 protected:
 	void brush( void );
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h
index 86506f725e..f539a045b7 100644
--- a/indra/newview/lltoolcomp.h
+++ b/indra/newview/lltoolcomp.h
@@ -108,11 +108,11 @@ class LLToolCompInspect : public LLToolComposite, public LLSingleton<LLToolCompI
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleKey(KEY key, MASK mask);
-	virtual void		onMouseCaptureLost();
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleKey(KEY key, MASK mask) override;
+	virtual void		onMouseCaptureLost() override;
 			void		keyUp(KEY key, MASK mask);
 
 	static void pickCallback(const LLPickInfo& pick_info);
@@ -133,13 +133,13 @@ class LLToolCompTranslate : public LLToolComposite, public LLSingleton<LLToolCom
 public:
 
 	// Overridden from LLToolComposite
-	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
-	virtual void		render();
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;			// Returns to the default tool
+	virtual void		render() override;
 
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 
 	static void pickCallback(const LLPickInfo& pick_info);
 };
@@ -154,13 +154,13 @@ class LLToolCompScale : public LLToolComposite, public LLSingleton<LLToolCompSca
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
-	virtual void		render();
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;			// Returns to the default tool
+	virtual void		render() override;
 
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 	
 	static void pickCallback(const LLPickInfo& pick_info);
 };
@@ -176,13 +176,13 @@ class LLToolCompRotate : public LLToolComposite, public LLSingleton<LLToolCompRo
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual void		render();
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual void		render() override;
 
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 
 	static void pickCallback(const LLPickInfo& pick_info);
 
@@ -199,9 +199,9 @@ class LLToolCompCreate : public LLToolComposite, public LLSingleton<LLToolCompCr
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
 	
 	static void pickCallback(const LLPickInfo& pick_info);
 protected:
@@ -224,16 +224,16 @@ class LLToolCompGun : public LLToolComposite, public LLSingleton<LLToolCompGun>
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL			handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleRightMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleScrollWheel(S32 x, S32 y, S32 clicks);
-	virtual void			onMouseCaptureLost();
-	virtual void			handleSelect();
-	virtual void			handleDeselect();
-	virtual LLTool*			getOverrideTool(MASK mask) { return NULL; }
+    virtual BOOL			handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+	virtual void			onMouseCaptureLost() override;
+	virtual void			handleSelect() override;
+	virtual void			handleDeselect() override;
+	virtual LLTool*			getOverrideTool(MASK mask) override { return NULL; }
 
 protected:
 	LLToolGun*			mGun;
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h
index 4537d73332..8ec027cb0e 100644
--- a/indra/newview/lltooldraganddrop.h
+++ b/indra/newview/lltooldraganddrop.h
@@ -48,12 +48,12 @@ public:
 	typedef boost::signals2::signal<void ()> enddrag_signal_t;
 
 	// overridden from LLTool
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleKey(KEY key, MASK mask);
-	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask);
-	virtual void	onMouseCaptureLost();
-	virtual void	handleDeselect();
+	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleKey(KEY key, MASK mask) override;
+	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask) override;
+	virtual void	onMouseCaptureLost() override;
+	virtual void	handleDeselect() override;
 
 	void			setDragStart( S32 x, S32 y );			// In screen space
 	BOOL			isOverThreshold( S32 x, S32 y );		// In screen space
diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h
index e4b8ae12b8..7c8ff20480 100644
--- a/indra/newview/lltoolface.h
+++ b/indra/newview/lltoolface.h
@@ -39,11 +39,11 @@ class LLToolFace
 	virtual ~LLToolFace();
 public:
 
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual void	handleSelect();
-	virtual void	handleDeselect();
-	virtual void	render();			// draw face highlights
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual void	handleSelect() override;
+	virtual void	handleDeselect() override;
+	virtual void	render() override;			// draw face highlights
 
 	static void pickCallback(const LLPickInfo& pick_info);
 };
diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h
index cfc235b6c2..c9dd39ff4b 100644
--- a/indra/newview/lltoolfocus.h
+++ b/indra/newview/lltoolfocus.h
@@ -38,16 +38,16 @@ class LLToolCamera
 	virtual ~LLToolCamera();
 public:
 
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
 
-	virtual void	onMouseCaptureLost();
+	virtual void	onMouseCaptureLost() override;
 
-	virtual void	handleSelect();
-	virtual void	handleDeselect();
+	virtual void	handleSelect() override;
+	virtual void	handleDeselect() override;
 
-	virtual LLTool*	getOverrideTool(MASK mask) { return NULL; }
+	virtual LLTool*	getOverrideTool(MASK mask) override { return NULL; }
 
 	static void pickCallback(const LLPickInfo& pick_info);
 	BOOL mouseSteerMode() { return mMouseSteering; }
diff --git a/indra/newview/lltoolindividual.h b/indra/newview/lltoolindividual.h
index e7c2060fba..89dd9d9796 100644
--- a/indra/newview/lltoolindividual.h
+++ b/indra/newview/lltoolindividual.h
@@ -43,11 +43,9 @@ class LLToolIndividual : public LLTool, public LLSingleton<LLToolIndividual>
 	virtual ~LLToolIndividual();
 public:
 
-	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual void handleSelect();
-	//virtual void handleDeselect();
-	//virtual void render();
+	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual void handleSelect() override;
 
 	static void pickCallback(const LLPickInfo& pick_info);
 
diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h
index 5ad9b67e21..a55cd223de 100644
--- a/indra/newview/lltoolobjpicker.h
+++ b/indra/newview/lltoolobjpicker.h
@@ -38,16 +38,16 @@ class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker>
 	LLSINGLETON(LLToolObjPicker);
 public:
 
-	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
 
-	virtual void 		handleSelect();
-	virtual void 		handleDeselect();
+	virtual void 		handleSelect() override;
+	virtual void 		handleDeselect() override;
 
-	virtual void		onMouseCaptureLost();
+	virtual void		onMouseCaptureLost() override;
 
-	virtual void 		setExitCallback(void (*callback)(void *), void *callback_data);
+	void 		setExitCallback(void (*callback)(void *), void *callback_data);
 
 	LLUUID				getObjectID() const { return mHitObjectID; }
 
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index 8f6100e4b4..dca0d12cf6 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -42,26 +42,26 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
 public:
 
 	// Virtual functions inherited from LLMouseHandler
-	virtual BOOL		handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
-	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleRightMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleRightMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down) override;
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleRightMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
 	BOOL				handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
-	virtual BOOL		handleScrollWheel(S32 x, S32 y, S32 clicks);
-	virtual BOOL		handleScrollHWheel(S32 x, S32 y, S32 clicks);
-	virtual BOOL		handleToolTip(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+	virtual BOOL		handleScrollHWheel(S32 x, S32 y, S32 clicks) override;
+	virtual BOOL		handleToolTip(S32 x, S32 y, MASK mask) override;
 
-	virtual void		render();
+	virtual void		render() override;
 
-	virtual void		stopEditing();
+	virtual void		stopEditing() override;
 
-	virtual void		onMouseCaptureLost();
-	virtual void		handleSelect();
-	virtual void		handleDeselect();
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual void		onMouseCaptureLost() override;
+	virtual void		handleSelect() override;
+	virtual void		handleDeselect() override;
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 
 	LLPickInfo&			getPick() { return mPick; }
 	U8					getClickAction() { return mClickAction; }
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index 7575d8ad18..2636811c66 100644
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -47,10 +47,10 @@ class LLToolPipette
 	virtual ~LLToolPipette();
 
 public:
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask);
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask) override;
 
 	// Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots
 	typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t;
diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h
index b5ba72f16d..88bc4e2e3d 100644
--- a/indra/newview/lltoolselectland.h
+++ b/indra/newview/lltoolselectland.h
@@ -39,15 +39,15 @@ class LLToolSelectLand
 	virtual ~LLToolSelectLand();
 
 public:
-	/*virtual*/ BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ void		render();				// draw the select rectangle
-	/*virtual*/ BOOL		isAlwaysRendered()		{ return TRUE; }
+	/*virtual*/ BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ void		render() override;				// draw the select rectangle
+	/*virtual*/ BOOL		isAlwaysRendered() override	{ return TRUE; }
 
-	/*virtual*/ void		handleSelect();
-	/*virtual*/ void		handleDeselect();
+	/*virtual*/ void		handleSelect() override;
+	/*virtual*/ void		handleDeselect() override;
 
 protected:
 	BOOL			outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h
index 02ff0c094a..37382243f6 100644
--- a/indra/newview/llversioninfo.h
+++ b/indra/newview/llversioninfo.h
@@ -47,7 +47,7 @@ class LLStoreListener;
 class LLVersionInfo: public LLSingleton<LLVersionInfo>
 {
 	LLSINGLETON(LLVersionInfo);
-	void initSingleton();
+	void initSingleton() override;
 public:
 	~LLVersionInfo();
 
diff --git a/indra/newview/llviewerhelp.h b/indra/newview/llviewerhelp.h
index da50e07a43..bbd20bc07e 100644
--- a/indra/newview/llviewerhelp.h
+++ b/indra/newview/llviewerhelp.h
@@ -43,21 +43,21 @@ class LLViewerHelp : public LLHelp, public LLSingleton<LLViewerHelp>
 
  public:
 	/// display the specified help topic in the help viewer
-	/*virtual*/ void showTopic(const std::string &topic);
+	/*virtual*/ void showTopic(const std::string &topic) override;
 
-	std::string getURL(const std::string& topic);
+	std::string getURL(const std::string& topic) override;
 
 	// return topic derived from viewer UI focus, else default topic
 	std::string getTopicFromFocus();
 
 	/// return default (fallback) topic name suitable for showTopic()
-	/*virtual*/ std::string defaultTopic();
+	/*virtual*/ std::string defaultTopic() override;
 
 	// return topic to use before the user logs in
-	/*virtual*/ std::string preLoginTopic();
+	/*virtual*/ std::string preLoginTopic() override;
 
 	// return topic to use for the top-level help, invoked by F1
-	/*virtual*/ std::string f1HelpTopic();
+	/*virtual*/ std::string f1HelpTopic() override;
 };
 
 #endif // header guard
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index f1f42afd81..ad7c4bcefa 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -74,7 +74,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia>
 {
 	LLSINGLETON(LLViewerMedia);
 	~LLViewerMedia();
-	void initSingleton();
+	void initSingleton() override;
 	LOG_CLASS(LLViewerMedia);
 
 public:
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h
index effd08a559..2310e4dbfc 100644
--- a/indra/newview/llviewermediafocus.h
+++ b/indra/newview/llviewermediafocus.h
@@ -54,10 +54,10 @@ public:
 	void setHoverFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero);
 	void clearHover();
 	
-	/*virtual*/ bool	getFocus();
-	/*virtual*/ BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent);
-	/*virtual*/ BOOL	handleKeyUp(KEY key, MASK mask, BOOL called_from_parent);
-	/*virtual*/ BOOL	handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
+	bool	getFocus();
+	/*virtual*/ BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
+	/*virtual*/ BOOL	handleKeyUp(KEY key, MASK mask, BOOL called_from_parent) override;
+	/*virtual*/ BOOL	handleUnicodeChar(llwchar uni_char, BOOL called_from_parent) override;
 	BOOL handleScrollWheel(const LLVector2& texture_coords, S32 clicks_x, S32 clicks_y);
 	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
 
@@ -92,12 +92,12 @@ public:
 	LLUUID getControlsMediaID();
 
     // The MoaP object wants keyup and keydown events.  Overridden to return true.
-    virtual bool    wantsKeyUpKeyDown() const;
-    virtual bool    wantsReturnKey() const;
+    virtual bool    wantsKeyUpKeyDown() const override;
+    virtual bool    wantsReturnKey() const override;
 
 protected:
-	/*virtual*/ void	onFocusReceived();
-	/*virtual*/ void	onFocusLost();
+	/*virtual*/ void	onFocusReceived() override;
+	/*virtual*/ void	onFocusLost() override;
 
 private:
 	
diff --git a/indra/newview/llviewerparcelaskplay.h b/indra/newview/llviewerparcelaskplay.h
index dc711917d2..56faddae66 100644
--- a/indra/newview/llviewerparcelaskplay.h
+++ b/indra/newview/llviewerparcelaskplay.h
@@ -34,8 +34,8 @@ class LLViewerParcelAskPlay : public LLSingleton<LLViewerParcelAskPlay>
 {
     LLSINGLETON(LLViewerParcelAskPlay);
     ~LLViewerParcelAskPlay();
-    void initSingleton();
-    void cleanupSingleton();
+    void initSingleton() override;
+    void cleanupSingleton() override;
 public:
     // functor expects functor(region_id, parcel_id, url, play/stop)
     typedef boost::function<void(const LLUUID&, const S32&, const std::string&, const bool&)> ask_callback;
diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h
index 779a65bdf8..790b2b71fc 100644
--- a/indra/newview/llviewerparcelmedia.h
+++ b/indra/newview/llviewerparcelmedia.h
@@ -74,7 +74,7 @@ public:
 	void sendMediaNavigateMessage(const std::string& url);
 
 	// inherited from LLViewerMediaObserver
-	virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+	virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
 
 private:
 	void processParcelMediaCommandMessage(LLMessageSystem *msg);
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h
index d71fd4c075..e83085dee0 100644
--- a/indra/newview/llviewerparcelmediaautoplay.h
+++ b/indra/newview/llviewerparcelmediaautoplay.h
@@ -35,7 +35,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerPar
 {
 	LLSINGLETON(LLViewerParcelMediaAutoPlay);
 public:
-	virtual BOOL tick();
+	virtual BOOL tick() override;
 	static void playStarted();
 
  private:
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 0018e78d45..f159682b67 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -242,9 +242,9 @@ class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIIm
 	LLSINGLETON_EMPTY_CTOR(LLUIImageList);
 public:
 	// LLImageProviderInterface
-	/*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority);
-	/*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority);
-	void cleanUp();
+	/*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority) override;
+	/*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority) override;
+	void cleanUp() override;
 
 	bool initFromFile();
 
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 309c3eebdd..e68bfbe1ff 100644
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -170,12 +170,12 @@ class LLVoiceChannelProximal : public LLVoiceChannel, public LLSingleton<LLVoice
 	LLSINGLETON(LLVoiceChannelProximal);
 public:
 
-	/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal);
-	/*virtual*/ void handleStatusChange(EStatusType status);
-	/*virtual*/ void handleError(EStatusType status);
-	/*virtual*/ BOOL isActive();
-	/*virtual*/ void activate();
-	/*virtual*/ void deactivate();
+	/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal) override;
+	/*virtual*/ void handleStatusChange(EStatusType status) override;
+	/*virtual*/ void handleError(EStatusType status) override;
+	/*virtual*/ BOOL isActive() override;
+	/*virtual*/ void activate() override;
+	/*virtual*/ void deactivate() override;
 
 };
 
@@ -184,15 +184,15 @@ class LLVoiceChannelP2P : public LLVoiceChannelGroup
 public:
 	LLVoiceChannelP2P(const LLUUID& session_id, const std::string& session_name, const LLUUID& other_user_id);
 
-	/*virtual*/ void handleStatusChange(EStatusType status);
-	/*virtual*/ void handleError(EStatusType status);
-    /*virtual*/ void activate();
-	/*virtual*/ void getChannelInfo();
+	/*virtual*/ void handleStatusChange(EStatusType status) override;
+	/*virtual*/ void handleError(EStatusType status) override;
+    /*virtual*/ void activate() override;
+	/*virtual*/ void getChannelInfo() override;
 
 	void setSessionHandle(const std::string& handle, const std::string &inURI);
 
 protected:
-	virtual void setState(EState state);
+	virtual void setState(EState state) override;
 
 private:
 
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index ebc3a62c35..511b6ff719 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -64,28 +64,28 @@ public:
 	/// @name LLVoiceModuleInterface virtual implementations
 	///  @see LLVoiceModuleInterface
 	//@{
-	virtual void init(LLPumpIO *pump);	// Call this once at application startup (creates connector)
-	virtual void terminate();	// Call this to clean up during shutdown
+	virtual void init(LLPumpIO *pump) override;	// Call this once at application startup (creates connector)
+	virtual void terminate() override;	// Call this to clean up during shutdown
 	
-	virtual const LLVoiceVersionInfo& getVersion();
+	virtual const LLVoiceVersionInfo& getVersion() override;
 	
-	virtual void updateSettings(); // call after loading settings and whenever they change
+	virtual void updateSettings() override; // call after loading settings and whenever they change
 
 	// Returns true if vivox has successfully logged in and is not in error state	
-	virtual bool isVoiceWorking() const;
+	virtual bool isVoiceWorking() const override;
 	
-	virtual bool singletoneInstanceExists();
+	virtual bool singletoneInstanceExists() override;
 
 	/////////////////////
 	/// @name Tuning
 	//@{
-	virtual void tuningStart();
-	virtual void tuningStop();
-	virtual bool inTuningMode();
+	virtual void tuningStart() override;
+	virtual void tuningStop() override;
+	virtual bool inTuningMode() override;
 	
-	virtual void tuningSetMicVolume(float volume);
-	virtual void tuningSetSpeakerVolume(float volume);
-	virtual float tuningGetEnergy(void);
+	virtual void tuningSetMicVolume(float volume) override;
+	virtual void tuningSetSpeakerVolume(float volume) override;
+	virtual float tuningGetEnergy(void) override;
 	//@}
 	
 	/////////////////////
@@ -93,40 +93,40 @@ public:
 	//@{
 	// This returns true when it's safe to bring up the "device settings" dialog in the prefs.
 	// i.e. when the daemon is running and connected, and the device lists are populated.
-	virtual bool deviceSettingsAvailable();
-	virtual bool deviceSettingsUpdated();  //return if the list has been updated and never fetched,  only to be called from the voicepanel.
+	virtual bool deviceSettingsAvailable() override;
+	virtual bool deviceSettingsUpdated() override;  //return if the list has been updated and never fetched,  only to be called from the voicepanel.
 	
 	// Requery the vivox daemon for the current list of input/output devices.
 	// If you pass true for clearCurrentList, deviceSettingsAvailable() will be false until the query has completed
 	// (use this if you want to know when it's done).
 	// If you pass false, you'll have no way to know when the query finishes, but the device lists will not appear empty in the interim.
-	virtual void refreshDeviceLists(bool clearCurrentList = true);
+	virtual void refreshDeviceLists(bool clearCurrentList = true) override;
 	
-	virtual void setCaptureDevice(const std::string& name);
-	virtual void setRenderDevice(const std::string& name);
+	virtual void setCaptureDevice(const std::string& name) override;
+	virtual void setRenderDevice(const std::string& name) override;
 	
-	virtual LLVoiceDeviceList& getCaptureDevices();
-	virtual LLVoiceDeviceList& getRenderDevices();
+	virtual LLVoiceDeviceList& getCaptureDevices() override;
+	virtual LLVoiceDeviceList& getRenderDevices() override;
 	//@}	
 	
-	virtual void getParticipantList(std::set<LLUUID> &participants);
-	virtual bool isParticipant(const LLUUID& speaker_id);
+	virtual void getParticipantList(std::set<LLUUID> &participants) override;
+	virtual bool isParticipant(const LLUUID& speaker_id) override;
 
 	// Send a text message to the specified user, initiating the session if necessary.
 	// virtual BOOL sendTextMessage(const LLUUID& participant_id, const std::string& message) const {return false;};
 	
 	// close any existing text IM session with the specified user
-	virtual void endUserIMSession(const LLUUID &uuid);
+	virtual void endUserIMSession(const LLUUID &uuid) override;
 
 	// Returns true if calling back the session URI after the session has closed is possible.
 	// Currently this will be false only for PSTN P2P calls.		
 	// NOTE: this will return true if the session can't be found. 
-	virtual BOOL isSessionCallBackPossible(const LLUUID &session_id);
+	virtual BOOL isSessionCallBackPossible(const LLUUID &session_id) override;
 	
 	// Returns true if the session can accepte text IM's.
 	// Currently this will be false only for PSTN P2P calls.
 	// NOTE: this will return true if the session can't be found. 
-	virtual BOOL isSessionTextIMPossible(const LLUUID &session_id);
+	virtual BOOL isSessionTextIMPossible(const LLUUID &session_id) override;
 	
 	
 	////////////////////////////
@@ -134,21 +134,21 @@ public:
 	//@{
 	// returns true iff the user is currently in a proximal (local spatial) channel.
 	// Note that gestures should only fire if this returns true.
-	virtual bool inProximalChannel();
+	virtual bool inProximalChannel() override;
 	
 	virtual void setNonSpatialChannel(const std::string &uri,
-									  const std::string &credentials);
+									  const std::string &credentials) override;
 	
 	virtual bool setSpatialChannel(const std::string &uri,
-								   const std::string &credentials);
+								   const std::string &credentials) override;
 	
-	virtual void leaveNonSpatialChannel();
+	virtual void leaveNonSpatialChannel() override;
 	
-	virtual void leaveChannel(void);	
+	virtual void leaveChannel(void) override;
 	
 	// Returns the URI of the current channel, or an empty string if not currently in a channel.
 	// NOTE that it will return an empty string if it's in the process of joining a channel.
-	virtual std::string getCurrentChannel();
+	virtual std::string getCurrentChannel() override;
 	//@}
 	
 	
@@ -156,59 +156,59 @@ public:
 	/// @name invitations
 	//@{
 	// start a voice channel with the specified user
-	virtual void callUser(const LLUUID &uuid);	
-	virtual bool isValidChannel(std::string &channelHandle);
-	virtual bool answerInvite(std::string &channelHandle);
-	virtual void declineInvite(std::string &channelHandle);
+	virtual void callUser(const LLUUID &uuid) override;
+	virtual bool isValidChannel(std::string &channelHandle) override;
+	virtual bool answerInvite(std::string &channelHandle) override;
+	virtual void declineInvite(std::string &channelHandle) override;
 	//@}
 	
 	/////////////////////////
 	/// @name Volume/gain
 	//@{
-	virtual void setVoiceVolume(F32 volume);
-	virtual void setMicGain(F32 volume);
+	virtual void setVoiceVolume(F32 volume) override;
+	virtual void setMicGain(F32 volume) override;
 	//@}
 	
 	/////////////////////////
 	/// @name enable disable voice and features
 	//@{
-	virtual bool voiceEnabled();
-	virtual void setVoiceEnabled(bool enabled);
-	virtual BOOL lipSyncEnabled();	
-	virtual void setLipSyncEnabled(BOOL enabled);
-	virtual void setMuteMic(bool muted);		// Set the mute state of the local mic.
+	virtual bool voiceEnabled() override;
+	virtual void setVoiceEnabled(bool enabled) override;
+	virtual BOOL lipSyncEnabled() override;
+	virtual void setLipSyncEnabled(BOOL enabled) override;
+	virtual void setMuteMic(bool muted) override;		// Set the mute state of the local mic.
 	//@}
 		
 	//////////////////////////
 	/// @name nearby speaker accessors
 	//@{
-	virtual BOOL getVoiceEnabled(const LLUUID& id);		// true if we've received data for this avatar
-	virtual std::string getDisplayName(const LLUUID& id);
-	virtual BOOL isParticipantAvatar(const LLUUID &id);
-	virtual BOOL getIsSpeaking(const LLUUID& id);
-	virtual BOOL getIsModeratorMuted(const LLUUID& id);
-	virtual F32 getCurrentPower(const LLUUID& id);		// "power" is related to "amplitude" in a defined way.  I'm just not sure what the formula is...
-	virtual BOOL getOnMuteList(const LLUUID& id);
-	virtual F32 getUserVolume(const LLUUID& id);
-	virtual void setUserVolume(const LLUUID& id, F32 volume); // set's volume for specified agent, from 0-1 (where .5 is nominal)	
+	virtual BOOL getVoiceEnabled(const LLUUID& id) override;		// true if we've received data for this avatar
+	virtual std::string getDisplayName(const LLUUID& id) override;
+	virtual BOOL isParticipantAvatar(const LLUUID &id) override;
+	virtual BOOL getIsSpeaking(const LLUUID& id) override;
+	virtual BOOL getIsModeratorMuted(const LLUUID& id) override;
+	virtual F32 getCurrentPower(const LLUUID& id) override;		// "power" is related to "amplitude" in a defined way.  I'm just not sure what the formula is...
+	virtual BOOL getOnMuteList(const LLUUID& id) override;
+	virtual F32 getUserVolume(const LLUUID& id) override;
+	virtual void setUserVolume(const LLUUID& id, F32 volume) override; // set's volume for specified agent, from 0-1 (where .5 is nominal)
 	//@}
 	
 	// authorize the user
 	virtual void userAuthorized(const std::string& user_id,
-								const LLUUID &agentID);
+								const LLUUID &agentID) override;
 	
 	//////////////////////////////
 	/// @name Status notification
 	//@{
-	virtual void addObserver(LLVoiceClientStatusObserver* observer);
-	virtual void removeObserver(LLVoiceClientStatusObserver* observer);
-	virtual void addObserver(LLFriendObserver* observer);
-	virtual void removeObserver(LLFriendObserver* observer);		
-	virtual void addObserver(LLVoiceClientParticipantObserver* observer);
-	virtual void removeObserver(LLVoiceClientParticipantObserver* observer);
+	virtual void addObserver(LLVoiceClientStatusObserver* observer) override;
+	virtual void removeObserver(LLVoiceClientStatusObserver* observer) override;
+	virtual void addObserver(LLFriendObserver* observer) override;
+	virtual void removeObserver(LLFriendObserver* observer) override;
+	virtual void addObserver(LLVoiceClientParticipantObserver* observer) override;
+	virtual void removeObserver(LLVoiceClientParticipantObserver* observer) override;
 	//@}
 	
-	virtual std::string sipURIFromID(const LLUUID &id);
+	virtual std::string sipURIFromID(const LLUUID &id) override;
 	//@}
 
 	/// @name LLVoiceEffectInterface virtual implementations
@@ -218,32 +218,32 @@ public:
 	//////////////////////////
 	/// @name Accessors
 	//@{
-	virtual bool setVoiceEffect(const LLUUID& id);
-	virtual const LLUUID getVoiceEffect();
-	virtual LLSD getVoiceEffectProperties(const LLUUID& id);
+	virtual bool setVoiceEffect(const LLUUID& id) override;
+	virtual const LLUUID getVoiceEffect() override;
+	virtual LLSD getVoiceEffectProperties(const LLUUID& id) override;
 
-	virtual void refreshVoiceEffectLists(bool clear_lists);
-	virtual const voice_effect_list_t& getVoiceEffectList() const;
-	virtual const voice_effect_list_t& getVoiceEffectTemplateList() const;
+	virtual void refreshVoiceEffectLists(bool clear_lists) override;
+	virtual const voice_effect_list_t& getVoiceEffectList() const override;
+	virtual const voice_effect_list_t& getVoiceEffectTemplateList() const override;
 	//@}
 
 	//////////////////////////////
 	/// @name Status notification
 	//@{
-	virtual void addObserver(LLVoiceEffectObserver* observer);
-	virtual void removeObserver(LLVoiceEffectObserver* observer);
+	virtual void addObserver(LLVoiceEffectObserver* observer) override;
+	virtual void removeObserver(LLVoiceEffectObserver* observer) override;
 	//@}
 
 	//////////////////////////////
 	/// @name Effect preview buffer
 	//@{
-	virtual void enablePreviewBuffer(bool enable);
-	virtual void recordPreviewBuffer();
-	virtual void playPreviewBuffer(const LLUUID& effect_id = LLUUID::null);
-	virtual void stopPreviewBuffer();
+	virtual void enablePreviewBuffer(bool enable) override;
+	virtual void recordPreviewBuffer() override;
+	virtual void playPreviewBuffer(const LLUUID& effect_id = LLUUID::null) override;
+	virtual void stopPreviewBuffer() override;
 
-	virtual bool isPreviewRecording();
-	virtual bool isPreviewPlaying();
+	virtual bool isPreviewRecording() override;
+	virtual bool isPreviewPlaying() override;
 	//@}
 
 	//@}
@@ -754,7 +754,7 @@ private:
 	std::string getAudioSessionURI();
 	std::string getAudioSessionHandle();
 			
-    void setHidden(bool hidden); //virtual
+    void setHidden(bool hidden) override; //virtual
 	void sendPositionAndVolumeUpdate(void);
 	
     void sendCaptureAndRenderDevices();
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index ba8488b237..602e8f0711 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -413,7 +413,7 @@ public:
 	{
 		LLSINGLETON(ContextMenu);
 	public:
-		/*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y);
+		/*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y) override;
 
 		void show(LLView* spawning_view, LLWearableType::EType w_type, S32 x, S32 y);
 
@@ -426,7 +426,7 @@ public:
 			MASK_UNKNOWN		= 0x10,
 		};
 
-		/* virtual */ LLContextMenu* createMenu();
+		/* virtual */ LLContextMenu* createMenu() override;
 		void updateItemsVisibility(LLContextMenu* menu);
 		void updateItemsLabels(LLContextMenu* menu);
 		static void setMenuItemVisible(LLContextMenu* menu, const std::string& name, bool val);
@@ -456,7 +456,7 @@ public:
 
 	virtual ~LLWearableItemsList();
 
-	/*virtual*/ LLPanel* createNewItem(LLViewerInventoryItem* item);
+	/*virtual*/ LLPanel* createNewItem(LLViewerInventoryItem* item) override;
 
 	void updateList(const LLUUID& category_id);
 
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h
index 524adba652..31dbfb8ffd 100644
--- a/indra/newview/llwindebug.h
+++ b/indra/newview/llwindebug.h
@@ -40,9 +40,9 @@ class LLWinDebug:
 {
 	LLSINGLETON_EMPTY_CTOR(LLWinDebug);
 public:
-	void initSingleton();
+	void initSingleton() override;
 	static void generateMinidump(struct _EXCEPTION_POINTERS *pExceptionInfo = NULL);
-	void cleanupSingleton();
+	void cleanupSingleton() override;
 private:
 	static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename);
 };
-- 
cgit v1.2.3


From a804b98e4ed127ce1a11f639babb82574f2e5204 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 17:03:58 -0800
Subject: DRTVWR-489-emoji: A couple of tabs slipped into this file and our new
 no-tabs coding policy caught it and failed the build

---
 indra/llui/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 44c61dcdbc..4fc3836248 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -53,8 +53,8 @@ set(llui_SOURCE_FILES
     lldockcontrol.cpp
     lldraghandle.cpp
     lleditmenuhandler.cpp
-	llemojidictionary.cpp
-	llemojihelper.cpp
+    llemojidictionary.cpp
+    llemojihelper.cpp
     llf32uictrl.cpp
     llfiltereditor.cpp
     llflashtimer.cpp
@@ -165,8 +165,8 @@ set(llui_HEADER_FILES
     lldockablefloater.h
     lldockcontrol.h
     lleditmenuhandler.h
-	llemojidictionary.h
-	llemojihelper.h
+    llemojidictionary.h
+    llemojihelper.h
     llf32uictrl.h
     llfiltereditor.h 
     llflashtimer.h
-- 
cgit v1.2.3


From d9e82ab14aaa3e0daceacda8cf72ade379e9caf1 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 17:04:35 -0800
Subject: DRTVWR-489-emoji: Pull in some small changes from Kitty's work to
 move the macOS build forwards

---
 indra/cmake/ICU4C.cmake           |  4 ++--
 indra/llrender/llfontregistry.cpp |  2 +-
 indra/newview/CMakeLists.txt      | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index 007a9b6937..b51087e0e7 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -10,8 +10,8 @@ else (USESYSTEMLIBS)
   use_prebuilt_binary(icu4c)
   if (WINDOWS)
     set(ICU4C_LIBRARY icuuc)
-  #elseif(DARWIN)
-  #  set(ICU4C_LIBRARY ...)
+  elseif(DARWIN)
+    set(ICU4C_LIBRARY icuuc)
   #elseif(LINUX)
   #  set(ICU4C_LIBRARY ...)
   else()
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 44f2bd4cc5..c9a9ee3a03 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -483,7 +483,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 #if LL_DARWIN
 	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY);
 	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY + MACOSX_FONT_SUPPLEMENTAL);
-	font_search_paths.push_back(sys_path + MACOSX_FONT_SUPPLEMENTAL);
+	font_search_paths.push_back(LLFontGL::getFontPathSystem() + MACOSX_FONT_SUPPLEMENTAL);
 #endif
 
 	// The fontname string may contain multiple font file names separated by semicolons.
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 36f4680c44..ee55657dd8 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -449,7 +449,7 @@ set(viewer_SOURCE_FILES
     llpaneleditsky.cpp
     llpaneleditwater.cpp
     llpaneleditwearable.cpp
-	llpanelemojicomplete.cpp
+    llpanelemojicomplete.cpp
     llpanelenvironment.cpp
     llpanelexperiencelisteditor.cpp
     llpanelexperiencelog.cpp
@@ -1081,7 +1081,7 @@ set(viewer_HEADER_FILES
     llpaneleditsky.h
     llpaneleditwater.h
     llpaneleditwearable.h
-	llpanelemojicomplete.h
+    llpanelemojicomplete.h
     llpanelenvironment.h
     llpanelexperiencelisteditor.h
     llpanelexperiencelog.h
@@ -1506,12 +1506,6 @@ if (WINDOWS)
         set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
     endif(USE_PRECOMPILED_HEADERS)
 
-    message("Copying fonts")
-    file(GLOB FONT_FILE_GLOB_LIST
-      "${AUTOBUILD_INSTALL_DIR}/fonts/*"
-    )
-    file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
-
     # Replace the icons with the appropriate ones for the channel
     # ('test' is the default)
     set(ICON_PATH "test")
@@ -2087,6 +2081,12 @@ endif (USE_BUGSPLAT)
 set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
     "Path to artwork files.")
 
+message("Copying fonts")
+file(GLOB FONT_FILE_GLOB_LIST
+  "${AUTOBUILD_INSTALL_DIR}/fonts/*"
+)
+file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
+
 if (LINUX)
   set(product SecondLife-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
 
-- 
cgit v1.2.3


From 99779d97f1e4650c7d46f1d97d5d70e2aacfbdb8 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 17:46:56 -0800
Subject: DRTVWR-489-emoji: Pull in the updated version of GoogleMock that was
 updated to Python3 so that it builds on macOS in TeamCity

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6d874b3bdc..c14c37753c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -860,9 +860,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>11d0794582e91a57f6524ad345f2399d</string>
+              <string>772d3ae9d4a1d3e36eadcfb4b81ca47f</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87791/805924/googlemock-1.7.0.563853-darwin64-563853.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109950/956085/googlemock-1.7.0.577943-darwin64-577943.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -884,9 +884,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>47303c9bb9a06c6f488f9d7b2b2282c4</string>
+              <string>61df276991917f710d27cb578d9df25b</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109524/952870/googlemock-1.7.0.577708-windows-577708.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109953/956105/googlemock-1.7.0.577943-windows-577943.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -896,16 +896,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c166bbd8787a68c1a4ba75179c58dda6</string>
+              <string>cc1307e11133755eac29ab04ef240092</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109525/952878/googlemock-1.7.0.577708-windows64-577708.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109952/956106/googlemock-1.7.0.577943-windows64-577943.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.7.0.577708</string>
+        <string>1.7.0.577943</string>
       </map>
       <key>gstreamer</key>
       <map>
-- 
cgit v1.2.3


From 923733e591eb547ad5dfec395ce7d3e8f0468c16 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 18:01:25 -0800
Subject: DRTVWR-489-emoji: missed the override warning/error in the tests...
 grr...

---
 indra/llcommon/tests/llsingleton_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp
index 15ffe68e67..49cf76b07e 100644
--- a/indra/llcommon/tests/llsingleton_test.cpp
+++ b/indra/llcommon/tests/llsingleton_test.cpp
@@ -47,8 +47,8 @@ public:                                             \
         DEP_INIT  /* dependency in initSingleton */ \
     } sDepFlag;                                     \
                                                     \
-    void initSingleton();                           \
-    void cleanupSingleton();                        \
+    void initSingleton() override;                  \
+    void cleanupSingleton() override;               \
 };                                                  \
                                                     \
 CLS::dep_flag CLS::sDepFlag = DEP_NONE
-- 
cgit v1.2.3


From 6f31fabbc2d082b77c8f09bce30234ec9c506e33 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 19:17:21 -0800
Subject: DRTVWR-489-emoji: less haste. more speed.  Missed another test issue.
 Rebuilt locally with tests and confirmed it works now

---
 indra/llcommon/tests/llsingleton_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp
index 49cf76b07e..6f8aaaa0cb 100644
--- a/indra/llcommon/tests/llsingleton_test.cpp
+++ b/indra/llcommon/tests/llsingleton_test.cpp
@@ -300,7 +300,7 @@ namespace tut
     {
         LLSINGLETON_EMPTY_CTOR(CircularPInit);
     public:
-        virtual void initSingleton()
+        virtual void initSingleton() override
         {
             // never mind indirection, just go straight for the circularity
             CircularPInit *pt = getInstance();
-- 
cgit v1.2.3


From b2f890408e2dc63a0f842273c41c0efed770cb9a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 2 Feb 2023 00:34:24 +0200
Subject: SL-19089 Changing UI scale crashes viewer

This makes no sense, trying to add a glyph now will have no width or height set, neither character width or heigh, yet release viewer does that. Fixed code to match release and set width and height despite char width not being up to date.
---
 indra/llrender/llfontbitmapcache.cpp | 14 ++++++++++++++
 indra/llrender/llfontfreetype.cpp    |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp
index 8809f9f475..42b0045cf3 100644
--- a/indra/llrender/llfontbitmapcache.cpp
+++ b/indra/llrender/llfontbitmapcache.cpp
@@ -92,6 +92,20 @@ BOOL LLFontBitmapCache::nextOpenPos(S32 width, S32& pos_x, S32& pos_y, EFontGlyp
 		{
 			// 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;
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 5535c07615..e4010579b3 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -798,11 +798,11 @@ void LLFontFreetype::setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32
 
 	llassert(!mIsFallback);
 	llassert(image_raw && (image_raw->getComponents() == 2));
-
 	
 	U8 *target = image_raw->getData();
+    llassert(target);
 
-	if (!data)
+	if (!data || !target)
 	{
 		return;
 	}
-- 
cgit v1.2.3


From 4df2c0b8d67af267d3c9c6d58d63df3ed063a89e Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 8 Feb 2023 17:17:47 +0100
Subject: Post-merge fix for xcode-14.1 branch

---
 indra/llcommon/llsdserialize.cpp   | 2 +-
 indra/llcommon/llsdserialize.h     | 2 +-
 indra/newview/llmeshrepository.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 73206f3d40..f66c4ff843 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2388,7 +2388,7 @@ U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size
 	return result;
 }
 
-char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size)
+char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size)
 {
 	const char* deprecated_header = "<? LLSD/Binary ?>";
 	constexpr size_t deprecated_header_size = 17;
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index 2f12c6d1ff..5ddf0ff552 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -873,5 +873,5 @@ LL_COMMON_API std::string zip_llsd(LLSD& data);
 LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size);
 
 // returns a pointer to the array or past the array if the deprecated header exists
-LL_COMMON_API char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size = nullptr);
+LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size = nullptr);
 #endif // LL_LLSDSERIALIZE_H
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index f937754368..18420a2356 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1865,7 +1865,7 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
 	U32 header_size = 0;
 	if (data_size > 0)
 	{
-		U32 dsize = data_size;
+		llssize dsize = data_size;
 		char* result_ptr = strip_deprecated_header((char*)data, dsize, &header_size);
 
 		data_size = dsize;
-- 
cgit v1.2.3


From 547c0665eaa19b6a2b5112faeae75e3a270b7a36 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 26 Jan 2023 14:45:45 -0800
Subject: DRTVWR-489-emoji: As part of the work to get macOS version of the
 Viewer working, the flag was introduced to warn (and therefore error out)
 when a virtual override was not marked with the 'override' keyword. Fixing
 this up involved a large number of changes and this commit represents just
 those changes - nothing specially from the DRTVWR-489 viewer

(Cherry pick of 3 commits from Callum to declutter the emoji PR: 3185bdea27b19e155c2ccc03c80624e113d312a6,
923733e591eb547ad5dfec395ce7d3e8f0468c16 and 6f31fabbc2d082b77c8f09bce30234ec9c506e33)
---
 indra/llappearance/llwearabletype.h          |   2 +-
 indra/llcommon/llcoros.h                     |   2 +-
 indra/llcommon/llsingleton.h                 |   2 +-
 indra/llcommon/tests/llsingleton_test.cpp    |   6 +-
 indra/llinventory/llfoldertype.cpp           |   2 +-
 indra/llinventory/llinventorysettings.cpp    |   2 +-
 indra/llmessage/llexperiencecache.h          |   2 +-
 indra/llmessage/llproxy.h                    |   2 +-
 indra/llui/llnotifications.h                 |   6 +-
 indra/llui/llspellcheck.h                    |   2 +-
 indra/llui/lltextbase.cpp                    |  21 ----
 indra/llui/lluictrl.h                        |   2 +-
 indra/llui/llview.cpp                        |   4 +-
 indra/llui/llviewquery.h                     |  12 +--
 indra/newview/llautoreplace.h                |   2 +-
 indra/newview/llchannelmanager.h             |   2 +-
 indra/newview/llchicletbar.h                 |   4 +-
 indra/newview/llconversationlog.h            |  10 +-
 indra/newview/llfeaturemanager.h             |   2 +-
 indra/newview/llfriendcard.h                 |   2 +-
 indra/newview/llgesturemgr.h                 |   4 +-
 indra/newview/llimagefiltersmanager.h        |   2 +-
 indra/newview/llimview.h                     |   2 +-
 indra/newview/llmutelist.h                   |   2 +-
 indra/newview/llnavigationbar.h              |   8 +-
 indra/newview/lloutfitobserver.h             |   2 +-
 indra/newview/llpaneltopinfobar.h            |   6 +-
 indra/newview/llpathfindingpathtool.h        |  18 ++--
 indra/newview/llproductinforequest.h         |   2 +-
 indra/newview/llrecentpeople.h               |   2 +-
 indra/newview/llspeakers.h                   |   4 +-
 indra/newview/llspeakingindicatormanager.cpp |   2 +-
 indra/newview/lltoolbrush.h                  |  20 ++--
 indra/newview/lltoolcomp.h                   |  72 +++++++-------
 indra/newview/lltooldraganddrop.h            |  12 +--
 indra/newview/lltoolface.h                   |  10 +-
 indra/newview/lltoolfocus.h                  |  14 +--
 indra/newview/lltoolindividual.h             |   8 +-
 indra/newview/lltoolobjpicker.h              |  14 +--
 indra/newview/lltoolpie.h                    |  32 +++---
 indra/newview/lltoolpipette.h                |   8 +-
 indra/newview/lltoolselectland.h             |  16 +--
 indra/newview/llversioninfo.h                |   2 +-
 indra/newview/llviewerhelp.h                 |  10 +-
 indra/newview/llviewermedia.h                |   2 +-
 indra/newview/llviewermediafocus.h           |  16 +--
 indra/newview/llviewerparcelaskplay.h        |   4 +-
 indra/newview/llviewerparcelmedia.h          |   2 +-
 indra/newview/llviewerparcelmediaautoplay.h  |   2 +-
 indra/newview/llviewertexturelist.h          |   6 +-
 indra/newview/llvoicechannel.h               |  22 ++--
 indra/newview/llvoicevivox.h                 | 144 +++++++++++++--------------
 indra/newview/llwearableitemslist.h          |   6 +-
 indra/newview/llwindebug.h                   |   4 +-
 54 files changed, 273 insertions(+), 296 deletions(-)

diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
index 793a33cc87..1fbe19ddd1 100644
--- a/indra/llappearance/llwearabletype.h
+++ b/indra/llappearance/llwearabletype.h
@@ -37,7 +37,7 @@ class LLWearableType : public LLParamSingleton<LLWearableType>
 {
 	LLSINGLETON(LLWearableType, LLTranslationBridge::ptr_t &trans);
 	~LLWearableType();
-	void initSingleton();
+	void initSingleton() override;
 public: 
 	enum EType
 	{
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h
index 966ce03296..fd878f20ad 100644
--- a/indra/llcommon/llcoros.h
+++ b/indra/llcommon/llcoros.h
@@ -92,7 +92,7 @@ class LL_COMMON_API LLCoros: public LLSingleton<LLCoros>
     LLSINGLETON(LLCoros);
     ~LLCoros();
 
-    void cleanupSingleton();
+    void cleanupSingleton() override;
 public:
     /// The viewer's use of the term "coroutine" became deeply embedded before
     /// the industry term "fiber" emerged to distinguish userland threads from
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 51ef514cf7..cbe5ab6406 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -802,7 +802,7 @@ public:
 private:                                                                \
     /* implement LLSingleton pure virtual method whose sole purpose */  \
     /* is to remind people to use this macro */                         \
-    virtual void you_must_use_LLSINGLETON_macro() {}                    \
+    virtual void you_must_use_LLSINGLETON_macro() override {}                    \
     friend class LLSingleton<DERIVED_CLASS>;                            \
     DERIVED_CLASS(__VA_ARGS__)
 
diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp
index 15ffe68e67..6f8aaaa0cb 100644
--- a/indra/llcommon/tests/llsingleton_test.cpp
+++ b/indra/llcommon/tests/llsingleton_test.cpp
@@ -47,8 +47,8 @@ public:                                             \
         DEP_INIT  /* dependency in initSingleton */ \
     } sDepFlag;                                     \
                                                     \
-    void initSingleton();                           \
-    void cleanupSingleton();                        \
+    void initSingleton() override;                  \
+    void cleanupSingleton() override;               \
 };                                                  \
                                                     \
 CLS::dep_flag CLS::sDepFlag = DEP_NONE
@@ -300,7 +300,7 @@ namespace tut
     {
         LLSINGLETON_EMPTY_CTOR(CircularPInit);
     public:
-        virtual void initSingleton()
+        virtual void initSingleton() override
         {
             // never mind indirection, just go straight for the circularity
             CircularPInit *pt = getInstance();
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index 675da65af2..818a8b5cc3 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -60,7 +60,7 @@ class LLFolderDictionary : public LLSingleton<LLFolderDictionary>,
 {
 	LLSINGLETON(LLFolderDictionary);
 protected:
-	virtual LLFolderType::EType notFound() const
+	virtual LLFolderType::EType notFound() const override
 	{
 		return LLFolderType::FT_NONE;
 	}
diff --git a/indra/llinventory/llinventorysettings.cpp b/indra/llinventory/llinventorysettings.cpp
index 81485b3a97..bc604097da 100644
--- a/indra/llinventory/llinventorysettings.cpp
+++ b/indra/llinventory/llinventorysettings.cpp
@@ -62,7 +62,7 @@ class LLSettingsDictionary : public LLSingleton<LLSettingsDictionary>,
 {
     LLSINGLETON(LLSettingsDictionary);
 
-    void initSingleton();
+    void initSingleton() override;
 };
 
 LLSettingsDictionary::LLSettingsDictionary() 
diff --git a/indra/llmessage/llexperiencecache.h b/indra/llmessage/llexperiencecache.h
index 1c97133723..8be4c64dfc 100644
--- a/indra/llmessage/llexperiencecache.h
+++ b/indra/llmessage/llexperiencecache.h
@@ -106,7 +106,7 @@ public:
 private:
     virtual ~LLExperienceCache();
 
-    virtual void initSingleton();
+    virtual void initSingleton() override;
 
     typedef boost::function<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &, LLCore::HttpRequest::ptr_t, std::string)> permissionInvoker_fn;
 
diff --git a/indra/llmessage/llproxy.h b/indra/llmessage/llproxy.h
index 25f6977e14..8a64cdbfaa 100644
--- a/indra/llmessage/llproxy.h
+++ b/indra/llmessage/llproxy.h
@@ -226,7 +226,7 @@ class LLProxy: public LLSingleton<LLProxy>
 	LLSINGLETON(LLProxy);
 	LOG_CLASS(LLProxy);
 
-    /*virtual*/ void initSingleton();
+    /*virtual*/ void initSingleton() override;
 
 public:
 	// Static check for enabled status for UDP packets. Call from main thread only.
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 921398a693..4d9a33f1d7 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -913,7 +913,7 @@ public:
 	/* virtual */ LLNotificationPtr add(const std::string& name, 
 						const LLSD& substitutions, 
 						const LLSD& payload, 
-						LLNotificationFunctorRegistry::ResponseFunctor functor);
+						LLNotificationFunctorRegistry::ResponseFunctor functor) override;
 	LLNotificationPtr add(const LLNotification::Params& p);
 
 	void add(const LLNotificationPtr pNotif);
@@ -964,8 +964,8 @@ public:
 	bool isVisibleByRules(LLNotificationPtr pNotification);
 	
 private:
-	/*virtual*/ void initSingleton();
-	/*virtual*/ void cleanupSingleton();
+	/*virtual*/ void initSingleton() override;
+	/*virtual*/ void cleanupSingleton() override;
 	
 	void loadPersistentNotifications();
 
diff --git a/indra/llui/llspellcheck.h b/indra/llui/llspellcheck.h
index 3da5e30955..14f9b44fe4 100644
--- a/indra/llui/llspellcheck.h
+++ b/indra/llui/llspellcheck.h
@@ -47,7 +47,7 @@ public:
 protected:
 	void addToDictFile(const std::string& dict_path, const std::string& word);
 	void initHunspell(const std::string& dict_language);
-	void initSingleton();
+	void initSingleton() override;
 
 public:
 	typedef std::list<std::string> dict_list_t;
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 82a3c01c6d..1389fc2a14 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1979,19 +1979,8 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getEditableSegIterContaini
 
 LLTextBase::segment_set_t::iterator LLTextBase::getSegIterContaining(S32 index)
 {
-
 	static LLPointer<LLIndexSegment> index_segment = new LLIndexSegment();
 
-	S32 text_len = 0;
-	if (!useLabel())
-	{
-		text_len = getLength();
-	}
-	else
-	{
-		text_len = mLabel.getWString().length();
-	}
-
 	if (index > text_len) { return mSegments.end(); }
 
 	// when there are no segments, we return the end iterator, which must be checked by caller
@@ -2007,16 +1996,6 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 i
 {
 	static LLPointer<LLIndexSegment> index_segment = new LLIndexSegment();
 
-	S32 text_len = 0;
-	if (!useLabel())
-	{
-		text_len = getLength();
-	}
-	else
-	{
-		text_len = mLabel.getWString().length();
-	}
-
 	if (index > text_len) { return mSegments.end(); }
 
 	// when there are no segments, we return the end iterator, which must be checked by caller
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 67dd24341c..d71dc8d859 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -263,7 +263,7 @@ public:
 	class LLTextInputFilter : public LLQueryFilter, public LLSingleton<LLTextInputFilter>
 	{
 		LLSINGLETON_EMPTY_CTOR(LLTextInputFilter);
-		/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
+		/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override
 		{
 			return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->acceptsTextInput(), TRUE);
 		}
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 9ba71913d0..5e74817f1f 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1953,7 +1953,7 @@ private:
 class SortByTabOrder : public LLQuerySorter, public LLSingleton<SortByTabOrder>
 {
 	LLSINGLETON_EMPTY_CTOR(SortByTabOrder);
-	/*virtual*/ void sort(LLView * parent, LLView::child_list_t &children) const 
+	/*virtual*/ void sort(LLView * parent, LLView::child_list_t &children) const override
 	{
 		children.sort(CompareByTabOrder(parent->getTabOrder(), parent->getDefaultTabGroup()));
 	}
@@ -1977,7 +1977,7 @@ const LLViewQuery & LLView::getTabOrderQuery()
 class LLFocusRootsFilter : public LLQueryFilter, public LLSingleton<LLFocusRootsFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLFocusRootsFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override
 	{
 		return filterResult_t(view->isCtrl() && view->isFocusRoot(), !view->isFocusRoot());
 	}
diff --git a/indra/llui/llviewquery.h b/indra/llui/llviewquery.h
index 21bb1be26f..4bc9c4a08e 100644
--- a/indra/llui/llviewquery.h
+++ b/indra/llui/llviewquery.h
@@ -55,37 +55,37 @@ public:
 class LLLeavesFilter : public LLQueryFilter, public LLSingleton<LLLeavesFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLLeavesFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLRootsFilter : public LLQueryFilter, public LLSingleton<LLRootsFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLRootsFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLVisibleFilter : public LLQueryFilter, public LLSingleton<LLVisibleFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLVisibleFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLEnabledFilter : public LLQueryFilter, public LLSingleton<LLEnabledFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLEnabledFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLTabStopFilter : public LLQueryFilter, public LLSingleton<LLTabStopFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLTabStopFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 class LLCtrlFilter : public LLQueryFilter, public LLSingleton<LLCtrlFilter>
 {
 	LLSINGLETON_EMPTY_CTOR(LLCtrlFilter);
-	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+	/*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const override;
 };
 
 template <class T>
diff --git a/indra/newview/llautoreplace.h b/indra/newview/llautoreplace.h
index 23cc313646..a1eebf9dcb 100644
--- a/indra/newview/llautoreplace.h
+++ b/indra/newview/llautoreplace.h
@@ -203,7 +203,7 @@ public:
     void setSettings(const LLAutoReplaceSettings& settings);
 
 private:
-    /*virtual*/ void initSingleton();
+    /*virtual*/ void initSingleton() override;
 
     LLAutoReplaceSettings mSettings; ///< configuration information
 	
diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index 8abe350196..22ae595d66 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -46,7 +46,7 @@ class LLChannelManager : public LLSingleton<LLChannelManager>
 	LLSINGLETON(LLChannelManager);
 	virtual ~LLChannelManager();
 
-	void cleanupSingleton();
+	void cleanupSingleton() override;
 public:
 
 
diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h
index 6c521dc1d5..c295b99962 100644
--- a/indra/newview/llchicletbar.h
+++ b/indra/newview/llchicletbar.h
@@ -43,11 +43,11 @@ class LLChicletBar
 
 public:
 
-	BOOL postBuild();
+	BOOL postBuild() override;
 
 	LLChicletPanel*	getChicletPanel() { return mChicletPanel; }
 
-	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
+	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 
 	/**
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h
index 820a5db491..54aeedcf9a 100644
--- a/indra/newview/llconversationlog.h
+++ b/indra/newview/llconversationlog.h
@@ -125,11 +125,11 @@ public:
 	void removeObserver(LLConversationLogObserver* observer);
 
 	// LLIMSessionObserver triggers
-	virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg);
-    virtual void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) {}; // Stub
-	virtual void sessionRemoved(const LLUUID& session_id){}											// Stub
-	virtual void sessionVoiceOrIMStarted(const LLUUID& session_id){};								// Stub
-	virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id){};	// Stub
+	virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) override;
+    virtual void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) override {}; // Stub
+	virtual void sessionRemoved(const LLUUID& session_id) override{}											// Stub
+	virtual void sessionVoiceOrIMStarted(const LLUUID& session_id) override{};								// Stub
+	virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) override{};	// Stub
 
 	void notifyObservers();
 
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index 42a226cd18..d9269224af 100644
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -101,7 +101,7 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag
 	~LLFeatureManager() {cleanupFeatureTables();}
 
 	// initialize this by loading feature table and gpu table
-	void initSingleton();
+	void initSingleton() override;
 
 public:
 
diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
index f5679d7d85..ef0dda7949 100644
--- a/indra/newview/llfriendcard.h
+++ b/indra/newview/llfriendcard.h
@@ -55,7 +55,7 @@ public:
     };
 
 	// LLFriendObserver implementation
-	void changed(U32 mask)
+	void changed(U32 mask) override
 	{
 		onFriendListUpdate(mask);
 	}
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index 7c8e8279c2..7bb60f00e2 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -135,7 +135,7 @@ public:
 	void notifyObservers();
 
 	// Overriding so we can update active gesture names and notify observers 
-	void changed(U32 mask); 
+	void changed(U32 mask) override;
 
 	BOOL matchPrefix(const std::string& in_str, std::string* out_str);
 
@@ -150,7 +150,7 @@ protected:
 	void runStep(LLMultiGesture* gesture, LLGestureStep* step);
 
 	// LLInventoryCompletionObserver trigger
-	void done();
+	void done() override;
 
 	// Used by loadGesture
 	static void onLoadComplete(const LLUUID& asset_uuid,
diff --git a/indra/newview/llimagefiltersmanager.h b/indra/newview/llimagefiltersmanager.h
index d06212d85a..05d1806da4 100644
--- a/indra/newview/llimagefiltersmanager.h
+++ b/indra/newview/llimagefiltersmanager.h
@@ -45,7 +45,7 @@ private:
 	void loadAllFilters();
 	void loadFiltersFromDir(const std::string& dir);
     
-	/*virtual*/ void initSingleton();
+	/*virtual*/ void initSingleton() override;
     
 	// List of filters : first is the user friendly localized name, second is the xml file name
     std::map<std::string,std::string> mFiltersList;
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 326e8f22e3..353373f3b4 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -506,7 +506,7 @@ public:
 	static void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent);
 
 private:
-	void initSingleton();
+	void initSingleton() override;
 	void onVoiceChannelChangedInt(const LLUUID &session_id);
 	void onVoiceChannelStateChangedInt(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction, bool ended_by_agent);
 
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index 0d426fbd48..f86c2acd10 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -73,7 +73,7 @@ class LLMuteList : public LLSingleton<LLMuteList>
 {
 	LLSINGLETON(LLMuteList);
 	~LLMuteList();
-	/*virtual*/ void cleanupSingleton();
+	/*virtual*/ void cleanupSingleton() override;
 public:
 	// reasons for auto-unmuting a resident
 	enum EAutoReason 
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index 11c671294a..4649f5bcb0 100755
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -92,10 +92,10 @@ class LLNavigationBar
 
 public:
 	
-	/*virtual*/ void	draw();
-	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL	postBuild();
-	/*virtual*/ void	setVisible(BOOL visible);
+	/*virtual*/ void	draw() override;
+	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL	postBuild() override;
+	/*virtual*/ void	setVisible(BOOL visible) override;
 
 	void handleLoginComplete();
 	void clearHistoryCache();
diff --git a/indra/newview/lloutfitobserver.h b/indra/newview/lloutfitobserver.h
index 77041db68d..77bb3543aa 100644
--- a/indra/newview/lloutfitobserver.h
+++ b/indra/newview/lloutfitobserver.h
@@ -41,7 +41,7 @@ class LLOutfitObserver: public LLInventoryObserver, public LLSingleton<LLOutfitO
 
 public:
 
-	virtual void changed(U32 mask);
+	virtual void changed(U32 mask) override;
 
 	void notifyOutfitLockChanged() { mOutfitLockChanged();  }
 
diff --git a/indra/newview/llpaneltopinfobar.h b/indra/newview/llpaneltopinfobar.h
index 78dd997029..b6c263e331 100644
--- a/indra/newview/llpaneltopinfobar.h
+++ b/indra/newview/llpaneltopinfobar.h
@@ -46,8 +46,8 @@ class LLPanelTopInfoBar : public LLPanel, public LLSingleton<LLPanelTopInfoBar>,
 public:
 	typedef boost::signals2::signal<void ()> resize_signal_t;
 
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void draw();
+	/*virtual*/ BOOL postBuild() override;
+	/*virtual*/ void draw() override;
 
 	/**
 	 * Updates location and parcel icons on login complete
@@ -83,7 +83,7 @@ private:
 	 */
 	void initParcelIcons();
 
-	BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+	BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
 
 	/**
 	 * Handles clicks on the parcel icons.
diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h
index 88cb3a15f8..f98624e30d 100644
--- a/indra/newview/llpathfindingpathtool.h
+++ b/indra/newview/llpathfindingpathtool.h
@@ -66,17 +66,17 @@ public:
 	typedef boost::signals2::signal<void (void)> path_event_signal_t;
 	typedef boost::signals2::connection          path_event_slot_t;
 
-	virtual BOOL      handleMouseDown(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleMouseUp(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleRightMouseDown(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleRightMouseUp(S32 pX, S32 pY, MASK pMask);
-	virtual BOOL      handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL      handleMouseDown(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleMouseUp(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleRightMouseDown(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleRightMouseUp(S32 pX, S32 pY, MASK pMask) override;
+	virtual BOOL      handleDoubleClick(S32 x, S32 y, MASK mask) override;
 
-	virtual BOOL      handleHover(S32 pX, S32 pY, MASK pMask);
+	virtual BOOL      handleHover(S32 pX, S32 pY, MASK pMask) override;
 
-	virtual BOOL      handleKey(KEY pKey, MASK pMask);
+	virtual BOOL      handleKey(KEY pKey, MASK pMask) override;
 
 	EPathStatus       getPathStatus() const;
 
diff --git a/indra/newview/llproductinforequest.h b/indra/newview/llproductinforequest.h
index d1036374e8..0b94c39d11 100644
--- a/indra/newview/llproductinforequest.h
+++ b/indra/newview/llproductinforequest.h
@@ -46,7 +46,7 @@ public:
 	std::string getDescriptionForSku(const std::string& sku);
 
 private:
-	/* virtual */ void initSingleton();
+	/* virtual */ void initSingleton() override;
 
     void getLandDescriptionsCoro(std::string url);
     LLSD mSkuDescriptions;
diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h
index 1b322f2c0a..0c04222a9f 100644
--- a/indra/newview/llrecentpeople.h
+++ b/indra/newview/llrecentpeople.h
@@ -106,7 +106,7 @@ public:
 	/**
 	 * LLSimpleListener interface.
 	 */
-	/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
+	/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata) override;
 
 	void updateAvatarsArrivalTime(uuid_vec_t& uuids);
 	F32 getArrivalTimeByID(const LLUUID& id);
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index ed795b5155..22c9481687 100644
--- a/indra/newview/llspeakers.h
+++ b/indra/newview/llspeakers.h
@@ -338,7 +338,7 @@ class LLActiveSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLActiveSpeak
 	LOG_CLASS(LLActiveSpeakerMgr);
 
 protected:
-	virtual void updateSpeakerList();
+	virtual void updateSpeakerList() override;
 };
 
 class LLLocalSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLLocalSpeakerMgr>
@@ -347,7 +347,7 @@ class LLLocalSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLLocalSpeaker
 	~LLLocalSpeakerMgr ();
 	LOG_CLASS(LLLocalSpeakerMgr);
 protected:
-	virtual void updateSpeakerList();
+	virtual void updateSpeakerList() override;
 };
 
 #endif // LL_LLSPEAKERS_H
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
index 0111d8869c..37c7ea55ae 100644
--- a/indra/newview/llspeakingindicatormanager.cpp
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -88,7 +88,7 @@ public:
 	 * So, method does not calculate difference between these list it only switches off already 
 	 * switched on indicators and switches on indicators of voice channel participants
 	 */
-	void onParticipantsChanged();
+	void onParticipantsChanged() override;
 	
 private:
 	typedef std::set<LLUUID> speaker_ids_t;
diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h
index c108d83256..6545ee3611 100644
--- a/indra/newview/lltoolbrush.h
+++ b/indra/newview/lltoolbrush.h
@@ -49,27 +49,27 @@ class LLToolBrushLand : public LLTool, public LLEditMenuHandler, public LLSingle
 public:
 	
 	// x,y in window coords, 0,0 = left,bot
-	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
-	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );		
-	virtual BOOL handleHover( S32 x, S32 y, MASK mask );
-	virtual void handleSelect();
-	virtual void handleDeselect();
+	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask ) override;
+	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask ) override;
+	virtual BOOL handleHover( S32 x, S32 y, MASK mask ) override;
+	virtual void handleSelect() override;
+	virtual void handleDeselect() override;
 
 	// isAlwaysRendered() - return true if this is a tool that should
 	// always be rendered regardless of selection.
-	virtual BOOL isAlwaysRendered() { return TRUE; }
+	virtual BOOL isAlwaysRendered()  override { return TRUE; }
 
 	// Draw the area that will be affected.
-	virtual void render();
+	virtual void render() override;
 
 	// on Idle is where the land modification actually occurs
 	static void onIdle(void* brush_tool);  
 
-	void			onMouseCaptureLost();
+	void onMouseCaptureLost() override;
 
 	void modifyLandInSelectionGlobal();
-	virtual void	undo();
-	virtual BOOL	canUndo() const	{ return TRUE; }
+	virtual void	undo() override;
+	virtual BOOL	canUndo() const	 override { return TRUE; }
 
 protected:
 	void brush( void );
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h
index 86506f725e..f539a045b7 100644
--- a/indra/newview/lltoolcomp.h
+++ b/indra/newview/lltoolcomp.h
@@ -108,11 +108,11 @@ class LLToolCompInspect : public LLToolComposite, public LLSingleton<LLToolCompI
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleKey(KEY key, MASK mask);
-	virtual void		onMouseCaptureLost();
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleKey(KEY key, MASK mask) override;
+	virtual void		onMouseCaptureLost() override;
 			void		keyUp(KEY key, MASK mask);
 
 	static void pickCallback(const LLPickInfo& pick_info);
@@ -133,13 +133,13 @@ class LLToolCompTranslate : public LLToolComposite, public LLSingleton<LLToolCom
 public:
 
 	// Overridden from LLToolComposite
-	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
-	virtual void		render();
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;			// Returns to the default tool
+	virtual void		render() override;
 
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 
 	static void pickCallback(const LLPickInfo& pick_info);
 };
@@ -154,13 +154,13 @@ class LLToolCompScale : public LLToolComposite, public LLSingleton<LLToolCompSca
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
-	virtual void		render();
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;			// Returns to the default tool
+	virtual void		render() override;
 
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 	
 	static void pickCallback(const LLPickInfo& pick_info);
 };
@@ -176,13 +176,13 @@ class LLToolCompRotate : public LLToolComposite, public LLSingleton<LLToolCompRo
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual void		render();
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual void		render() override;
 
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 
 	static void pickCallback(const LLPickInfo& pick_info);
 
@@ -199,9 +199,9 @@ class LLToolCompCreate : public LLToolComposite, public LLSingleton<LLToolCompCr
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
+    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
 	
 	static void pickCallback(const LLPickInfo& pick_info);
 protected:
@@ -224,16 +224,16 @@ class LLToolCompGun : public LLToolComposite, public LLSingleton<LLToolCompGun>
 public:
 
 	// Overridden from LLToolComposite
-    virtual BOOL			handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleRightMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL			handleScrollWheel(S32 x, S32 y, S32 clicks);
-	virtual void			onMouseCaptureLost();
-	virtual void			handleSelect();
-	virtual void			handleDeselect();
-	virtual LLTool*			getOverrideTool(MASK mask) { return NULL; }
+    virtual BOOL			handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL			handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+	virtual void			onMouseCaptureLost() override;
+	virtual void			handleSelect() override;
+	virtual void			handleDeselect() override;
+	virtual LLTool*			getOverrideTool(MASK mask) override { return NULL; }
 
 protected:
 	LLToolGun*			mGun;
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h
index 4537d73332..8ec027cb0e 100644
--- a/indra/newview/lltooldraganddrop.h
+++ b/indra/newview/lltooldraganddrop.h
@@ -48,12 +48,12 @@ public:
 	typedef boost::signals2::signal<void ()> enddrag_signal_t;
 
 	// overridden from LLTool
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleKey(KEY key, MASK mask);
-	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask);
-	virtual void	onMouseCaptureLost();
-	virtual void	handleDeselect();
+	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleKey(KEY key, MASK mask) override;
+	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask) override;
+	virtual void	onMouseCaptureLost() override;
+	virtual void	handleDeselect() override;
 
 	void			setDragStart( S32 x, S32 y );			// In screen space
 	BOOL			isOverThreshold( S32 x, S32 y );		// In screen space
diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h
index e4b8ae12b8..7c8ff20480 100644
--- a/indra/newview/lltoolface.h
+++ b/indra/newview/lltoolface.h
@@ -39,11 +39,11 @@ class LLToolFace
 	virtual ~LLToolFace();
 public:
 
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual void	handleSelect();
-	virtual void	handleDeselect();
-	virtual void	render();			// draw face highlights
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual void	handleSelect() override;
+	virtual void	handleDeselect() override;
+	virtual void	render() override;			// draw face highlights
 
 	static void pickCallback(const LLPickInfo& pick_info);
 };
diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h
index cfc235b6c2..c9dd39ff4b 100644
--- a/indra/newview/lltoolfocus.h
+++ b/indra/newview/lltoolfocus.h
@@ -38,16 +38,16 @@ class LLToolCamera
 	virtual ~LLToolCamera();
 public:
 
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
 
-	virtual void	onMouseCaptureLost();
+	virtual void	onMouseCaptureLost() override;
 
-	virtual void	handleSelect();
-	virtual void	handleDeselect();
+	virtual void	handleSelect() override;
+	virtual void	handleDeselect() override;
 
-	virtual LLTool*	getOverrideTool(MASK mask) { return NULL; }
+	virtual LLTool*	getOverrideTool(MASK mask) override { return NULL; }
 
 	static void pickCallback(const LLPickInfo& pick_info);
 	BOOL mouseSteerMode() { return mMouseSteering; }
diff --git a/indra/newview/lltoolindividual.h b/indra/newview/lltoolindividual.h
index e7c2060fba..89dd9d9796 100644
--- a/indra/newview/lltoolindividual.h
+++ b/indra/newview/lltoolindividual.h
@@ -43,11 +43,9 @@ class LLToolIndividual : public LLTool, public LLSingleton<LLToolIndividual>
 	virtual ~LLToolIndividual();
 public:
 
-	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
-	virtual void handleSelect();
-	//virtual void handleDeselect();
-	//virtual void render();
+	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	virtual void handleSelect() override;
 
 	static void pickCallback(const LLPickInfo& pick_info);
 
diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h
index 5ad9b67e21..a55cd223de 100644
--- a/indra/newview/lltoolobjpicker.h
+++ b/indra/newview/lltoolobjpicker.h
@@ -38,16 +38,16 @@ class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker>
 	LLSINGLETON(LLToolObjPicker);
 public:
 
-	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
 
-	virtual void 		handleSelect();
-	virtual void 		handleDeselect();
+	virtual void 		handleSelect() override;
+	virtual void 		handleDeselect() override;
 
-	virtual void		onMouseCaptureLost();
+	virtual void		onMouseCaptureLost() override;
 
-	virtual void 		setExitCallback(void (*callback)(void *), void *callback_data);
+	void 		setExitCallback(void (*callback)(void *), void *callback_data);
 
 	LLUUID				getObjectID() const { return mHitObjectID; }
 
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index 8f6100e4b4..dca0d12cf6 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -42,26 +42,26 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
 public:
 
 	// Virtual functions inherited from LLMouseHandler
-	virtual BOOL		handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
-	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleRightMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleRightMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down) override;
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleRightMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
 	BOOL				handleScrollWheelAny(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
-	virtual BOOL		handleScrollWheel(S32 x, S32 y, S32 clicks);
-	virtual BOOL		handleScrollHWheel(S32 x, S32 y, S32 clicks);
-	virtual BOOL		handleToolTip(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+	virtual BOOL		handleScrollHWheel(S32 x, S32 y, S32 clicks) override;
+	virtual BOOL		handleToolTip(S32 x, S32 y, MASK mask) override;
 
-	virtual void		render();
+	virtual void		render() override;
 
-	virtual void		stopEditing();
+	virtual void		stopEditing() override;
 
-	virtual void		onMouseCaptureLost();
-	virtual void		handleSelect();
-	virtual void		handleDeselect();
-	virtual LLTool*		getOverrideTool(MASK mask);
+	virtual void		onMouseCaptureLost() override;
+	virtual void		handleSelect() override;
+	virtual void		handleDeselect() override;
+	virtual LLTool*		getOverrideTool(MASK mask) override;
 
 	LLPickInfo&			getPick() { return mPick; }
 	U8					getClickAction() { return mClickAction; }
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index 7575d8ad18..2636811c66 100644
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -47,10 +47,10 @@ class LLToolPipette
 	virtual ~LLToolPipette();
 
 public:
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask);
+	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
+	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask) override;
 
 	// Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots
 	typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t;
diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h
index b5ba72f16d..88bc4e2e3d 100644
--- a/indra/newview/lltoolselectland.h
+++ b/indra/newview/lltoolselectland.h
@@ -39,15 +39,15 @@ class LLToolSelectLand
 	virtual ~LLToolSelectLand();
 
 public:
-	/*virtual*/ BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ void		render();				// draw the select rectangle
-	/*virtual*/ BOOL		isAlwaysRendered()		{ return TRUE; }
+	/*virtual*/ BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ void		render() override;				// draw the select rectangle
+	/*virtual*/ BOOL		isAlwaysRendered() override	{ return TRUE; }
 
-	/*virtual*/ void		handleSelect();
-	/*virtual*/ void		handleDeselect();
+	/*virtual*/ void		handleSelect() override;
+	/*virtual*/ void		handleDeselect() override;
 
 protected:
 	BOOL			outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h
index 02ff0c094a..37382243f6 100644
--- a/indra/newview/llversioninfo.h
+++ b/indra/newview/llversioninfo.h
@@ -47,7 +47,7 @@ class LLStoreListener;
 class LLVersionInfo: public LLSingleton<LLVersionInfo>
 {
 	LLSINGLETON(LLVersionInfo);
-	void initSingleton();
+	void initSingleton() override;
 public:
 	~LLVersionInfo();
 
diff --git a/indra/newview/llviewerhelp.h b/indra/newview/llviewerhelp.h
index da50e07a43..bbd20bc07e 100644
--- a/indra/newview/llviewerhelp.h
+++ b/indra/newview/llviewerhelp.h
@@ -43,21 +43,21 @@ class LLViewerHelp : public LLHelp, public LLSingleton<LLViewerHelp>
 
  public:
 	/// display the specified help topic in the help viewer
-	/*virtual*/ void showTopic(const std::string &topic);
+	/*virtual*/ void showTopic(const std::string &topic) override;
 
-	std::string getURL(const std::string& topic);
+	std::string getURL(const std::string& topic) override;
 
 	// return topic derived from viewer UI focus, else default topic
 	std::string getTopicFromFocus();
 
 	/// return default (fallback) topic name suitable for showTopic()
-	/*virtual*/ std::string defaultTopic();
+	/*virtual*/ std::string defaultTopic() override;
 
 	// return topic to use before the user logs in
-	/*virtual*/ std::string preLoginTopic();
+	/*virtual*/ std::string preLoginTopic() override;
 
 	// return topic to use for the top-level help, invoked by F1
-	/*virtual*/ std::string f1HelpTopic();
+	/*virtual*/ std::string f1HelpTopic() override;
 };
 
 #endif // header guard
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index f1f42afd81..ad7c4bcefa 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -74,7 +74,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia>
 {
 	LLSINGLETON(LLViewerMedia);
 	~LLViewerMedia();
-	void initSingleton();
+	void initSingleton() override;
 	LOG_CLASS(LLViewerMedia);
 
 public:
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h
index effd08a559..2310e4dbfc 100644
--- a/indra/newview/llviewermediafocus.h
+++ b/indra/newview/llviewermediafocus.h
@@ -54,10 +54,10 @@ public:
 	void setHoverFace(LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl, LLVector3 pick_normal = LLVector3::zero);
 	void clearHover();
 	
-	/*virtual*/ bool	getFocus();
-	/*virtual*/ BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent);
-	/*virtual*/ BOOL	handleKeyUp(KEY key, MASK mask, BOOL called_from_parent);
-	/*virtual*/ BOOL	handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
+	bool	getFocus();
+	/*virtual*/ BOOL	handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
+	/*virtual*/ BOOL	handleKeyUp(KEY key, MASK mask, BOOL called_from_parent) override;
+	/*virtual*/ BOOL	handleUnicodeChar(llwchar uni_char, BOOL called_from_parent) override;
 	BOOL handleScrollWheel(const LLVector2& texture_coords, S32 clicks_x, S32 clicks_y);
 	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks_x, S32 clicks_y);
 
@@ -92,12 +92,12 @@ public:
 	LLUUID getControlsMediaID();
 
     // The MoaP object wants keyup and keydown events.  Overridden to return true.
-    virtual bool    wantsKeyUpKeyDown() const;
-    virtual bool    wantsReturnKey() const;
+    virtual bool    wantsKeyUpKeyDown() const override;
+    virtual bool    wantsReturnKey() const override;
 
 protected:
-	/*virtual*/ void	onFocusReceived();
-	/*virtual*/ void	onFocusLost();
+	/*virtual*/ void	onFocusReceived() override;
+	/*virtual*/ void	onFocusLost() override;
 
 private:
 	
diff --git a/indra/newview/llviewerparcelaskplay.h b/indra/newview/llviewerparcelaskplay.h
index dc711917d2..56faddae66 100644
--- a/indra/newview/llviewerparcelaskplay.h
+++ b/indra/newview/llviewerparcelaskplay.h
@@ -34,8 +34,8 @@ class LLViewerParcelAskPlay : public LLSingleton<LLViewerParcelAskPlay>
 {
     LLSINGLETON(LLViewerParcelAskPlay);
     ~LLViewerParcelAskPlay();
-    void initSingleton();
-    void cleanupSingleton();
+    void initSingleton() override;
+    void cleanupSingleton() override;
 public:
     // functor expects functor(region_id, parcel_id, url, play/stop)
     typedef boost::function<void(const LLUUID&, const S32&, const std::string&, const bool&)> ask_callback;
diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h
index 779a65bdf8..790b2b71fc 100644
--- a/indra/newview/llviewerparcelmedia.h
+++ b/indra/newview/llviewerparcelmedia.h
@@ -74,7 +74,7 @@ public:
 	void sendMediaNavigateMessage(const std::string& url);
 
 	// inherited from LLViewerMediaObserver
-	virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+	virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
 
 private:
 	void processParcelMediaCommandMessage(LLMessageSystem *msg);
diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h
index d71fd4c075..e83085dee0 100644
--- a/indra/newview/llviewerparcelmediaautoplay.h
+++ b/indra/newview/llviewerparcelmediaautoplay.h
@@ -35,7 +35,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer, public LLSingleton<LLViewerPar
 {
 	LLSINGLETON(LLViewerParcelMediaAutoPlay);
 public:
-	virtual BOOL tick();
+	virtual BOOL tick() override;
 	static void playStarted();
 
  private:
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 0018e78d45..f159682b67 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -242,9 +242,9 @@ class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIIm
 	LLSINGLETON_EMPTY_CTOR(LLUIImageList);
 public:
 	// LLImageProviderInterface
-	/*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority);
-	/*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority);
-	void cleanUp();
+	/*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority) override;
+	/*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority) override;
+	void cleanUp() override;
 
 	bool initFromFile();
 
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 309c3eebdd..e68bfbe1ff 100644
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -170,12 +170,12 @@ class LLVoiceChannelProximal : public LLVoiceChannel, public LLSingleton<LLVoice
 	LLSINGLETON(LLVoiceChannelProximal);
 public:
 
-	/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal);
-	/*virtual*/ void handleStatusChange(EStatusType status);
-	/*virtual*/ void handleError(EStatusType status);
-	/*virtual*/ BOOL isActive();
-	/*virtual*/ void activate();
-	/*virtual*/ void deactivate();
+	/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal) override;
+	/*virtual*/ void handleStatusChange(EStatusType status) override;
+	/*virtual*/ void handleError(EStatusType status) override;
+	/*virtual*/ BOOL isActive() override;
+	/*virtual*/ void activate() override;
+	/*virtual*/ void deactivate() override;
 
 };
 
@@ -184,15 +184,15 @@ class LLVoiceChannelP2P : public LLVoiceChannelGroup
 public:
 	LLVoiceChannelP2P(const LLUUID& session_id, const std::string& session_name, const LLUUID& other_user_id);
 
-	/*virtual*/ void handleStatusChange(EStatusType status);
-	/*virtual*/ void handleError(EStatusType status);
-    /*virtual*/ void activate();
-	/*virtual*/ void getChannelInfo();
+	/*virtual*/ void handleStatusChange(EStatusType status) override;
+	/*virtual*/ void handleError(EStatusType status) override;
+    /*virtual*/ void activate() override;
+	/*virtual*/ void getChannelInfo() override;
 
 	void setSessionHandle(const std::string& handle, const std::string &inURI);
 
 protected:
-	virtual void setState(EState state);
+	virtual void setState(EState state) override;
 
 private:
 
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 0a785401c1..3df5cd33ac 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -64,26 +64,26 @@ public:
 	/// @name LLVoiceModuleInterface virtual implementations
 	///  @see LLVoiceModuleInterface
 	//@{
-	virtual void init(LLPumpIO *pump);	// Call this once at application startup (creates connector)
-	virtual void terminate();	// Call this to clean up during shutdown
+	virtual void init(LLPumpIO *pump) override;	// Call this once at application startup (creates connector)
+	virtual void terminate() override;	// Call this to clean up during shutdown
 	
-	virtual const LLVoiceVersionInfo& getVersion();
+	virtual const LLVoiceVersionInfo& getVersion() override;
 	
-	virtual void updateSettings(); // call after loading settings and whenever they change
+	virtual void updateSettings() override; // call after loading settings and whenever they change
 
 	// Returns true if vivox has successfully logged in and is not in error state	
-	virtual bool isVoiceWorking() const;
+	virtual bool isVoiceWorking() const override;
 
 	/////////////////////
 	/// @name Tuning
 	//@{
-	virtual void tuningStart();
-	virtual void tuningStop();
-	virtual bool inTuningMode();
+	virtual void tuningStart() override;
+	virtual void tuningStop() override;
+	virtual bool inTuningMode() override;
 	
-	virtual void tuningSetMicVolume(float volume);
-	virtual void tuningSetSpeakerVolume(float volume);
-	virtual float tuningGetEnergy(void);
+	virtual void tuningSetMicVolume(float volume) override;
+	virtual void tuningSetSpeakerVolume(float volume) override;
+	virtual float tuningGetEnergy(void) override;
 	//@}
 	
 	/////////////////////
@@ -91,40 +91,40 @@ public:
 	//@{
 	// This returns true when it's safe to bring up the "device settings" dialog in the prefs.
 	// i.e. when the daemon is running and connected, and the device lists are populated.
-	virtual bool deviceSettingsAvailable();
-	virtual bool deviceSettingsUpdated();  //return if the list has been updated and never fetched,  only to be called from the voicepanel.
+	virtual bool deviceSettingsAvailable() override;
+	virtual bool deviceSettingsUpdated() override;  //return if the list has been updated and never fetched,  only to be called from the voicepanel.
 	
 	// Requery the vivox daemon for the current list of input/output devices.
 	// If you pass true for clearCurrentList, deviceSettingsAvailable() will be false until the query has completed
 	// (use this if you want to know when it's done).
 	// If you pass false, you'll have no way to know when the query finishes, but the device lists will not appear empty in the interim.
-	virtual void refreshDeviceLists(bool clearCurrentList = true);
+	virtual void refreshDeviceLists(bool clearCurrentList = true) override;
 	
-	virtual void setCaptureDevice(const std::string& name);
-	virtual void setRenderDevice(const std::string& name);
+	virtual void setCaptureDevice(const std::string& name) override;
+	virtual void setRenderDevice(const std::string& name) override;
 	
-	virtual LLVoiceDeviceList& getCaptureDevices();
-	virtual LLVoiceDeviceList& getRenderDevices();
+	virtual LLVoiceDeviceList& getCaptureDevices() override;
+	virtual LLVoiceDeviceList& getRenderDevices() override;
 	//@}	
 	
-	virtual void getParticipantList(std::set<LLUUID> &participants);
-	virtual bool isParticipant(const LLUUID& speaker_id);
+	virtual void getParticipantList(std::set<LLUUID> &participants) override;
+	virtual bool isParticipant(const LLUUID& speaker_id) override;
 
 	// Send a text message to the specified user, initiating the session if necessary.
 	// virtual BOOL sendTextMessage(const LLUUID& participant_id, const std::string& message) const {return false;};
 	
 	// close any existing text IM session with the specified user
-	virtual void endUserIMSession(const LLUUID &uuid);
+	virtual void endUserIMSession(const LLUUID &uuid) override;
 
 	// Returns true if calling back the session URI after the session has closed is possible.
 	// Currently this will be false only for PSTN P2P calls.		
 	// NOTE: this will return true if the session can't be found. 
-	virtual BOOL isSessionCallBackPossible(const LLUUID &session_id);
+	virtual BOOL isSessionCallBackPossible(const LLUUID &session_id) override;
 	
 	// Returns true if the session can accepte text IM's.
 	// Currently this will be false only for PSTN P2P calls.
 	// NOTE: this will return true if the session can't be found. 
-	virtual BOOL isSessionTextIMPossible(const LLUUID &session_id);
+	virtual BOOL isSessionTextIMPossible(const LLUUID &session_id) override;
 	
 	
 	////////////////////////////
@@ -132,21 +132,21 @@ public:
 	//@{
 	// returns true iff the user is currently in a proximal (local spatial) channel.
 	// Note that gestures should only fire if this returns true.
-	virtual bool inProximalChannel();
+	virtual bool inProximalChannel() override;
 	
 	virtual void setNonSpatialChannel(const std::string &uri,
-									  const std::string &credentials);
+									  const std::string &credentials) override;
 	
 	virtual bool setSpatialChannel(const std::string &uri,
-								   const std::string &credentials);
+								   const std::string &credentials) override;
 	
-	virtual void leaveNonSpatialChannel();
+	virtual void leaveNonSpatialChannel() override;
 	
-	virtual void leaveChannel(void);	
+	virtual void leaveChannel(void) override;
 	
 	// Returns the URI of the current channel, or an empty string if not currently in a channel.
 	// NOTE that it will return an empty string if it's in the process of joining a channel.
-	virtual std::string getCurrentChannel();
+	virtual std::string getCurrentChannel() override;
 	//@}
 	
 	
@@ -154,59 +154,59 @@ public:
 	/// @name invitations
 	//@{
 	// start a voice channel with the specified user
-	virtual void callUser(const LLUUID &uuid);	
-	virtual bool isValidChannel(std::string &channelHandle);
-	virtual bool answerInvite(std::string &channelHandle);
-	virtual void declineInvite(std::string &channelHandle);
+	virtual void callUser(const LLUUID &uuid) override;
+	virtual bool isValidChannel(std::string &channelHandle) override;
+	virtual bool answerInvite(std::string &channelHandle) override;
+	virtual void declineInvite(std::string &channelHandle) override;
 	//@}
 	
 	/////////////////////////
 	/// @name Volume/gain
 	//@{
-	virtual void setVoiceVolume(F32 volume);
-	virtual void setMicGain(F32 volume);
+	virtual void setVoiceVolume(F32 volume) override;
+	virtual void setMicGain(F32 volume) override;
 	//@}
 	
 	/////////////////////////
 	/// @name enable disable voice and features
 	//@{
-	virtual bool voiceEnabled();
-	virtual void setVoiceEnabled(bool enabled);
-	virtual BOOL lipSyncEnabled();	
-	virtual void setLipSyncEnabled(BOOL enabled);
-	virtual void setMuteMic(bool muted);		// Set the mute state of the local mic.
+	virtual bool voiceEnabled() override;
+	virtual void setVoiceEnabled(bool enabled) override;
+	virtual BOOL lipSyncEnabled() override;
+	virtual void setLipSyncEnabled(BOOL enabled) override;
+	virtual void setMuteMic(bool muted) override;		// Set the mute state of the local mic.
 	//@}
 		
 	//////////////////////////
 	/// @name nearby speaker accessors
 	//@{
-	virtual BOOL getVoiceEnabled(const LLUUID& id);		// true if we've received data for this avatar
-	virtual std::string getDisplayName(const LLUUID& id);
-	virtual BOOL isParticipantAvatar(const LLUUID &id);
-	virtual BOOL getIsSpeaking(const LLUUID& id);
-	virtual BOOL getIsModeratorMuted(const LLUUID& id);
-	virtual F32 getCurrentPower(const LLUUID& id);		// "power" is related to "amplitude" in a defined way.  I'm just not sure what the formula is...
-	virtual BOOL getOnMuteList(const LLUUID& id);
-	virtual F32 getUserVolume(const LLUUID& id);
-	virtual void setUserVolume(const LLUUID& id, F32 volume); // set's volume for specified agent, from 0-1 (where .5 is nominal)	
+	virtual BOOL getVoiceEnabled(const LLUUID& id) override;		// true if we've received data for this avatar
+	virtual std::string getDisplayName(const LLUUID& id) override;
+	virtual BOOL isParticipantAvatar(const LLUUID &id) override;
+	virtual BOOL getIsSpeaking(const LLUUID& id) override;
+	virtual BOOL getIsModeratorMuted(const LLUUID& id) override;
+	virtual F32 getCurrentPower(const LLUUID& id) override;		// "power" is related to "amplitude" in a defined way.  I'm just not sure what the formula is...
+	virtual BOOL getOnMuteList(const LLUUID& id) override;
+	virtual F32 getUserVolume(const LLUUID& id) override;
+	virtual void setUserVolume(const LLUUID& id, F32 volume) override; // set's volume for specified agent, from 0-1 (where .5 is nominal)
 	//@}
 	
 	// authorize the user
 	virtual void userAuthorized(const std::string& user_id,
-								const LLUUID &agentID);
+								const LLUUID &agentID) override;
 	
 	//////////////////////////////
 	/// @name Status notification
 	//@{
-	virtual void addObserver(LLVoiceClientStatusObserver* observer);
-	virtual void removeObserver(LLVoiceClientStatusObserver* observer);
-	virtual void addObserver(LLFriendObserver* observer);
-	virtual void removeObserver(LLFriendObserver* observer);		
-	virtual void addObserver(LLVoiceClientParticipantObserver* observer);
-	virtual void removeObserver(LLVoiceClientParticipantObserver* observer);
+	virtual void addObserver(LLVoiceClientStatusObserver* observer) override;
+	virtual void removeObserver(LLVoiceClientStatusObserver* observer) override;
+	virtual void addObserver(LLFriendObserver* observer) override;
+	virtual void removeObserver(LLFriendObserver* observer) override;
+	virtual void addObserver(LLVoiceClientParticipantObserver* observer) override;
+	virtual void removeObserver(LLVoiceClientParticipantObserver* observer) override;
 	//@}
 	
-	virtual std::string sipURIFromID(const LLUUID &id);
+	virtual std::string sipURIFromID(const LLUUID &id) override;
 	//@}
 
 	/// @name LLVoiceEffectInterface virtual implementations
@@ -216,32 +216,32 @@ public:
 	//////////////////////////
 	/// @name Accessors
 	//@{
-	virtual bool setVoiceEffect(const LLUUID& id);
-	virtual const LLUUID getVoiceEffect();
-	virtual LLSD getVoiceEffectProperties(const LLUUID& id);
+	virtual bool setVoiceEffect(const LLUUID& id) override;
+	virtual const LLUUID getVoiceEffect() override;
+	virtual LLSD getVoiceEffectProperties(const LLUUID& id) override;
 
-	virtual void refreshVoiceEffectLists(bool clear_lists);
-	virtual const voice_effect_list_t& getVoiceEffectList() const;
-	virtual const voice_effect_list_t& getVoiceEffectTemplateList() const;
+	virtual void refreshVoiceEffectLists(bool clear_lists) override;
+	virtual const voice_effect_list_t& getVoiceEffectList() const override;
+	virtual const voice_effect_list_t& getVoiceEffectTemplateList() const override;
 	//@}
 
 	//////////////////////////////
 	/// @name Status notification
 	//@{
-	virtual void addObserver(LLVoiceEffectObserver* observer);
-	virtual void removeObserver(LLVoiceEffectObserver* observer);
+	virtual void addObserver(LLVoiceEffectObserver* observer) override;
+	virtual void removeObserver(LLVoiceEffectObserver* observer) override;
 	//@}
 
 	//////////////////////////////
 	/// @name Effect preview buffer
 	//@{
-	virtual void enablePreviewBuffer(bool enable);
-	virtual void recordPreviewBuffer();
-	virtual void playPreviewBuffer(const LLUUID& effect_id = LLUUID::null);
-	virtual void stopPreviewBuffer();
+	virtual void enablePreviewBuffer(bool enable) override;
+	virtual void recordPreviewBuffer() override;
+	virtual void playPreviewBuffer(const LLUUID& effect_id = LLUUID::null) override;
+	virtual void stopPreviewBuffer() override;
 
-	virtual bool isPreviewRecording();
-	virtual bool isPreviewPlaying();
+	virtual bool isPreviewRecording() override;
+	virtual bool isPreviewPlaying() override;
 	//@}
 
 	//@}
@@ -752,7 +752,7 @@ private:
 	std::string getAudioSessionURI();
 	std::string getAudioSessionHandle();
 			
-    void setHidden(bool hidden); //virtual
+    void setHidden(bool hidden) override; //virtual
 	void sendPositionAndVolumeUpdate(void);
 	
     void sendCaptureAndRenderDevices();
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index f7774a7086..0dbe50d5e4 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -428,7 +428,7 @@ public:
 	{
 		LLSINGLETON(ContextMenu);
 	public:
-		/*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y);
+		/*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y) override;
 
 		void show(LLView* spawning_view, LLWearableType::EType w_type, S32 x, S32 y);
 
@@ -441,7 +441,7 @@ public:
 			MASK_UNKNOWN		= 0x10,
 		};
 
-		/* virtual */ LLContextMenu* createMenu();
+		/* virtual */ LLContextMenu* createMenu() override;
 		void updateItemsVisibility(LLContextMenu* menu);
 		void updateItemsLabels(LLContextMenu* menu);
 		static void setMenuItemVisible(LLContextMenu* menu, const std::string& name, bool val);
@@ -472,7 +472,7 @@ public:
 
 	virtual ~LLWearableItemsList();
 
-	/*virtual*/ LLPanel* createNewItem(LLViewerInventoryItem* item);
+	/*virtual*/ LLPanel* createNewItem(LLViewerInventoryItem* item) override;
 
 	void updateList(const LLUUID& category_id);
 
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h
index 524adba652..31dbfb8ffd 100644
--- a/indra/newview/llwindebug.h
+++ b/indra/newview/llwindebug.h
@@ -40,9 +40,9 @@ class LLWinDebug:
 {
 	LLSINGLETON_EMPTY_CTOR(LLWinDebug);
 public:
-	void initSingleton();
+	void initSingleton() override;
 	static void generateMinidump(struct _EXCEPTION_POINTERS *pExceptionInfo = NULL);
-	void cleanupSingleton();
+	void cleanupSingleton() override;
 private:
 	static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename);
 };
-- 
cgit v1.2.3


From b54c0f4fc18a25a2e454d3d24f3f2bfc4aff6452 Mon Sep 17 00:00:00 2001
From: Callum Linden <callum@lindenlab.com>
Date: Tue, 7 Mar 2023 14:47:10 -0800
Subject: DRTVWR-489: Pull in updated 3p-freetype package with Kitty's latest
 changes

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index cf18b71b0b..eba62834ca 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -698,9 +698,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4390c5182b5d6c397ef0396828093600</string>
+              <string>9cbcd452efa877fb8550c8c9b092b465</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106585/931193/freetype-2.12.1.576132-darwin64-576132.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/111566/967515/freetype-2.12.1.578664-darwin64-578664.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -722,9 +722,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6ad01c23db703cd6ad2a491aae937379</string>
+              <string>f3d7b72d10c162c9a8aa2ac4443ac52f</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106586/931203/freetype-2.12.1.576132-windows-576132.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/111571/967545/freetype-2.12.1.578664-windows-578664.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -734,16 +734,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>db5f433b65a268a1ea601d7e29766cb1</string>
+              <string>96d3689043e939ae424060a8b498be1f</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106587/931202/freetype-2.12.1.576132-windows64-576132.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/111570/967535/freetype-2.12.1.578664-windows64-578664.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.12.1.576132</string>
+        <string>2.12.1.578664</string>
       </map>
       <key>glext</key>
       <map>
-- 
cgit v1.2.3


From abdb4941cf42c405dda433d2e9a6a510d5bc2377 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 7 Mar 2023 14:49:57 -0800
Subject: DRTVWR-489: Clean up a new warning-as-error failure on macOS

---
 indra/newview/llspeakingindicatormanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
index 37c7ea55ae..c4c9673be3 100644
--- a/indra/newview/llspeakingindicatormanager.cpp
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -53,7 +53,7 @@ class SpeakingIndicatorManager : public LLSingleton<SpeakingIndicatorManager>, L
 	LOG_CLASS(SpeakingIndicatorManager);
 
 protected:
-    void                cleanupSingleton();
+    void                cleanupSingleton() override;
 
 public:
 
-- 
cgit v1.2.3


From 7b9866791ac7922f7527811bbc99c090f35e4cfd Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 31 Mar 2023 16:29:36 -0700
Subject: DRTVWR-489-emoji-PR: Pull in a version of Collada that has
 std::auto_ptr replaced by std::unique_ptr so it builds on modern mac systems

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index eba62834ca..7a814cd64b 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -236,9 +236,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b923ca041271446592b3b10e678b93b6</string>
+              <string>df05eee28649996c78a47dd054de2a47</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109517/952832/colladadom-2.3.577706-darwin64-577706.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112764/977018/colladadom-2.3.579218-darwin64-579218.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -260,9 +260,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2b3c9c1fe86c2b5bad6619c021bb11a8</string>
+              <string>6752b4f098a522bb22b6334cdfba7614</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109518/952846/colladadom-2.3.577706-windows-577706.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112771/977087/colladadom-2.3.579224-windows-579224.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -272,16 +272,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8ece469892029506759420ac531bd675</string>
+              <string>81de6dc4a79b547a25d0040370c42fec</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109519/952847/colladadom-2.3.577706-windows64-577706.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112770/977082/colladadom-2.3.579224-windows64-579224.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.3.577706</string>
+        <string>2.3.579218</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
-- 
cgit v1.2.3


From 337d2f984ff7f448fdbdc8dc2448e2b67cd23572 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 4 Apr 2023 03:32:40 +0200
Subject: Fix CMake files related to ICU4C

---
 indra/cmake/CMakeLists.txt    |  1 +
 indra/cmake/FindICU4C.cmake   | 33 ---------------------------------
 indra/cmake/ICU4C.cmake       | 37 +++++++++++++++++++------------------
 indra/llcommon/CMakeLists.txt |  2 +-
 indra/newview/CMakeLists.txt  |  2 +-
 5 files changed, 22 insertions(+), 53 deletions(-)
 delete mode 100644 indra/cmake/FindICU4C.cmake

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index f0b35c08f3..286ef3d411 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -30,6 +30,7 @@ set(cmake_SOURCE_FILES
         GoogleMock.cmake
         Havok.cmake
         Hunspell.cmake
+        ICU4C.cmake
         JsonCpp.cmake
         LLAddBuildTest.cmake
         LLAppearance.cmake
diff --git a/indra/cmake/FindICU4C.cmake b/indra/cmake/FindICU4C.cmake
deleted file mode 100644
index 327d761a88..0000000000
--- a/indra/cmake/FindICU4C.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- cmake -*-
-
-# - Find ICU4C
-# This module defines
-#  ICU4C_INCLUDE_DIR, where to find headers
-#  ICU4C_LIBRARY, the library needed to use ICU4C.
-#  ICU4C_FOUND, If false, do not try to use ICU4C.
-
-find_path(ICU4C_INCLUDE_DIR uchar.h
-  PATH_SUFFIXES unicode
-  )
-
-set(ICU4C_NAMES ${ICU4C_NAMES} icuuc)
-find_library(ICU4C_LIBRARY
-  NAMES ${ICU4C_NAMES}
-  )
-
-if (ICU4C_LIBRARY AND ICU4C_INCLUDE_DIR)
-  set(ICU4C_FOUND "YES")
-else (ICU4C_LIBRARY AND ICU4C_INCLUDE_DIR)
-  set(ICU4C_FOUND "NO")
-endif (ICU4C_LIBRARY AND ICU4C_INCLUDE_DIR)
-
-if (ICU4C_FOUND)
-    message(STATUS "Found ICU4C: Library in '${ICU4C_LIBRARY}' and header in '${ICU4C_INCLUDE_DIR}' ")
-else (ICU4C_FOUND)
-    message(FATAL_ERROR " * * *\nCould not find ICU4C library! * * *")
-endif (ICU4C_FOUND)
-
-mark_as_advanced(
-  ICU4C_LIBRARY
-  ICU4C_INCLUDE_DIR
-  )
diff --git a/indra/cmake/ICU4C.cmake b/indra/cmake/ICU4C.cmake
index b51087e0e7..7b27665483 100644
--- a/indra/cmake/ICU4C.cmake
+++ b/indra/cmake/ICU4C.cmake
@@ -1,22 +1,23 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-set(ICU4C_FIND_QUIETLY ON)
-set(ICU4C_FIND_REQUIRED ON)
+include_guard()
 
-if (USESYSTEMLIBS)
-  include(FindICU4C)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(icu4c)
-  if (WINDOWS)
-    set(ICU4C_LIBRARY icuuc)
-  elseif(DARWIN)
-    set(ICU4C_LIBRARY icuuc)
-  #elseif(LINUX)
-  #  set(ICU4C_LIBRARY ...)
-  else()
-    message(FATAL_ERROR "Invalid platform")
-  endif()
-  set(ICU4C_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/unicode)
-  use_prebuilt_binary(dictionaries)
-endif (USESYSTEMLIBS)
+add_library( ll::icu4c INTERFACE IMPORTED )
+
+
+use_system_binary(icu4c)
+use_prebuilt_binary(icu4c)
+if (WINDOWS)
+  target_link_libraries( ll::icu4c INTERFACE  icuuc)
+elseif(DARWIN)
+  target_link_libraries( ll::icu4c INTERFACE  icuuc)
+#elseif(LINUX)
+##  target_link_libraries( ll::icu4c INTERFACE  )
+else()
+  message(FATAL_ERROR "Invalid platform")
+endif()
+
+target_include_directories( ll::icu4c SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/unicode )
+
+use_prebuilt_binary(dictionaries)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 620b2c636c..0dcdf7f7cd 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -265,7 +265,6 @@ add_library (llcommon ${llcommon_SOURCE_FILES})
 
 target_link_libraries(
         llcommon
-        ${ICU4C_LIBRARY}
         ll::apr
         ll::expat
         ll::jsoncpp
@@ -274,6 +273,7 @@ target_link_libraries(
         ll::uriparser
         ll::oslibraries
         ll::tracy
+        ll::icu4c
     )
 
 target_include_directories(llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b63100fc2b..f3c601dff5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1897,7 +1897,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
         ${LLPHYSICSEXTENSIONS_LIBRARIES}
         ll::bugsplat
         ll::tracy
-         ${ICU4C_LIBRARY}
+        ll::icu4u
         )
 
 if( TARGET ll::intel_memops )
-- 
cgit v1.2.3


From 68612324b86e20f830e9c4a9ac290a611890f999 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 3 Apr 2023 20:19:07 -0700
Subject: DRTVWR-489: pull in a version of 3p-ICU4C from the branch called
 DRTVWR-489-emoji (identical to VS 2019) but lines up the branches for the
 otehr 3P packages this work uses

---
 autobuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index c221fcdb19..73e10769a5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1060,9 +1060,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7f147ae0410f705f846b981498898392</string>
+              <string>acc2484ff03dfaf7652cac9f42ce198a</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112850/977592/icu4c-4.8.1-darwin64-579264.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112891/977803/icu4c-4.8.1-darwin64-579276.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1072,9 +1072,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>08749d1f7f0a96b1951eecdae5dc11ba</string>
+              <string>d88003ff2c3c9145bc2c7d2d2f80f9b1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109679/954178/icu4c-4.8.1-windows-577789.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112892/977809/icu4c-4.8.1-windows-579276.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1084,9 +1084,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>98bca5c137e6d47c5b57827e156b1857</string>
+              <string>2cdc400727294edcc144558d4f94fd00</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109678/954182/icu4c-4.8.1-windows64-577789.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112893/977815/icu4c-4.8.1-windows64-579276.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From 1bc57d0ae0135d624d0b6ea8dbe460273e1171b5 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 10 Apr 2023 16:57:48 -0700
Subject: SL-19078: the emoji/short-code mappings come in via a 3p package now

---
 .../skins/default/xui/en/emoji_characters.xml      | 10955 -------------------
 1 file changed, 10955 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/emoji_characters.xml

diff --git a/indra/newview/skins/default/xui/en/emoji_characters.xml b/indra/newview/skins/default/xui/en/emoji_characters.xml
deleted file mode 100644
index 55aefe6745..0000000000
--- a/indra/newview/skins/default/xui/en/emoji_characters.xml
+++ /dev/null
@@ -1,10955 +0,0 @@
-<?xml version="1.0" ?>
-<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
-	<array>
-		<map>
-			<key>Character</key>
-			<string>😀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:grinning:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smile:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:laughing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rofl:</string>
-				<string>:satisfied:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:slightly_smiling_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😉</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:wink:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:innocent:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smiley:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😁</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:grin:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sweat_smile:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:joy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:upside_down_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blush:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Smiling</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smiling_face_with_three_hearts:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:star_struck:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kissing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kissing_closed_eyes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smiling_face_with_tear:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heart_eyes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kissing_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>☺️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:relaxed:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kissing_smiling_eyes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Affection</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:yum:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Tongue</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:stuck_out_tongue_winking_eye:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Tongue</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:stuck_out_tongue_closed_eyes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Tongue</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:stuck_out_tongue:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Tongue</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤪</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:zany_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Tongue</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:money_mouth_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Tongue</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hugs:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Hand</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:shushing_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Hand</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hand_over_mouth:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Hand</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:thinking:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Hand</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:zipper_mouth_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:neutral_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:no_mouth:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smirk:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:roll_eyes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😮‍💨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:face_exhaling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raised_eyebrow:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:expressionless:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😶‍🌫️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:face_in_clouds:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:unamused:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:grimacing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lying_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Neutral Skeptical</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:relieved:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Sleepy</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😪</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sleepy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Sleepy</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sleeping:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Sleepy</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pensive:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Sleepy</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:drooling_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Sleepy</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😷</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mask:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:face_with_head_bandage:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:vomiting_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hot_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woozy_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😵‍💫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:face_with_spiral_eyes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:face_with_thermometer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤢</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:nauseated_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sneezing_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cold_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dizzy_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:exploding_head:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Unwell</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤠</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cowboy_hat_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Hat</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥸</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:disguised_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Hat</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:partying_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Hat</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sunglasses:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Glasses</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:monocle_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Glasses</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:nerd_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Glasses</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:confused:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙁</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:slightly_frowning_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:open_mouth:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:astonished:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pleading_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:anguished:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cold_sweat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😢</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cry:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:scream:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:persevere:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sweat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tired_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:worried:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>☹️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:frowning_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hushed:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:flushed:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:frowning:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fearful:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:disappointed_relieved:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sob:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:confounded:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😞</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:disappointed:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:weary:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:yawning_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Concerned</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:triumph:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😠</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:angry:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😈</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smiling_imp:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:skull:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😡</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pout:</string>
-				<string>:rage:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cursing_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👿</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:imp:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>☠️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:skull_and_crossbones:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Negative</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hankey:</string>
-				<string>:poop:</string>
-				<string>:shit:</string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👹</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:japanese_ogre:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ghost:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:space_invader:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤡</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:clown_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:japanese_goblin:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:alien:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:robot:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Face Costume</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smiley_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😹</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:joy_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smirk_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:scream_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pouting_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😸</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:smile_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heart_eyes_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kissing_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>😿</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:crying_cat_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Cat Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙈</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:see_no_evil:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Monkey Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:speak_no_evil:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Monkey Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙉</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hear_no_evil:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Smiley</string>
-				<string>Monkey Face</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kiss:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cupid:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sparkling_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heartbeat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:two_hearts:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>❣️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heavy_heart_exclamation:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>❤️‍🔥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heart_on_fire:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>❤️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:yellow_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blue_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:brown_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:white_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💢</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:anger:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dizzy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dash:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bomb:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👁️‍🗨️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:eye_speech_bubble:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🗯️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:right_anger_bubble:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:zzz:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:love_letter:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:gift_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heartpulse:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💞</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:revolving_hearts:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:heart_decoration:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:broken_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>❤️‍🩹</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mending_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧡</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:orange_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:green_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:purple_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🖤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:black_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:100:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:boom:</string>
-				<string>:collision:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sweat_drops:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕳️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hole:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:speech_balloon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🗨️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:left_speech_bubble:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:thought_balloon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Emotion</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:wave:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Open</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🖐️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raised_hand_with_fingers_splayed:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Open</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🖖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:vulcan_salute:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Open</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raised_back_of_hand:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Open</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>✋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hand:</string>
-				<string>:raised_hand:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Open</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ok_hand:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pinching_hand:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤞</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:crossed_fingers:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:metal:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pinched_fingers:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>✌️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:v:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:love_you_gesture:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:call_me_hand:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Partial</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👈</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:point_left:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Single Finger</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:point_up_2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Single Finger</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:point_down:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Single Finger</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👉</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:point_right:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Single Finger</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🖕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fu:</string>
-				<string>:middle_finger:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Single Finger</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>☝️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:point_up:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Single Finger</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:+1:</string>
-				<string>:thumbsup:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Closed</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>✊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fist:</string>
-				<string>:fist_raised:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Closed</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fist_left:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Closed</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:-1:</string>
-				<string>:thumbsdown:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Closed</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:facepunch:</string>
-				<string>:fist_oncoming:</string>
-				<string>:punch:</string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Closed</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fist_right:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Fingers Closed</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:clap:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hands</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:open_hands:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hands</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:handshake:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hands</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raised_hands:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hands</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:palms_up_together:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hands</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pray:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hands</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>✍️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:writing_hand:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Prop</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:selfie:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Prop</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:nail_care:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Hand Prop</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💪</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:muscle:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦿</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mechanical_leg:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:foot:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ear_with_hearing_aid:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧠</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:brain:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫁</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lungs:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bone:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👁️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:eye:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lips:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mechanical_arm:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:leg:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ear:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:nose:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:anatomical_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦷</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tooth:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:eyes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tongue:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Body</string>
-				<string>Body Parts</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:baby:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:adult:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧔‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_beard:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🦰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:red_haired_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🦳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:white_haired_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🦰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_red_hair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🦱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_curly_hair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🦳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_white_hair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🦲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_bald:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👱‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blond_haired_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:older_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:child:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blond_haired_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bearded_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧔‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_beard:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🦱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:curly_haired_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🦲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bald_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🦰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:red_haired_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🦱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:curly_haired_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🦳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:white_haired_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🦲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bald_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👱‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blond_haired_woman:</string>
-				<string>:blonde_woman:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:older_adult:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:older_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:frowning_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙍‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:frowning_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙎‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pouting_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:no_good:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙅‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ng_woman:</string>
-				<string>:no_good_woman:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙆‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ok_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💁</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:information_desk_person:</string>
-				<string>:tipping_hand_person:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💁‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sassy_woman:</string>
-				<string>:tipping_hand_woman:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙋‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raising_hand_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:deaf_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧏‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:deaf_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙇‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bowing_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:facepalm:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤦‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_facepalming:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤷‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_shrugging:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙍‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:frowning_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pouting_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙎‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pouting_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙅‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ng_man:</string>
-				<string>:no_good_man:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ok_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙆‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ok_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💁‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sassy_man:</string>
-				<string>:tipping_hand_man:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raising_hand:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙋‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raising_hand_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧏‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:deaf_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bow:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🙇‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bowing_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤦‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_facepalming:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤷</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:shrug:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤷‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_shrugging:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Gesture</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍⚕️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:health_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍⚕️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_health_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🎓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_student:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🏫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:teacher:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🏫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_teacher:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍⚖️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_judge:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🌾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:farmer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🌾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_farmer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🍳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_cook:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🔧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mechanic:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🔧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_mechanic:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🏭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_factory_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍💼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:office_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍💼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_office_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🔬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_scientist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍💻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:technologist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍💻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_technologist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🎤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_singer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🎨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:artist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🎨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_artist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍✈️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_pilot:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🚀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:astronaut:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🚀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_astronaut:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🚒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_firefighter:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cop:</string>
-				<string>:police_officer:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👮‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:policewoman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕵️‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:male_detective:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:guard:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💂‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:guardswoman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👷</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:construction_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👷‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:construction_worker_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👸</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:princess:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👳‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_with_turban:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_with_gua_pi_mao:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_in_tuxedo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤵‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_in_tuxedo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👰‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_with_veil:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pregnant_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🍼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_feeding_baby:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🍼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_feeding_baby:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍⚕️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_health_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🎓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:student:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🎓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_student:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🏫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_teacher:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍⚖️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:judge:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍⚖️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_judge:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🌾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_farmer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🍳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cook:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🍳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_cook:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🔧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_mechanic:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🏭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:factory_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🏭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_factory_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍💼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_office_worker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🔬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:scientist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🔬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_scientist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍💻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_technologist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🎤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:singer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🎤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_singer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🎨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_artist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍✈️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pilot:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍✈️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_pilot:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🚀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_astronaut:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🚒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:firefighter:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🚒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_firefighter:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👮‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:policeman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕵️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:detective:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕵️‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:female_detective:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💂‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:guardsman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥷</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ninja:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👷‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:construction_worker_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:prince:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_with_turban:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👳‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_with_turban:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_with_headscarf:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤵‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_in_tuxedo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_with_veil:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👰‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bride_with_veil:</string>
-				<string>:woman_with_veil:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:breast_feeding:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🍼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_feeding_baby:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Role</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:angel:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mrs_claus:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦸</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:superhero:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦸‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:superhero_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦹‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:supervillain_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mage:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧙‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mage_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧚‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fairy_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:vampire:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧛‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:vampire_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧜‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:merman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:elf:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧝‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:elf_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧞‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:genie_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:zombie:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧟‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:zombie_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🎅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:santa:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🎄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mx_claus:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦸‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:superhero_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦹</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:supervillain:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦹‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:supervillain_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧙‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mage_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fairy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧚‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fairy_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧛‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:vampire_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:merperson:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧜‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mermaid:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧝‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:elf_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧞</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:genie:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧞‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:genie_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧟‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:zombie_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Fantasy</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:massage:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💆‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:massage_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💇‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:haircut_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:walking:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚶‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:walking_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧍‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:standing_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kneeling_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧎‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kneeling_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🦯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_with_probing_cane:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🦼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_in_motorized_wheelchair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🦼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_in_motorized_wheelchair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🦽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_in_manual_wheelchair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:runner:</string>
-				<string>:running:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏃‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:running_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_dancing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dancers:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👯‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dancing_women:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧖‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sauna_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:climbing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧗‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:climbing_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💆‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:massage_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:haircut:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💇‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:haircut_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚶‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:walking_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:standing_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧍‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:standing_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧎‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kneeling_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🦯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_with_probing_cane:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🦯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_with_probing_cane:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍🦼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_in_motorized_wheelchair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🦽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_in_manual_wheelchair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍🦽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_in_manual_wheelchair:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏃‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:running_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dancer:</string>
-				<string>:woman_dancing:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕴️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:business_suit_levitating:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👯‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dancing_men:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sauna_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧖‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sauna_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧗‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:climbing_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Activity</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:person_fencing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>⛷️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:skier:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏌️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:golfing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏌️‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:golfing_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏄‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:surfing_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rowboat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚣‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rowing_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏊‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:swimming_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>⛹️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bouncing_ball_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>⛹️‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:basketball_woman:</string>
-				<string>:bouncing_ball_woman:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏋️‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:weight_lifting_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bicyclist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚴‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:biking_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚵‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mountain_biking_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤸</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cartwheeling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤸‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_cartwheeling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤼‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:men_wrestling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:water_polo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤽‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_playing_water_polo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤾‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_playing_handball:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤹</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:juggling_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤹‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_juggling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:horse_racing:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:snowboarder:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏌️‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:golfing_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:surfer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏄‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:surfing_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚣‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rowing_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:swimmer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏊‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:swimming_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>⛹️‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:basketball_man:</string>
-				<string>:bouncing_ball_man:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏋️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:weight_lifting:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏋️‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:weight_lifting_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚴‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:biking_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mountain_bicyclist:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🚵‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mountain_biking_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤸‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_cartwheeling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:wrestling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤼‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:women_wrestling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤽‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_playing_water_polo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:handball_person:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤾‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:woman_playing_handball:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🤹‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:man_juggling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Sport</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lotus_position:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Resting</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧘‍♀️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lotus_position_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Resting</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🛌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sleeping_bed:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Resting</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧘‍♂️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lotus_position_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Resting</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🛀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bath:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Resting</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧑‍🤝‍🧑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:people_holding_hands:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couple:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couplekiss:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍❤️‍💋‍👨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couplekiss_man_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couple_with_heart:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍❤️‍👨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couple_with_heart_man_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👪</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👩‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_woman_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👩‍👦‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_woman_boy_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👨‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_man_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👨‍👧‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_man_girl_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👨‍👧‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_man_girl_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👩‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_woman_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👩‍👦‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_woman_boy_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👧‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_girl_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👦‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_boy_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👧‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_girl_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:two_women_holding_hands:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:two_men_holding_hands:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍❤️‍💋‍👨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couplekiss_man_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍❤️‍💋‍👩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couplekiss_woman_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍❤️‍👨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couple_with_heart_woman_man:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍❤️‍👩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:couple_with_heart_woman_woman:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👩‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_woman_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👩‍👧‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_woman_girl_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👩‍👧‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_woman_girl_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👨‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_man_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👨‍👦‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_man_boy_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👩‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_woman_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👩‍👧‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_woman_girl_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👩‍👧‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_woman_girl_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👦‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_boy_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👨‍👧‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_man_girl_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_boy:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👩‍👧‍👧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:family_woman_girl_girl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person</string>
-				<string>Family</string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🗣️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:speaking_head:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Symbol</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:busts_in_silhouette:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Symbol</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:footprints:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Symbol</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>👤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bust_in_silhouette:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Symbol</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:people_hugging:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Person Symbol</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:monkey_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:gorilla:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dog:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:guide_dog:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:poodle:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fox_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐈‍⬛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:black_cat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tiger:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:leopard:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:racehorse:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:zebra:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bison:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ox:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cow2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pig2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pig_nose:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sheep:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐪</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dromedary_camel:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:llama:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:elephant:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rhinoceros:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mouse:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rabbit:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐿️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:chipmunk:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hedgehog:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bear:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:koala:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sloth:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:skunk:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦡</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:badger:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:monkey:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:orangutan:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dog2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐕‍🦺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:service_dog:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:wolf:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:raccoon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐈</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cat2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦁</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lion:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tiger2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:horse:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:unicorn:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:deer:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cow:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:water_buffalo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐷</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pig:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:boar:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ram:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:goat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:camel:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:giraffe:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mammoth:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hippopotamus:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐁</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mouse2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐹</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hamster:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rabbit2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:beaver:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐻‍❄️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:polar_bear:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:panda_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:otter:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kangaroo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:feet:</string>
-				<string>:paw_prints:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Mammal</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:turkey:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rooster:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:baby_chick:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bird:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕊️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dove:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:duck:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦉</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:owl:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🪶</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:feather:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:peacock:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:chicken:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hatching_chick:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hatched_chick:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐧</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:penguin:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:eagle:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦢</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:swan:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dodo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:flamingo:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:parrot:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bird</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐸</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:frog:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Amphibian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:crocodile:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lizard:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dragon_face:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sauropod:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐢</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:turtle:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:snake:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐉</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dragon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:t-rex:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Reptile</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:whale:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dolphin:</string>
-				<string>:flipper:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fish:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐡</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blowfish:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:octopus:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:whale2:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:seal:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐠</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tropical_fish:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦈</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:shark:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:shell:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Marine</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:snail:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bug:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bee:</string>
-				<string>:honeybee:</string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐞</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lady_beetle:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🪳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cockroach:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕸️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:spider_web:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mosquito:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🪱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:worm:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:butterfly:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🐜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ant:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🪲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:beetle:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cricket:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🕷️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:spider:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:scorpion:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🪰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fly:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🦠</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:microbe:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Animal Bug</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bouquet:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>💮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:white_flower:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌹</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rose:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌺</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hibiscus:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌼</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blossom:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌸</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cherry_blossom:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🏵️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rosette:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:wilted_flower:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌻</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sunflower:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌷</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tulip:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Flower</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:seedling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:evergreen_tree:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:palm_tree:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌾</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ear_of_rice:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>☘️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:shamrock:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍁</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:maple_leaf:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍃</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:leaves:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🪴</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:potted_plant:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:deciduous_tree:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌵</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cactus:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌿</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:herb:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:four_leaf_clover:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fallen_leaf:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Plant Other</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:grapes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍉</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:watermelon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍋</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:lemon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍍</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pineapple:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍎</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:apple:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pear:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cherries:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:blueberries:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tomato:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:coconut:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍈</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:melon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍊</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mandarin:</string>
-				<string>:orange:</string>
-				<string>:tangerine:</string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍌</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:banana:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mango:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍏</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:green_apple:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:peach:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:strawberry:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:kiwi_fruit:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:olive:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Fruit</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:avocado:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:potato:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌽</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:corn:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫑</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bell_pepper:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥬</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:leafy_green:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:garlic:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍄</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:mushroom:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌰</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:chestnut:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:eggplant:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:carrot:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌶️</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hot_pepper:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥒</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cucumber:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥦</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:broccoli:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧅</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:onion:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:peanuts:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Vegetable</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍞</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bread:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:baguette_bread:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥨</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pretzel:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥞</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pancakes:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧀</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cheese:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:poultry_leg:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bacon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fries:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌭</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hotdog:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:taco:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:tamale:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧆</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:falafel:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍳</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fried_egg:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍲</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:stew:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bowl_with_spoon:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍿</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:popcorn:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧂</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:salt:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥐</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:croissant:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫓</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:flatbread:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bagel:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧇</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:waffle:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍖</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:meat_on_bone:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥩</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:cut_of_meat:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍔</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:hamburger:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:pizza:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥪</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sandwich:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🌯</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:burrito:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:stuffed_flatbread:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:egg:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:shallow_pan_of_food:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🫕</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fondue:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥗</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:green_salad:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🧈</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:butter:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥫</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:canned_food:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Prepared</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍱</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:bento:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍙</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rice_ball:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍛</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:curry:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍝</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:spaghetti:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍢</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:oden:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍤</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fried_shrimp:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥮</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:moon_cake:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥟</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dumpling:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥡</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:takeout_box:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍘</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rice_cracker:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍚</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:rice:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍜</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:ramen:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍠</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sweet_potato:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍣</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:sushi:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍥</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fish_cake:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🍡</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:dango:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-		<map>
-			<key>Character</key>
-			<string>🥠</string>
-			<key>ShortCodes</key>
-			<array>
-				<string>:fortune_cookie:</string>
-				<string></string>
-				<string></string>
-			</array>
-			<key>Categories</key>
-			<array>
-				<string>Food Asian</string>
-				<string></string>
-			</array>
-		</map>
-	</array>
-</llsd>
-- 
cgit v1.2.3


From 93717f14ca57e63f34493bf392fe0cf53fa8573b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 10 Apr 2023 16:58:55 -0700
Subject: SL-19078: add filename of emoji/shortcode XML files to ignore list so
 Viewer checkouts don't appear to be polluted with files from 3p libs

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ab5f43b352..23a7f0cb4b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ indra/newview/teleport_history.txt
 indra/newview/typed_locations.txt
 indra/newview/vivox-runtime
 indra/newview/skins/default/html/common/equirectangular/js
+emoji_characters.xml
 indra/server-linux-*
 indra/temp
 indra/test/linden_file.dat
-- 
cgit v1.2.3


From 351faf283a854fe62a328ecf007e0d0d079e7355 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 10 Apr 2023 16:59:45 -0700
Subject: SL-19078: pull in 3p versions of the emoji/shortcode mapping XML
 files - 1 for each language that the viewer supports except sadly, Turkish
 which is not available so far

---
 autobuild.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/autobuild.xml b/autobuild.xml
index 73e10769a5..11057d2b48 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -527,6 +527,62 @@
         <key>version</key>
         <string>1.12.4.202209142021_91.1.21_g9dd45fe_chromium-91.0.4472.114</string>
       </map>
+      <key>emoji_shortcodes</key>
+      <map>
+        <key>canonical_repo</key>
+        <string>https://github.com/secondlife/3p-emoji-shortcodes</string>
+        <key>copyright</key>
+        <string>Copyright 2017-2019 Miles Johnson.</string>
+        <key>description</key>
+        <string>Emoji shortcodes</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/emojibase-license.txt</string>
+        <key>name</key>
+        <string>emoji_shortcodes</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>7ac35da9b1b5c9a05954edeef3fe8e54</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113242/980233/emoji_shortcodes-6.1.0.579438-darwin64-579438.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>darwin64</string>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>3c5c4c7e3bb2eeef61e605b6690a63f3</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113244/980245/emoji_shortcodes-6.1.0.579438-windows-579438.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>087ce7e6d93dcd88b477b10d8e1ab259</string>
+              <key>url</key>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113243/980244/emoji_shortcodes-6.1.0.579438-windows64-579438.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
+        </map>
+        <key>version</key>
+        <string>6.1.0.579438</string>
+      </map>
       <key>expat</key>
       <map>
         <key>copyright</key>
-- 
cgit v1.2.3


From 12e044755e9d9cf886ceb63ef7af3010303d31c4 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 10 Apr 2023 17:01:10 -0700
Subject: SL-19078: changes to autobuild to unpack the emoji/shortcode 3p
 library and then copy the XML files to the right place in the Viewer dev tree
 (indra/newview/skins/xui/*/emoji_characters.xml)

---
 indra/cmake/ViewerMiscLibs.cmake |  1 +
 indra/newview/CMakeLists.txt     | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 7eed456833..cae68fbc11 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -20,3 +20,4 @@ use_prebuilt_binary(slvoice)
 
 use_prebuilt_binary(nanosvg)
 use_prebuilt_binary(viewer-fonts)
+use_prebuilt_binary(emoji_shortcodes)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b63100fc2b..ab0c60a402 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1917,6 +1917,22 @@ file(GLOB FONT_FILE_GLOB_LIST
 )
 file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
 
+# Copy over the Emoji/shortcodes mapping XML files (and create dependency
+# if they are changed, CMake will run again and copy over new versions)
+message("Copying Emoji/shortcode mappings")
+set(emoji_mapping_src_folder ${AUTOBUILD_INSTALL_DIR}/xui)
+set(emoji_mapping_dst_folder ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui)
+
+# Note Turkey is missing from this set (not available in Emoji package yet)
+set(country_codes "da;de;en;es;fr;it;ja;pl;pt;ru;zh")
+foreach(elem ${country_codes})
+   set(emoji_mapping_src_file
+      "${emoji_mapping_src_folder}/${elem}/emoji_characters.xml")
+   set(emoji_mapping_dst_file
+      "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")      
+   configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY)
+endforeach()
+
 if (LINUX)
   set(product SecondLife-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
 
-- 
cgit v1.2.3


From 978a5b66f29b870083bfa41c7594dcd48d4b0961 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 11 Apr 2023 11:26:37 -0700
Subject: SL-19139 Credits for Kitty - update the contributors.txt file with a
 mention of Kitty's large contribution. (No externally facing JIRA that I can
 find)

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index fa40bd327a..8afe922cbe 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -884,6 +884,7 @@ Kitty Barnett
 	STORM-2149
 	MAINT-7581
 	MAINT-7081
+	DRTVWR-489 (Internal JIRA that tracks Kitty's sizeable, epic contribution: support for Emoji characters in the Viewer [April 2023])
 Kolor Fall
 Komiko Okamoto
 Korvel Noh
-- 
cgit v1.2.3


From 602d7ea1387113aa2a36b80e61eb9b52c23698e8 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 11 Apr 2023 14:18:23 -0700
Subject: SL-19368: update copyright information in Viewer Fonts description
 that eventually ends up in the Credits panel of Help->About - new 3p viewer
 fonts package

---
 autobuild.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 11057d2b48..d454e0f93a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2865,7 +2865,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <key>viewer-fonts</key>
       <map>
         <key>copyright</key>
-        <string>Copyright various</string>
+        <string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT</string>
         <key>description</key>
         <string>Viewer fonts</string>
         <key>license</key>
@@ -2881,9 +2881,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d47e0ed35dad11f0a5dc821758e2ae46</string>
+              <string>6041bbd4001e3951f96ac3456c7906da</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109658/953998/viewer_fonts-1.577782-darwin64-577782.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113314/980656/viewer_fonts-1.579464-darwin64-579464.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2893,9 +2893,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7dc39bb7cd8133d251eaff9c9e16bdfd</string>
+              <string>19c48abc168a1c4e0f0ec6d471b2e1bd</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109660/954010/viewer_fonts-1.577782-windows-577782.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113308/980632/viewer_fonts-1.579464-windows-579464.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2905,16 +2905,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>86134368c16c7d685156403e15a7cbcd</string>
+              <string>1745ba6eec0108250446fe01d4aa065c</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109659/954009/viewer_fonts-1.577782-windows64-577782.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113307/980631/viewer_fonts-1.579464-windows64-579464.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.577782</string>
+        <string>1.579464</string>
       </map>
       <key>viewer-manager</key>
       <map>
-- 
cgit v1.2.3


From 638a45cbb1aeb228a0cf910571f1af8759c003a9 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 13 Apr 2023 15:44:40 -0700
Subject: DRTVWR-489: Pull in updated version of BugSplat to work around their
 change in TLS on 2023-04-11

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index d454e0f93a..ac153ed5e7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -184,9 +184,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7b4aceaed511d44c4d1354b2162b59c7</string>
+              <string>878eaf654926e400d67680100cb780c9</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107398/936936/bugsplat-1.0.7.576560-darwin64-576560.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113512/981912/bugsplat-1.0.7.579546-darwin64-579546.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -196,9 +196,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>53918c7c74b943cdc0bb90caf9657a84</string>
+              <string>ad306307016d6ac6f86823d7292847ff</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107400/936949/bugsplat-4.0.3.0.576560-windows-576560.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113514/981926/bugsplat-4.0.3.0.579546-windows-579546.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -208,16 +208,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>19d6a55db101f02e7eb531daf3e8cfd1</string>
+              <string>8d237d16a0c038649e17a64ba8c9f2b7</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107401/936948/bugsplat-.576560-windows64-576560.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113517/981927/bugsplat-4.0.3.0.579546-windows64-579546.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>4.0.3.0.576560</string>
+        <string>4.0.3.0.579546</string>
       </map>
       <key>colladadom</key>
       <map>
-- 
cgit v1.2.3


From ff7ebf08922293c1623b7bdb8c9923c14fc9db48 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 14 Apr 2023 07:44:56 +0200
Subject: SL-19575 Create emoji gallery access icon

---
 indra/llui/llemojidictionary.h                     |   2 +
 indra/llui/llemojihelper.cpp                       |  10 +-
 indra/llui/llemojihelper.h                         |   6 +-
 indra/llui/llscrolllistctrl.cpp                    |   2 +-
 indra/llui/lltexteditor.cpp                        |  22 ++--
 indra/llui/lltexteditor.h                          |   3 +-
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llfloateremojipicker.cpp             | 143 +++++++++++++++++++++
 indra/newview/llfloateremojipicker.h               |  59 +++++++++
 indra/newview/llfloaterimsessiontab.cpp            |  30 ++++-
 indra/newview/llfloaterimsessiontab.h              |   4 +
 indra/newview/llviewerfloaterreg.cpp               |  20 +--
 .../default/textures/icons/emoji_picker_icon.png   | Bin 0 -> 316 bytes
 indra/newview/skins/default/textures/textures.xml  |   5 +-
 .../skins/default/xui/en/floater_emoji_picker.xml  |  39 ++++++
 .../skins/default/xui/en/floater_im_session.xml    |  14 +-
 indra/newview/skins/default/xui/en/strings.xml     |  10 +-
 17 files changed, 335 insertions(+), 36 deletions(-)
 create mode 100644 indra/newview/llfloateremojipicker.cpp
 create mode 100644 indra/newview/llfloateremojipicker.h
 create mode 100644 indra/newview/skins/default/textures/icons/emoji_picker_icon.png
 create mode 100644 indra/newview/skins/default/xui/en/floater_emoji_picker.xml

diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index 46a61f1cd7..adc22ced58 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -61,6 +61,8 @@ public:
 	const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
 	std::string getNameFromEmoji(llwchar ch) const;
 
+	const std::map<llwchar, const LLEmojiDescriptor*>& getEmoji2Descr() const { return mEmoji2Descr; }
+
 private:
 	void addEmoji(LLEmojiDescriptor&& descr);
 
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 1e4c19a183..fb660a9e5b 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -82,12 +82,12 @@ bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S
 	return isShortCode;
 }
 
-void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(LLWString)> cb)
+void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(llwchar)> cb)
 {
 	// Commit immediately if the user already typed a full shortcode
 	if (const auto* emojiDescrp = LLEmojiDictionary::instance().getDescriptorFromShortCode(short_code))
 	{
-		cb(LLWString(1, emojiDescrp->Character));
+		cb(emojiDescrp->Character);
 		hideHelper();
 		return;
 	}
@@ -96,7 +96,7 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
 	{
 		LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
 		mHelperHandle = pHelperFloater->getHandle();
-		mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())); }, std::placeholders::_2));
+		mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())[0]); }, std::placeholders::_2));
 	}
 	setHostCtrl(hostctrl_p);
 	mEmojiCommitCb = cb;
@@ -135,11 +135,11 @@ bool LLEmojiHelper::handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask)
 	return mHelperHandle.get()->handleKey(key, mask, true);
 }
 
-void LLEmojiHelper::onCommitEmoji(const LLWString& wstr)
+void LLEmojiHelper::onCommitEmoji(llwchar emoji)
 {
 	if (!mHostHandle.isDead() && mEmojiCommitCb)
 	{
-		mEmojiCommitCb(wstr);
+		mEmojiCommitCb(emoji);
 	}
 }
 
diff --git a/indra/llui/llemojihelper.h b/indra/llui/llemojihelper.h
index 63f5c640c9..58f68d12a4 100644
--- a/indra/llui/llemojihelper.h
+++ b/indra/llui/llemojihelper.h
@@ -44,12 +44,12 @@ public:
 	std::string getToolTip(llwchar ch) const;
 	bool        isActive(const LLUICtrl* ctrl_p) const;
 	static bool isCursorInEmojiCode(const LLWString& wtext, S32 cursor_pos, S32* short_code_pos_p = nullptr);
-	void        showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(LLWString)> commit_cb);
+	void        showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(llwchar)> commit_cb);
 	void        hideHelper(const LLUICtrl* ctrl_p = nullptr);
 
 	// Eventing
 	bool handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask);
-	void onCommitEmoji(const LLWString& wstr);
+	void onCommitEmoji(llwchar emoji);
 
 protected:
 	LLUICtrl* getHostCtrl() const { return mHostHandle.get(); }
@@ -60,5 +60,5 @@ private:
 	LLHandle<LLFloater> mHelperHandle;
 	boost::signals2::connection mHostCtrlFocusLostConn;
 	boost::signals2::connection mHelperCommitConn;
-	std::function<void(LLWString)> mEmojiCommitCb;
+	std::function<void(llwchar)> mEmojiCommitCb;
 };
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 219667f766..2a6e8a6b76 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -411,7 +411,7 @@ void LLScrollListCtrl::clearRows()
 LLScrollListItem* LLScrollListCtrl::getFirstSelected() const
 {
 	item_list::const_iterator iter;
-	for(iter = mItemList.begin(); iter != mItemList.end(); iter++)
+	for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
 	{
 		LLScrollListItem* item  = *iter;
 		if (item->getSelected())
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index a85ac2a5a3..95d8b666ab 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -680,18 +680,24 @@ void LLTextEditor::selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_p
 	endSelection();
 }
 
-void LLTextEditor::handleEmojiCommit(const LLWString& wstr)
+void LLTextEditor::insertEmoji(llwchar emoji)
 {
-	LLWString wtext(getWText()); S32 shortCodePos;
-	if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
+	auto styleParams = LLStyle::Params();
+	styleParams.font = LLFontGL::getFontEmoji();
+	auto segment = new LLEmojiTextSegment(new LLStyle(styleParams), mCursorPos, mCursorPos + 1, *this);
+	insert(mCursorPos, LLWString(1, emoji), false, segment);
+	setCursorPos(mCursorPos + 1);
+}
+
+void LLTextEditor::handleEmojiCommit(llwchar emoji)
+{
+	S32 shortCodePos;
+	if (LLEmojiHelper::isCursorInEmojiCode(getWText(), mCursorPos, &shortCodePos))
 	{
 		remove(shortCodePos, mCursorPos - shortCodePos, true);
+		setCursorPos(shortCodePos);
 
-		auto styleParams = LLStyle::Params();
-		styleParams.font = LLFontGL::getFontEmoji();
-		insert(shortCodePos, wstr, false, new LLEmojiTextSegment(new LLStyle(styleParams), shortCodePos, shortCodePos + wstr.size(), *this));
-
-		setCursorPos(shortCodePos + 1);
+		insertEmoji(emoji);
 	}
 }
 
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index dabd0460c6..f830732cb8 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -92,7 +92,8 @@ public:
 
 	static S32		spacesPerTab();
 
-	        void    handleEmojiCommit(const LLWString& wstr);
+	void    insertEmoji(llwchar emoji);
+	void    handleEmojiCommit(llwchar emoji);
 
 	// mousehandler overrides
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ab0c60a402..1f8b937965 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -205,6 +205,7 @@ set(viewer_SOURCE_FILES
     llfloaterdisplayname.cpp
     llfloatereditenvironmentbase.cpp
     llfloatereditextdaycycle.cpp
+    llfloateremojipicker.cpp
     llfloaterenvironmentadjust.cpp
     llfloaterevent.cpp
     llfloaterexperiencepicker.cpp
@@ -845,6 +846,7 @@ set(viewer_HEADER_FILES
     llfloaterdisplayname.h
     llfloatereditenvironmentbase.h
     llfloatereditextdaycycle.h
+    llfloateremojipicker.h
     llfloaterenvironmentadjust.h
     llfloaterevent.h
     llfloaterexperiencepicker.h
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
new file mode 100644
index 0000000000..c828a95a59
--- /dev/null
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -0,0 +1,143 @@
+/**
+ * @file llfloateremojipicker.cpp
+ *
+ * $LicenseInfo:firstyear=2003&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 "llviewerprecompiledheaders.h"
+
+#include "llfloateremojipicker.h"
+
+#include "llfloaterreg.h"
+#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llemojidictionary.h"
+
+class LLEmojiScrollListItem : public LLScrollListItem
+{
+public:
+	LLEmojiScrollListItem(const llwchar emoji, const LLScrollListItem::Params& params)
+		: LLScrollListItem(params)
+		, mEmoji(emoji)
+	{
+	}
+
+	llwchar getEmoji() const { return mEmoji; }
+
+	virtual void draw(const LLRect& rect,
+		const LLColor4& fg_color,
+		const LLColor4& hover_color, // highlight/hover selection of whole item or cell
+		const LLColor4& select_color, // highlight/hover selection of whole item or cell
+		const LLColor4& highlight_color, // highlights contents of cells (ex: text)
+		S32 column_padding) override
+	{
+		LLScrollListItem::draw(rect, fg_color, hover_color, select_color, highlight_color, column_padding);
+
+		S32 width = getColumn(0)->getWidth();
+		LLFontGL::getFontEmoji()->render(LLWString(1, mEmoji), 0, rect.mLeft + width / 2, rect.getCenterY(), LLColor4::white,
+			LLFontGL::HCENTER, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::DROP_SHADOW_SOFT, 1, S32_MAX, nullptr, false, true);
+	}
+
+private:
+	llwchar mEmoji;
+};
+
+LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
+{
+	LLFloaterEmojiPicker* floater = LLFloaterReg::getTypedInstance<LLFloaterEmojiPicker>("emoji_picker");
+	if (!floater)
+		LL_WARNS() << "Cannot instantiate emoji picker" << LL_ENDL;
+	return floater;
+}
+
+LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(select_callback_t callback)
+{
+	LLFloaterEmojiPicker* floater = getInstance();
+	if (LLFloaterEmojiPicker* floater = getInstance())
+		floater->show(callback);
+	return floater;
+}
+
+void LLFloaterEmojiPicker::show(select_callback_t callback)
+{
+	mSelectCallback = callback;
+	openFloater(mKey);
+	setFocus(TRUE);
+}
+
+LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
+: LLFloater(key)
+{
+}
+
+BOOL LLFloaterEmojiPicker::postBuild()
+{
+	if (mEmojis = getChild<LLScrollListCtrl>("Emojis"))
+	{
+		mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onSelect, this));
+
+		mEmojis->clearRows();
+
+		const std::map<llwchar, const LLEmojiDescriptor*>& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
+		for (const std::pair<llwchar, const LLEmojiDescriptor*>& it : emoji2Descr)
+		{
+			LLScrollListItem::Params params;
+			params.columns.add().column("name").value(it.second->Name);
+			mEmojis->addRow(new LLEmojiScrollListItem(it.first, params), params);
+		}
+	}
+
+	return TRUE;
+}
+
+LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
+{
+	gFocusMgr.releaseFocusIfNeeded( this );
+}
+
+void LLFloaterEmojiPicker::onSelect()
+{
+	if (mEmojis && mSelectCallback)
+	{
+		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected()))
+		{
+			mSelectCallback(item->getEmoji());
+		}
+	}
+}
+
+// virtual
+BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
+{
+	if (key == KEY_RETURN && mask == MASK_NONE)
+	{
+		onSelect();
+		return TRUE;
+	}
+	else if (key == KEY_ESCAPE && mask == MASK_NONE)
+	{
+		closeFloater();
+		return TRUE;
+	}
+
+	return LLFloater::handleKeyHere(key, mask);
+}
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
new file mode 100644
index 0000000000..9b442064d0
--- /dev/null
+++ b/indra/newview/llfloateremojipicker.h
@@ -0,0 +1,59 @@
+/**
+ * @file llfloateremojipicker.h
+ * @brief Header file for llfloateremojipicker
+ *
+ * $LicenseInfo:firstyear=2003&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 LLFLOATEREMOJIPICKER_H
+#define LLFLOATEREMOJIPICKER_H
+
+#include "llfloater.h"
+
+class LLFloaterEmojiPicker : public LLFloater
+{
+public:
+	// The callback function will be called with an emoji char.
+	typedef boost::function<void (llwchar)> select_callback_t;
+
+	// Call this to select an emoji.
+	static LLFloaterEmojiPicker* getInstance();
+	static LLFloaterEmojiPicker* showInstance(select_callback_t callback);
+
+	LLFloaterEmojiPicker(const LLSD& key);
+	virtual ~LLFloaterEmojiPicker();
+
+	virtual	BOOL postBuild();
+
+	void show(select_callback_t callback);
+
+private:
+	void onSelect();
+
+	virtual BOOL handleKeyHere(KEY key, MASK mask);
+
+	class LLScrollListCtrl* mEmojis;
+	select_callback_t mSelectCallback;
+	std::string mEmojiName;
+};
+
+#endif
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 78271369d2..3d9751dd35 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -40,6 +40,7 @@
 #include "llchicletbar.h"
 #include "lldraghandle.h"
 #include "llfloaterreg.h"
+#include "llfloateremojipicker.h"
 #include "llfloaterimsession.h"
 #include "llfloaterimcontainer.h" // to replace separate IM Floaters with multifloater container
 #include "lllayoutstack.h"
@@ -250,10 +251,13 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mTearOffBtn = getChild<LLButton>("tear_off_btn");
 	mTearOffBtn->setCommitCallback(boost::bind(&LLFloaterIMSessionTab::onTearOffClicked, this));
 
+	mEmojiBtn = getChild<LLButton>("emoji_panel_btn");
+	mEmojiBtn->setClickedCallback(boost::bind(&LLFloaterIMSessionTab::onEmojiPanelBtnClicked, this));
+
 	mGearBtn = getChild<LLButton>("gear_btn");
     mAddBtn = getChild<LLButton>("add_btn");
 	mVoiceButton = getChild<LLButton>("voice_call_btn");
-    
+
 	mParticipantListPanel = getChild<LLLayoutPanel>("speakers_list_panel");
 	mRightPartPanel = getChild<LLLayoutPanel>("right_part_holder");
 
@@ -424,6 +428,30 @@ void LLFloaterIMSessionTab::onInputEditorClicked()
 	gToolBarView->flashCommand(LLCommandId("chat"), false);
 }
 
+void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self)
+{
+	if (LLFloaterEmojiPicker* picker = LLFloaterEmojiPicker::getInstance())
+	{
+		if (!picker->isShown())
+		{
+			picker->show(boost::bind(&LLFloaterIMSessionTab::onEmojiSelected, self, _1));
+			if (LLFloater* root_floater = gFloaterView->getParentFloater(self))
+			{
+				root_floater->addDependentFloater(picker);
+			}
+		}
+		else
+		{
+			picker->closeFloater();
+		}
+	}
+}
+
+void LLFloaterIMSessionTab::onEmojiSelected(llwchar emoji)
+{
+	mInputEditor->insertEmoji(emoji);
+}
+
 std::string LLFloaterIMSessionTab::appendTime()
 {
 	time_t utc_time;
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 9f00917647..cd5065420d 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -181,6 +181,7 @@ protected:
 	LLButton* mExpandCollapseLineBtn;
 	LLButton* mExpandCollapseBtn;
 	LLButton* mTearOffBtn;
+	LLButton* mEmojiBtn;
 	LLButton* mCloseBtn;
 	LLButton* mGearBtn;
 	LLButton* mAddBtn;
@@ -206,6 +207,9 @@ private:
 
 	void onInputEditorClicked();
 
+	static void onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self);
+	void onEmojiSelected(llwchar emoji);
+
 	bool checkIfTornOff();
     bool mIsHostAttached;
     bool mHasVisibleBeenInitialized;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 1c1aa9ea47..483b22adc8 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -65,6 +65,7 @@
 #include "llfloaterdestinations.h"
 #include "llfloaterdisplayname.h"
 #include "llfloatereditextdaycycle.h"
+#include "llfloateremojipicker.h"
 #include "llfloaterenvironmentadjust.h"
 #include "llfloaterexperienceprofile.h"
 #include "llfloaterexperiences.h"
@@ -329,7 +330,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("camera_presets", "floater_camera_presets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCameraPresets>);
 	LLFloaterReg::add("chat_voice", "floater_voice_chat_volume.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChatVoiceVolume>);
 	LLFloaterReg::add("nearby_chat", "floater_im_session.xml", (LLFloaterBuildFunc)&LLFloaterIMNearbyChat::buildFloater);
-    LLFloaterReg::add("classified", "floater_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterClassified>);
+	LLFloaterReg::add("classified", "floater_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterClassified>);
 	LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
 	LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationLog>);
 	LLFloaterReg::add("add_landmark", "floater_create_landmark.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCreateLandmark>);
@@ -337,19 +338,20 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("delete_pref_preset", "floater_delete_pref_preset.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDeletePrefPreset>);
 	LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDestinations>);
 
-	LLFloaterReg::add("emoji_complete", "floater_emoji_complete.xml", &LLFloaterReg::build<LLFloaterEmojiComplete>);
+	LLFloaterReg::add("emoji_picker", "floater_emoji_picker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiPicker>);
+	LLFloaterReg::add("emoji_complete", "floater_emoji_complete.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiComplete>);
 	LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>);
 
-    LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>);
-    LLFloaterReg::add("env_fixed_environmentent_sky", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>);
+	LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>);
+	LLFloaterReg::add("env_fixed_environmentent_sky", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>);
 
-    LLFloaterReg::add("env_adjust_snapshot", "floater_adjust_environment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEnvironmentAdjust>);
+	LLFloaterReg::add("env_adjust_snapshot", "floater_adjust_environment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEnvironmentAdjust>);
 
-    LLFloaterReg::add("env_edit_extdaycycle", "floater_edit_ext_day_cycle.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEditExtDayCycle>);
-    LLFloaterReg::add("my_environments", "floater_my_environments.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMyEnvironment>);
+	LLFloaterReg::add("env_edit_extdaycycle", "floater_edit_ext_day_cycle.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEditExtDayCycle>);
+	LLFloaterReg::add("my_environments", "floater_my_environments.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMyEnvironment>);
 
-    LLFloaterReg::add("event", "floater_event.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEvent>);
-    LLFloaterReg::add("experiences", "floater_experiences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterExperiences>);
+	LLFloaterReg::add("event", "floater_event.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEvent>);
+	LLFloaterReg::add("experiences", "floater_experiences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterExperiences>);
 	LLFloaterReg::add("experience_profile", "floater_experienceprofile.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterExperienceProfile>);
 	LLFloaterReg::add("experience_search", "floater_experience_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterExperiencePicker>);
 
diff --git a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png
new file mode 100644
index 0000000000..668dcaf193
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1f2c0867c4..f69f1df71a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -205,6 +205,7 @@ with the same filename but different name
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
 
+  <texture name="Emoji_Picker_Icon" file_name="icons/emoji_picker_icon.png" preload="true" />
   <texture name="ExternalBrowser_Off" file_name="icons/ExternalBrowser_Off.png" preload="false" />
   <texture name="Edit_Wrench" file_name="icons/Edit_Wrench.png" preload="false" />
 
@@ -212,7 +213,7 @@ with the same filename but different name
 
   <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
   <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
- <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
+  <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
   <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
   <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="false" />
@@ -328,7 +329,7 @@ with the same filename but different name
   <texture name="Inv_Underpants" file_name="icons/Inv_Underpants.png" preload="false" />
   <texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" />
   <texture name="Inv_Link" file_name="icons/Inv_Link.png" preload="false" />
-    <texture name="Inv_Settings" file_name="icons/Inv_Settings.png" preload="false" />
+  <texture name="Inv_Settings" file_name="icons/Inv_Settings.png" preload="false" />
   <texture name="Inv_SettingsSky" file_name="icons/Inv_SettingsSky.png" preload="false" />
   <texture name="Inv_SettingsWater" file_name="icons/Inv_SettingsWater.png" preload="false" />
   <texture name="Inv_SettingsDay" file_name="icons/Inv_SettingsDay.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
new file mode 100644
index 0000000000..a3e504cc31
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  name="emojipicker"
+  title="CHOOSE EMOJI"
+  help_topic="emojipicker"
+  positioning="cascading"
+  legacy_header_height="10"
+  can_resize="false"
+  layout="topleft"
+  height="419"
+  width="200">
+    <panel
+      label="Emojis"
+      name="EmojiPanel"
+      help_topic="emojipicker"
+      layout="topleft"
+      top="4"
+      left="2"
+      height="410"
+      width="196">
+      <scroll_list
+        draw_heading="true"
+        heading_height="28"
+        follows="all"
+        layout="topleft"
+        name="Emojis"
+        sort_column="0"
+		height="410">
+        <columns
+          label="Look"
+          name="look"
+          width="40" />
+		<columns
+          label="Name"
+          name="name"
+          width="150" />
+	  </scroll_list>
+    </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index da84fbeea6..1592352d1b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -297,8 +297,20 @@
                          tab_group="3"
                          bottom="-8"
                          left_pad="5"
-                         right="-5"
+                         right="-30"
                          wrap="true" />
+                        <button
+                         follows="right|bottom"
+                         bottom="-7"
+                         height="25"
+                         image_hover_unselected="Toolbar_Middle_Over"
+                         image_overlay="Emoji_Picker_Icon"
+                         image_selected="Toolbar_Middle_Selected"
+                         image_unselected="Toolbar_Middle_Off"
+                         right="-1"
+                         name="emoji_panel_btn"
+                         tool_tip="Shows/hides emoji panel"
+                         width="25"/>
                     </layout_panel>
                     <layout_panel
                      auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2fd2028c6b..5687fe55a5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -485,9 +485,9 @@ http://secondlife.com/support for help fixing this problem.
 	<!-- build floater -->
 	<string name="multiple_textures">Multiple</string>
 
-<string name="use_texture">Use texture</string>
-    <string name="manip_hint1">Move mouse cursor over ruler</string>
-    <string name="manip_hint2">to snap to grid</string>
+	<string name="use_texture">Use texture</string>
+	<string name="manip_hint1">Move mouse cursor over ruler</string>
+	<string name="manip_hint2">to snap to grid</string>
 
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
@@ -502,14 +502,14 @@ http://secondlife.com/support for help fixing this problem.
 
 	<!-- Chat -->
 	<string name="NearbyChatTitle">Nearby chat</string>
-  <string name="NearbyChatLabel">(Nearby chat)</string>
+	<string name="NearbyChatLabel">(Nearby chat)</string>
 	<string name="whisper">whispers:</string>
 	<string name="shout">shouts:</string>
 	<string name="ringing">Connecting to in-world Voice Chat...</string>
 	<string name="connected">Connected</string>
 	<string name="unavailable">Voice not available at your current location</string>
 	<string name="hang_up">Disconnected from in-world Voice Chat</string>
-  <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
+	<string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
 	<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
-- 
cgit v1.2.3


From 8dad411e9055c32a753e575ccd6142073eb27aae Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 14 Apr 2023 09:05:14 -0700
Subject: SL-19575: Emoji gallery - couple of tweaks that mac Clang got sad
 about

---
 indra/newview/llfloateremojipicker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index c828a95a59..a63a9fac4f 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -91,14 +91,14 @@ LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
 
 BOOL LLFloaterEmojiPicker::postBuild()
 {
-	if (mEmojis = getChild<LLScrollListCtrl>("Emojis"))
+	if ((mEmojis = getChild<LLScrollListCtrl>("Emojis")))
 	{
 		mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onSelect, this));
 
 		mEmojis->clearRows();
 
 		const std::map<llwchar, const LLEmojiDescriptor*>& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
-		for (const std::pair<llwchar, const LLEmojiDescriptor*>& it : emoji2Descr)
+		for (const std::pair<const llwchar, const LLEmojiDescriptor*>& it : emoji2Descr)
 		{
 			LLScrollListItem::Params params;
 			params.columns.add().column("name").value(it.second->Name);
-- 
cgit v1.2.3


From dc5ef88e314d201f8f15be33d3517f45c4af2878 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 19 Apr 2023 20:31:37 +0300
Subject: SL-19623 Updated contributions

---
 doc/contributions.txt        | 1 +
 indra/newview/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8afe922cbe..8e5d4e831d 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -237,6 +237,7 @@ Ansariel Hiller
 	SL-15227
 	SL-15398
 	SL-18432
+	SL-19623
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 840630d422..0f4cdefae9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1899,7 +1899,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
         ${LLPHYSICSEXTENSIONS_LIBRARIES}
         ll::bugsplat
         ll::tracy
-        ll::icu4u
+        ll::icu4c
         )
 
 if( TARGET ll::intel_memops )
-- 
cgit v1.2.3


From 97b0ba2a6d2596da867043077e32065653d44f6e Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 19 Apr 2023 01:39:42 +0200
Subject: SL-19575 LLFloaterEmojiPicker - Add filter by category

---
 indra/llcommon/llstring.h                          |  15 ++
 indra/llui/llbutton.cpp                            |  23 ++-
 indra/llui/llbutton.h                              |   5 +
 indra/llui/llemojidictionary.cpp                   |  10 +
 indra/llui/llemojidictionary.h                     |  14 +-
 indra/llui/llfloater.cpp                           |  18 +-
 indra/llui/llfloater.h                             |   4 +-
 indra/llui/llscrolllistctrl.cpp                    |   4 +-
 indra/llui/llscrolllistctrl.h                      |  30 +--
 indra/newview/llfloateravatarpicker.cpp            |   1 -
 indra/newview/llfloateremojipicker.cpp             | 203 ++++++++++++++++++---
 indra/newview/llfloateremojipicker.h               |  36 +++-
 indra/newview/llfloaterimsessiontab.cpp            |  13 +-
 indra/newview/llfloaterimsessiontab.h              |   3 +-
 indra/newview/llviewerchat.cpp                     |   2 +-
 .../skins/default/xui/en/floater_emoji_picker.xml  |  95 ++++++----
 16 files changed, 368 insertions(+), 108 deletions(-)

diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 9afbea9afe..bdb90335e1 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -357,6 +357,7 @@ public:
 	static void	replaceNonstandardASCII( string_type& string, T replacement );
 	static void	replaceChar( string_type& string, T target, T replacement );
 	static void replaceString( string_type& string, string_type target, string_type replacement );
+	static void capitalize(string_type& str);
 	
 	static BOOL	containsNonprintable(const string_type& string);
 	static void	stripNonprintable(string_type& string);
@@ -1595,6 +1596,20 @@ void LLStringUtilBase<T>::replaceTabsWithSpaces( string_type& str, size_type spa
 	str = out_str;
 }
 
+//static
+template<class T>
+void LLStringUtilBase<T>::capitalize(string_type& str)
+{
+	if (str.size())
+	{
+		auto last = str[0] = toupper(str[0]);
+		for (U32 i = 1; i < str.size(); ++i)
+		{
+			last = (last == ' ' || last == '-' || last == '_') ? str[i] = toupper(str[i]) : str[i];
+		}
+	}
+}
+
 //static
 template<class T> 
 BOOL LLStringUtilBase<T>::containsNonprintable(const string_type& string)
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 3354cb2db3..aeeff0b36f 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -68,6 +68,7 @@ LLButton::Params::Params()
 	label_shadow("label_shadow", true),
 	auto_resize("auto_resize", false),
 	use_ellipses("use_ellipses", false),
+	use_font_color("use_font_color", false),
 	image_unselected("image_unselected"),
 	image_selected("image_selected"),
 	image_hover_selected("image_hover_selected"),
@@ -160,6 +161,7 @@ LLButton::LLButton(const LLButton::Params& p)
 	mDropShadowedText(p.label_shadow),
 	mAutoResize(p.auto_resize),
 	mUseEllipses( p.use_ellipses ),
+	mUseFontColor( p.use_font_color),
 	mHAlign(p.font_halign),
 	mLeftHPad(p.pad_left),
 	mRightHPad(p.pad_right),
@@ -960,7 +962,7 @@ void LLButton::draw()
 			LLFontGL::NORMAL,
 			mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NO_SHADOW,
 			S32_MAX, text_width,
-			NULL, mUseEllipses);
+			NULL, mUseEllipses, mUseFontColor);
 	}
 
 	LLUICtrl::draw();
@@ -1020,6 +1022,16 @@ BOOL LLButton::toggleState()
 	return flipped; 
 }
 
+void LLButton::setLabel( const std::string& label )
+{
+	mUnselectedLabel = mSelectedLabel = label;
+}
+
+void LLButton::setLabel( const LLUIString& label )
+{
+	mUnselectedLabel = mSelectedLabel = label;
+}
+
 void LLButton::setLabel( const LLStringExplicit& label )
 {
 	setLabelUnselected(label);
@@ -1051,14 +1063,7 @@ bool LLButton::labelIsTruncated() const
 
 const LLUIString& LLButton::getCurrentLabel() const
 {
-	if( getToggleState() )
-	{
-		return mSelectedLabel;
-	}
-	else
-	{
-		return mUnselectedLabel;
-	}
+	return getToggleState() ? mSelectedLabel : mUnselectedLabel;
 }
 
 void LLButton::setImageUnselected(LLPointer<LLUIImage> image)
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index ccd31e90c0..257159f64f 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -73,6 +73,7 @@ public:
 		Optional<bool>			label_shadow;
 		Optional<bool>			auto_resize;
 		Optional<bool>			use_ellipses;
+		Optional<bool>			use_font_color;
 
 		// images
 		Optional<LLUIImage*>	image_unselected,
@@ -174,6 +175,7 @@ public:
 	void			setUnselectedLabelColor( const LLColor4& c )		{ mUnselectedLabelColor = c; }
 	void			setSelectedLabelColor( const LLColor4& c )			{ mSelectedLabelColor = c; }
 	void			setUseEllipses( BOOL use_ellipses )					{ mUseEllipses = use_ellipses; }
+	void			setUseFontColor( BOOL use_font_color)				{ mUseFontColor = use_font_color; }
 
 
 	boost::signals2::connection setClickedCallback(const CommitCallbackParam& cb);
@@ -238,6 +240,8 @@ public:
 	
 	void            autoResize();	// resize with label of current btn state 
 	void            resize(LLUIString label); // resize with label input
+	void			setLabel(const std::string& label);
+	void			setLabel(const LLUIString& label);
 	void			setLabel( const LLStringExplicit& label);
 	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 	void			setLabelUnselected(const LLStringExplicit& label);
@@ -353,6 +357,7 @@ protected:
 	bool						mDropShadowedText;
 	bool						mAutoResize;
 	bool						mUseEllipses;
+	bool						mUseFontColor;
 	bool						mBorderEnabled;
 	bool						mFlashing;
 
diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index b70a9b2e7a..d306407484 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -175,6 +175,12 @@ LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
 	return result;
 }
 
+const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromEmoji(llwchar emoji) const
+{
+	const auto it = mEmoji2Descr.find(emoji);
+	return (mEmoji2Descr.end() != it) ? it->second : nullptr;
+}
+
 const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromShortCode(const std::string& short_code) const
 {
 	const auto it = mShortCode2Descr.find(short_code);
@@ -195,6 +201,10 @@ void LLEmojiDictionary::addEmoji(LLEmojiDescriptor&& descr)
 	{
 		mShortCode2Descr.insert(std::make_pair(shortCode, &mEmojis.back()));
 	}
+	for (const std::string& category : descr.Categories)
+	{
+		mCategory2Descrs[category].push_back(&mEmojis.back());
+	}
 }
 
 // ============================================================================
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index adc22ced58..cbb0ac577d 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -56,20 +56,28 @@ class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLI
 	~LLEmojiDictionary() override {};
 
 public:
+	typedef std::map<llwchar, const LLEmojiDescriptor*> emoji2descr_map_t;
+	typedef std::map<std::string, const LLEmojiDescriptor*> code2descr_map_t;
+	typedef std::map<std::string, std::vector<const LLEmojiDescriptor*>> cat2descrs_map_t;
+
 	static void initClass();
 	LLWString   findMatchingEmojis(const std::string& needle) const;
+	const LLEmojiDescriptor* getDescriptorFromEmoji(llwchar emoji) const;
 	const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
 	std::string getNameFromEmoji(llwchar ch) const;
 
-	const std::map<llwchar, const LLEmojiDescriptor*>& getEmoji2Descr() const { return mEmoji2Descr; }
+	const emoji2descr_map_t& getEmoji2Descr() const { return mEmoji2Descr; }
+	const code2descr_map_t& getShortCode2Descr() const { return mShortCode2Descr; }
+	const cat2descrs_map_t& getCategory2Descrs() const { return mCategory2Descrs; }
 
 private:
 	void addEmoji(LLEmojiDescriptor&& descr);
 
 private:
 	std::list<LLEmojiDescriptor> mEmojis;
-	std::map<llwchar, const LLEmojiDescriptor*> mEmoji2Descr;
-	std::map<std::string, const LLEmojiDescriptor*> mShortCode2Descr;
+	emoji2descr_map_t mEmoji2Descr;
+	code2descr_map_t mShortCode2Descr;
+	cat2descrs_map_t mCategory2Descrs;
 };
 
 // ============================================================================
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 346e89a101..98895d56dd 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1509,14 +1509,24 @@ BOOL LLFloater::isFrontmost()
 				&& floater_view->getFrontmost() == this);
 }
 
-void LLFloater::addDependentFloater(LLFloater* floaterp, BOOL reposition)
+void LLFloater::addDependentFloater(LLFloater* floaterp, BOOL reposition, BOOL resize)
 {
 	mDependents.insert(floaterp->getHandle());
 	floaterp->mDependeeHandle = getHandle();
 
 	if (reposition)
 	{
-		floaterp->setRect(gFloaterView->findNeighboringPosition(this, floaterp));
+		LLRect rect = gFloaterView->findNeighboringPosition(this, floaterp);
+		if (resize)
+		{
+			const LLRect& base = getRect();
+			if (rect.mTop == base.mTop)
+				rect.mBottom = base.mBottom;
+			else if (rect.mLeft == base.mLeft)
+				rect.mRight = base.mRight;
+			floaterp->reshape(rect.getWidth(), rect.getHeight(), FALSE);
+		}
+		floaterp->setRect(rect);
 		floaterp->setSnapTarget(getHandle());
 	}
 	gFloaterView->adjustToFitScreen(floaterp, FALSE, TRUE);
@@ -1527,12 +1537,12 @@ void LLFloater::addDependentFloater(LLFloater* floaterp, BOOL reposition)
 	}
 }
 
-void LLFloater::addDependentFloater(LLHandle<LLFloater> dependent, BOOL reposition)
+void LLFloater::addDependentFloater(LLHandle<LLFloater> dependent, BOOL reposition, BOOL resize)
 {
 	LLFloater* dependent_floaterp = dependent.get();
 	if(dependent_floaterp)
 	{
-		addDependentFloater(dependent_floaterp, reposition);
+		addDependentFloater(dependent_floaterp, reposition, resize);
 	}
 }
 
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 282f7a80ac..3699629ef8 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -255,8 +255,8 @@ public:
 	std::string		getShortTitle() const;
 	virtual void	setMinimized(BOOL b);
 	void			moveResizeHandlesToFront();
-	void			addDependentFloater(LLFloater* dependent, BOOL reposition = TRUE);
-	void			addDependentFloater(LLHandle<LLFloater> dependent_handle, BOOL reposition = TRUE);
+	void			addDependentFloater(LLFloater* dependent, BOOL reposition = TRUE, BOOL resize = FALSE);
+	void			addDependentFloater(LLHandle<LLFloater> dependent_handle, BOOL reposition = TRUE, BOOL resize = FALSE);
 	LLFloater*		getDependee() { return (LLFloater*)mDependeeHandle.get(); }
 	void		removeDependentFloater(LLFloater* dependent);
 	BOOL			isMinimized() const				{ return mMinimized; }
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 2a6e8a6b76..f982dc99e8 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1269,7 +1269,7 @@ BOOL LLScrollListCtrl::selectItemByLabel(const std::string& label, BOOL case_sen
 	LLScrollListItem* item = getItemByLabel(label, case_sensitive, column);
 
 	bool found = NULL != item;
-	if(found)
+	if (found)
 	{
 		selectItem(item, -1);
 	}
@@ -2747,7 +2747,7 @@ BOOL LLScrollListCtrl::setSort(S32 column_idx, BOOL ascending)
 S32	LLScrollListCtrl::getLinesPerPage()
 {
 	//if mPageLines is NOT provided display all item
-	if(mPageLines)
+	if (mPageLines)
 	{
 		return mPageLines;
 	}
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 73b4fb036a..326589a329 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -253,7 +253,7 @@ public:
 	S32				getItemIndex( LLScrollListItem* item ) const;
 	S32				getItemIndex( const LLUUID& item_id ) const;
 
-	void setCommentText( const std::string& comment_text);
+	void			setCommentText( const std::string& comment_text);
 	LLScrollListItem* addSeparator(EAddPosition pos);
 
 	// "Simple" interface: use this when you're creating a list that contains only unique strings, only
@@ -263,7 +263,7 @@ public:
 	BOOL			selectItemByLabel( const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0 );		// FALSE if item not found
 	BOOL			selectItemByPrefix(const std::string& target, BOOL case_sensitive = TRUE, S32 column = -1);
 	BOOL			selectItemByPrefix(const LLWString& target, BOOL case_sensitive = TRUE, S32 column = -1);
-	LLScrollListItem*  getItemByLabel( const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0 );
+	LLScrollListItem*	getItemByLabel(const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0);
 	const std::string	getSelectedItemLabel(S32 column = 0) const;
 	LLSD			getSelectedValue();
 
@@ -322,7 +322,7 @@ public:
 
 	virtual S32		getScrollPos() const;
 	virtual void	setScrollPos( S32 pos );
-	S32 getSearchColumn();
+	S32				getSearchColumn();
 	void			setSearchColumn(S32 column) { mSearchColumn = column; }
 	S32				getColumnIndexFromOffset(S32 x);
 	S32				getColumnOffsetFromIndex(S32 index);
@@ -371,13 +371,13 @@ public:
 	// Used "internally" by the scroll bar.
 	void			onScrollChange( S32 new_pos, LLScrollbar* src );
 
-	static void onClickColumn(void *userdata);
+	static void		onClickColumn(void *userdata);
 
-	virtual void updateColumns(bool force_update = false);
-	S32 calcMaxContentWidth();
-	bool updateColumnWidths();
+	virtual void	updateColumns(bool force_update = false);
+	S32				calcMaxContentWidth();
+	bool			updateColumnWidths();
 
-	void setHeadingHeight(S32 heading_height);
+	void			setHeadingHeight(S32 heading_height);
 	/**
 	 * Sets  max visible  lines without scroolbar, if this value equals to 0,
 	 * then display all items.
@@ -398,18 +398,20 @@ public:
 	virtual void	deselect();
 	virtual BOOL	canDeselect() const;
 
-	void setNumDynamicColumns(S32 num) { mNumDynamicWidthColumns = num; }
-	void updateStaticColumnWidth(LLScrollListColumn* col, S32 new_width);
-	S32 getTotalStaticColumnWidth() { return mTotalStaticColumnWidth; }
+	void			setNumDynamicColumns(S32 num) { mNumDynamicWidthColumns = num; }
+	void			updateStaticColumnWidth(LLScrollListColumn* col, S32 new_width);
+	S32				getTotalStaticColumnWidth() { return mTotalStaticColumnWidth; }
 
 	std::string     getSortColumnName();
 	BOOL			getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }
 	BOOL			hasSortOrder() const;
 	void			clearSortOrder();
 
-	void			setAlternateSort() { mAlternateSort = true; }
+	void			setAlternateSort() { mAlternateSort = TRUE; }
 
-	S32		selectMultiple( uuid_vec_t ids );
+	void			selectPrevItem(BOOL extend_selection = FALSE);
+	void			selectNextItem(BOOL extend_selection = FALSE);
+	S32				selectMultiple(uuid_vec_t ids);
 	// conceptually const, but mutates mItemList
 	void			updateSort() const;
 	// sorts a list without affecting the permanent sort order (so further list insertions can be unsorted, for example)
@@ -454,8 +456,6 @@ protected:
 	void			updateLineHeight();
 
 private:
-	void			selectPrevItem(BOOL extend_selection);
-	void			selectNextItem(BOOL extend_selection);
 	void			drawItems();
 	
 	void            updateLineHeightInsert(LLScrollListItem* item);
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 2422596f60..42ef41017a 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -741,7 +741,6 @@ void LLFloaterAvatarPicker::processResponse(const LLUUID& query_id, const LLSD&
 	}
 }
 
-//static
 void LLFloaterAvatarPicker::editKeystroke(LLLineEditor* caller, void* user_data)
 {
 	getChildView("Find")->setEnabled(caller->getText().size() > 0);
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index a63a9fac4f..5efd2a24c0 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -27,10 +27,18 @@
 
 #include "llfloateremojipicker.h"
 
+#include "llcombobox.h"
+#include "llemojidictionary.h"
 #include "llfloaterreg.h"
+#include "lllineeditor.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
-#include "llemojidictionary.h"
+#include "lltextbox.h" 
+#include "llviewerchat.h" 
+
+std::string LLFloaterEmojiPicker::mSelectedCategory;
+std::string LLFloaterEmojiPicker::mSearchPattern;
+int LLFloaterEmojiPicker::mSelectedEmojiIndex;
 
 class LLEmojiScrollListItem : public LLScrollListItem
 {
@@ -69,17 +77,18 @@ LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
 	return floater;
 }
 
-LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(select_callback_t callback)
+LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_callback, close_callback_t close_callback)
 {
 	LLFloaterEmojiPicker* floater = getInstance();
 	if (LLFloaterEmojiPicker* floater = getInstance())
-		floater->show(callback);
+		floater->show(pick_callback, close_callback);
 	return floater;
 }
 
-void LLFloaterEmojiPicker::show(select_callback_t callback)
+void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t close_callback)
 {
-	mSelectCallback = callback;
+	mEmojiPickCallback = pick_callback;
+	mFloaterCloseCallback = close_callback;
 	openFloater(mKey);
 	setFocus(TRUE);
 }
@@ -91,19 +100,41 @@ LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
 
 BOOL LLFloaterEmojiPicker::postBuild()
 {
-	if ((mEmojis = getChild<LLScrollListCtrl>("Emojis")))
+	// Should be initialized first
+	if ((mPreviewEmoji = getChild<LLButton>("PreviewEmoji")))
 	{
-		mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onSelect, this));
-
-		mEmojis->clearRows();
+		mPreviewEmoji->setClickedCallback(boost::bind(&LLFloaterEmojiPicker::onPreviewEmojiClick, this));
+	}
 
-		const std::map<llwchar, const LLEmojiDescriptor*>& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
-		for (const std::pair<const llwchar, const LLEmojiDescriptor*>& it : emoji2Descr)
+	if ((mCategory = getChild<LLComboBox>("Category")))
+	{
+		mCategory->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onCategoryCommit, this));
+		mCategory->setLabel(LLStringExplicit("Choose a category"));
+		const auto& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
+		mCategory->clearRows();
+		for (const auto& item : cat2Descrs)
 		{
-			LLScrollListItem::Params params;
-			params.columns.add().column("name").value(it.second->Name);
-			mEmojis->addRow(new LLEmojiScrollListItem(it.first, params), params);
+			std::string value = item.first;
+			std::string name = value;
+			LLStringUtil::capitalize(name);
+			mCategory->add(name, value);
 		}
+		mCategory->setSelectedByValue(mSelectedCategory, true);
+	}
+
+	if ((mSearch = getChild<LLLineEditor>("Search")))
+	{
+		mSearch->setKeystrokeCallback(boost::bind(&LLFloaterEmojiPicker::onSearchKeystroke, this, _1, _2), NULL);
+		mSearch->setLabel(LLStringExplicit("Type to search an emoji"));
+		mSearch->setFont(LLViewerChat::getChatFont());
+		mSearch->setText(mSearchPattern);
+	}
+
+	if ((mEmojis = getChild<LLScrollListCtrl>("Emojis")))
+	{
+		mEmojis->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiSelect, this));
+		mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiPick, this));
+		fillEmojis();
 	}
 
 	return TRUE;
@@ -114,30 +145,152 @@ LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
 	gFocusMgr.releaseFocusIfNeeded( this );
 }
 
-void LLFloaterEmojiPicker::onSelect()
+void LLFloaterEmojiPicker::fillEmojis()
+{
+	mEmojis->clearRows();
+
+	const auto& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
+	for (const std::pair<const llwchar, const LLEmojiDescriptor*>& it : emoji2Descr)
+	{
+		const LLEmojiDescriptor* descr = it.second;
+
+		if (!mSelectedCategory.empty() && !matchesCategory(descr))
+			continue;
+
+		if (!mSearchPattern.empty() && !matchesPattern(descr))
+			continue;
+
+		LLScrollListItem::Params params;
+		params.columns.add().column("name").value(descr->Name);
+		mEmojis->addRow(new LLEmojiScrollListItem(it.first, params), params);
+	}
+
+	if (mEmojis->getItemCount())
+	{
+		if (mSelectedEmojiIndex > 0 && mSelectedEmojiIndex < mEmojis->getItemCount())
+			mEmojis->selectNthItem(mSelectedEmojiIndex);
+		else
+			mEmojis->selectFirstItem();
+
+		mEmojis->scrollToShowSelected();
+	}
+	else
+	{
+		onEmojiEmpty();
+	}
+}
+
+bool LLFloaterEmojiPicker::matchesCategory(const LLEmojiDescriptor* descr)
+{
+	return std::find(descr->Categories.begin(), descr->Categories.end(), mSelectedCategory) != descr->Categories.end();
+}
+
+bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
+{
+	if (descr->Name.find(mSearchPattern) != std::string::npos)
+		return true;
+	for (auto shortCode : descr->ShortCodes)
+		if (shortCode.find(mSearchPattern) != std::string::npos)
+			return true;
+	for (auto category : descr->Categories)
+		if (category.find(mSearchPattern) != std::string::npos)
+			return true;
+	return false;
+}
+
+void LLFloaterEmojiPicker::onCategoryCommit()
+{
+	mSelectedCategory = mCategory->getSelectedValue().asString();
+	mSelectedEmojiIndex = 0;
+	fillEmojis();
+}
+
+void LLFloaterEmojiPicker::onSearchKeystroke(LLLineEditor* caller, void* user_data)
 {
-	if (mEmojis && mSelectCallback)
+	mSearchPattern = mSearch->getText();
+	mSelectedEmojiIndex = 0;
+	fillEmojis();
+}
+
+void LLFloaterEmojiPicker::onPreviewEmojiClick()
+{
+	if (mEmojis && mEmojiPickCallback)
 	{
 		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected()))
 		{
-			mSelectCallback(item->getEmoji());
+			mEmojiPickCallback(item->getEmoji());
 		}
 	}
 }
 
-// virtual
-BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
+void LLFloaterEmojiPicker::onEmojiSelect()
 {
-	if (key == KEY_RETURN && mask == MASK_NONE)
+	const LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected());
+	if (item)
 	{
-		onSelect();
-		return TRUE;
+		mSelectedEmojiIndex = mEmojis->getFirstSelectedIndex();
+		LLUIString text;
+		text.insert(0, LLWString(1, item->getEmoji()));
+		if (mPreviewEmoji)
+			mPreviewEmoji->setLabel(text);
+		return;
 	}
-	else if (key == KEY_ESCAPE && mask == MASK_NONE)
+
+	onEmojiEmpty();
+}
+
+void LLFloaterEmojiPicker::onEmojiEmpty()
+{
+	mSelectedEmojiIndex = 0;
+	if (mPreviewEmoji)
+		mPreviewEmoji->setLabel(LLUIString());
+}
+
+void LLFloaterEmojiPicker::onEmojiPick()
+{
+	if (mEmojis && mEmojiPickCallback)
 	{
-		closeFloater();
-		return TRUE;
+		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected()))
+		{
+			mEmojiPickCallback(item->getEmoji());
+			closeFloater();
+		}
+	}
+}
+
+// virtual
+BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
+{
+	if (mask == MASK_NONE)
+	{
+		switch (key)
+		{
+		case KEY_RETURN:
+			if (mCategory->hasFocus())
+				break;
+			onEmojiPick();
+			return TRUE;
+		case KEY_ESCAPE:
+			closeFloater();
+			return TRUE;
+		case KEY_UP:
+			mEmojis->selectPrevItem();
+			mEmojis->scrollToShowSelected();
+			return TRUE;
+		case KEY_DOWN:
+			mEmojis->selectNextItem();
+			mEmojis->scrollToShowSelected();
+			return TRUE;
+		}
 	}
 
 	return LLFloater::handleKeyHere(key, mask);
 }
+
+// virtual
+void LLFloaterEmojiPicker::closeFloater(bool app_quitting)
+{
+	LLFloater::closeFloater(app_quitting);
+	if (mFloaterCloseCallback)
+		mFloaterCloseCallback();
+}
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 9b442064d0..01335bbb5b 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -29,31 +29,53 @@
 
 #include "llfloater.h"
 
+struct LLEmojiDescriptor;
+
 class LLFloaterEmojiPicker : public LLFloater
 {
 public:
 	// The callback function will be called with an emoji char.
-	typedef boost::function<void (llwchar)> select_callback_t;
+	typedef boost::function<void (llwchar)> pick_callback_t;
+	typedef boost::function<void ()> close_callback_t;
 
 	// Call this to select an emoji.
 	static LLFloaterEmojiPicker* getInstance();
-	static LLFloaterEmojiPicker* showInstance(select_callback_t callback);
+	static LLFloaterEmojiPicker* showInstance(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
 
 	LLFloaterEmojiPicker(const LLSD& key);
 	virtual ~LLFloaterEmojiPicker();
 
 	virtual	BOOL postBuild();
 
-	void show(select_callback_t callback);
+	void show(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
+
+	virtual void closeFloater(bool app_quitting = false);
 
 private:
-	void onSelect();
+	void fillEmojis();
+	bool matchesCategory(const LLEmojiDescriptor* descr);
+	bool matchesPattern(const LLEmojiDescriptor* descr);
+
+	void onCategoryCommit();
+	void onSearchKeystroke(class LLLineEditor* caller, void* user_data);
+	void onPreviewEmojiClick();
+	void onEmojiSelect();
+	void onEmojiEmpty();
+	void onEmojiPick();
 
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
 
-	class LLScrollListCtrl* mEmojis;
-	select_callback_t mSelectCallback;
-	std::string mEmojiName;
+	class LLComboBox* mCategory { nullptr };
+	class LLLineEditor* mSearch { nullptr };
+	class LLScrollListCtrl* mEmojis { nullptr };
+	class LLButton* mPreviewEmoji { nullptr };
+
+	pick_callback_t mEmojiPickCallback;
+	close_callback_t mFloaterCloseCallback;
+
+	static std::string mSelectedCategory;
+	static std::string mSearchPattern;
+	static int mSelectedEmojiIndex;
 };
 
 #endif
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 3d9751dd35..0571a0d855 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -434,10 +434,12 @@ void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self)
 	{
 		if (!picker->isShown())
 		{
-			picker->show(boost::bind(&LLFloaterIMSessionTab::onEmojiSelected, self, _1));
+			picker->show(
+				boost::bind(&LLFloaterIMSessionTab::onEmojiPicked, self, _1),
+				boost::bind(&LLFloaterIMSessionTab::onEmojiPickerClosed, self));
 			if (LLFloater* root_floater = gFloaterView->getParentFloater(self))
 			{
-				root_floater->addDependentFloater(picker);
+				root_floater->addDependentFloater(picker, TRUE, TRUE);
 			}
 		}
 		else
@@ -447,11 +449,16 @@ void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self)
 	}
 }
 
-void LLFloaterIMSessionTab::onEmojiSelected(llwchar emoji)
+void LLFloaterIMSessionTab::onEmojiPicked(llwchar emoji)
 {
 	mInputEditor->insertEmoji(emoji);
 }
 
+void LLFloaterIMSessionTab::onEmojiPickerClosed()
+{
+	mInputEditor->setFocus(TRUE);
+}
+
 std::string LLFloaterIMSessionTab::appendTime()
 {
 	time_t utc_time;
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index cd5065420d..3dcb767aa6 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -208,7 +208,8 @@ private:
 	void onInputEditorClicked();
 
 	static void onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self);
-	void onEmojiSelected(llwchar emoji);
+	void onEmojiPicked(llwchar emoji);
+	void onEmojiPickerClosed();
 
 	bool checkIfTornOff();
     bool mIsHostAttached;
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 1c3c547bc1..0d2d62fd77 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-#include "llviewerchat.h" 
+#include "llviewerchat.h"
 
 // newview includes
 #include "llagent.h" 	// gAgent		
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index a3e504cc31..831f7b6582 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -1,39 +1,64 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-  name="emojipicker"
-  title="CHOOSE EMOJI"
-  help_topic="emojipicker"
-  positioning="cascading"
-  legacy_header_height="10"
-  can_resize="false"
-  layout="topleft"
-  height="419"
-  width="200">
-    <panel
-      label="Emojis"
-      name="EmojiPanel"
-      help_topic="emojipicker"
+    name="emojipicker"
+    title="CHOOSE EMOJI"
+    help_topic="emojipicker"
+    positioning="cascading"
+    legacy_header_height="0"
+    can_resize="true"
+    layout="topleft"
+    height="400"
+    width="200">
+  <line_editor
+      name="Search"
+      layout="bottomleft"
+      follows="bottom|left|right"
+      text_tentative_color="TextFgTentativeColor"
+      max_length_bytes="63"
+      left_pad="5"
+	  bottom="14"
+	  left="34"
+      height="29"
+      width="162" />
+  <button
+	  name="PreviewEmoji"
+      layout="bottomleft"
+      follows="bottom|left"
+	  font="EmojiHuge"
+	  use_font_color="true"
+	  bottom="14"
+	  left="0"
+	  height="29"
+	  width="29" />
+  <scroll_list
+      name="Emojis"
       layout="topleft"
-      top="4"
-      left="2"
-      height="410"
-      width="196">
-      <scroll_list
-        draw_heading="true"
-        heading_height="28"
-        follows="all"
-        layout="topleft"
-        name="Emojis"
-        sort_column="0"
-		height="410">
-        <columns
-          label="Look"
-          name="look"
-          width="40" />
-		<columns
-          label="Name"
-          name="name"
-          width="150" />
-	  </scroll_list>
-    </panel>
+      follows="all"
+      sort_column="0"
+	  max_chars="63"
+	  commit_on_selection_change="true"
+      draw_heading="true"
+      heading_height="25"
+	  row_padding="0"
+	  top="25"
+	  height="330"
+	  width="200">
+    <columns
+        label="Look"
+        name="look"
+        width="40" />
+	<columns
+        label="Name"
+        name="name" />
+  </scroll_list>
+  <combo_box
+      name="Category"
+      layout="topleft"
+      follows="top|left|right"
+	  allow_text_entry="true"
+      left_pad="4"
+	  top="0"
+	  left="4"
+      height="27"
+      width="192" />
 </floater>
-- 
cgit v1.2.3


From e246e811faad2a307c1cabe228af14c033fde25a Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 20 Apr 2023 08:47:18 -0700
Subject: DRTVWR-489: Pull in SL-19594 Update to Bugsplat that doesn't block on
 failure to upload PBDs - this means we need to upload symbols for this build
 to Bugsplat manually if we want meaningful crash reports

---
 autobuild.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index ac153ed5e7..84c3fb2ad5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -196,9 +196,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ad306307016d6ac6f86823d7292847ff</string>
+              <string>5b32c47ae8e8cf0d4106f08e8db18044</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113514/981926/bugsplat-4.0.3.0.579546-windows-579546.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113878/983697/bugsplat-4.0.3.0.579696-windows-579696.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -208,16 +208,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8d237d16a0c038649e17a64ba8c9f2b7</string>
+              <string>79c005fd8a660f8551b3c9ede64fa4ef</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113517/981927/bugsplat-4.0.3.0.579546-windows64-579546.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/113879/983696/bugsplat-4.0.3.0.579696-windows64-579696.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>4.0.3.0.579546</string>
+        <string>4.0.3.0.579696</string>
       </map>
       <key>colladadom</key>
       <map>
-- 
cgit v1.2.3


From c2eec5b100a7064f3c737db46f893864a8b29c3a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 22 Apr 2023 18:38:46 +0200
Subject: Don't hardcode UI text plus layout fixes and removing some needless
 checks

---
 indra/newview/llfloateremojipicker.cpp             | 54 +++++++++-------------
 .../skins/default/xui/en/floater_emoji_picker.xml  | 25 +++++-----
 2 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 5efd2a24c0..ab81b2936f 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -80,7 +80,7 @@ LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
 LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_callback, close_callback_t close_callback)
 {
 	LLFloaterEmojiPicker* floater = getInstance();
-	if (LLFloaterEmojiPicker* floater = getInstance())
+	if (floater)
 		floater->show(pick_callback, close_callback);
 	return floater;
 }
@@ -101,41 +101,31 @@ LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
 BOOL LLFloaterEmojiPicker::postBuild()
 {
 	// Should be initialized first
-	if ((mPreviewEmoji = getChild<LLButton>("PreviewEmoji")))
+	mPreviewEmoji = getChild<LLButton>("PreviewEmoji");
+	mPreviewEmoji->setClickedCallback(boost::bind(&LLFloaterEmojiPicker::onPreviewEmojiClick, this));
+
+	mCategory = getChild<LLComboBox>("Category");
+	mCategory->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onCategoryCommit, this));
+	const auto& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
+	mCategory->clearRows();
+	for (const auto& item : cat2Descrs)
 	{
-		mPreviewEmoji->setClickedCallback(boost::bind(&LLFloaterEmojiPicker::onPreviewEmojiClick, this));
+		std::string value = item.first;
+		std::string name = value;
+		LLStringUtil::capitalize(name);
+		mCategory->add(name, value);
 	}
+	mCategory->setSelectedByValue(mSelectedCategory, true);
 
-	if ((mCategory = getChild<LLComboBox>("Category")))
-	{
-		mCategory->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onCategoryCommit, this));
-		mCategory->setLabel(LLStringExplicit("Choose a category"));
-		const auto& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
-		mCategory->clearRows();
-		for (const auto& item : cat2Descrs)
-		{
-			std::string value = item.first;
-			std::string name = value;
-			LLStringUtil::capitalize(name);
-			mCategory->add(name, value);
-		}
-		mCategory->setSelectedByValue(mSelectedCategory, true);
-	}
-
-	if ((mSearch = getChild<LLLineEditor>("Search")))
-	{
-		mSearch->setKeystrokeCallback(boost::bind(&LLFloaterEmojiPicker::onSearchKeystroke, this, _1, _2), NULL);
-		mSearch->setLabel(LLStringExplicit("Type to search an emoji"));
-		mSearch->setFont(LLViewerChat::getChatFont());
-		mSearch->setText(mSearchPattern);
-	}
+	mSearch = getChild<LLLineEditor>("Search");
+	mSearch->setKeystrokeCallback(boost::bind(&LLFloaterEmojiPicker::onSearchKeystroke, this, _1, _2), NULL);
+	mSearch->setFont(LLViewerChat::getChatFont());
+	mSearch->setText(mSearchPattern);
 
-	if ((mEmojis = getChild<LLScrollListCtrl>("Emojis")))
-	{
-		mEmojis->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiSelect, this));
-		mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiPick, this));
-		fillEmojis();
-	}
+	mEmojis = getChild<LLScrollListCtrl>("Emojis");
+	mEmojis->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiSelect, this));
+	mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiPick, this));
+	fillEmojis();
 
 	return TRUE;
 }
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 831f7b6582..f339c7428f 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -11,23 +11,23 @@
     width="200">
   <line_editor
       name="Search"
+      label="Type to search an emoji"
       layout="bottomleft"
       follows="bottom|left|right"
       text_tentative_color="TextFgTentativeColor"
       max_length_bytes="63"
-      left_pad="5"
-	  bottom="14"
-	  left="34"
+	  bottom="5"
+	  left="39"
       height="29"
-      width="162" />
+      width="158" />
   <button
 	  name="PreviewEmoji"
       layout="bottomleft"
       follows="bottom|left"
 	  font="EmojiHuge"
 	  use_font_color="true"
-	  bottom="14"
-	  left="0"
+	  bottom="5"
+	  left="5"
 	  height="29"
 	  width="29" />
   <scroll_list
@@ -39,26 +39,27 @@
 	  commit_on_selection_change="true"
       draw_heading="true"
       heading_height="25"
+	  left="5"
 	  row_padding="0"
 	  top="25"
-	  height="330"
-	  width="200">
+	  height="338"
+	  width="192">
     <columns
         label="Look"
         name="look"
-        width="40" />
+        width="50" />
 	<columns
         label="Name"
         name="name" />
   </scroll_list>
   <combo_box
       name="Category"
+      label="Choose a category"
       layout="topleft"
       follows="top|left|right"
 	  allow_text_entry="true"
-      left_pad="4"
 	  top="0"
-	  left="4"
-      height="27"
+	  left="5"
+      height="25"
       width="192" />
 </floater>
-- 
cgit v1.2.3


From 8fcf691623c21dedd0e478fb8d013a28a2959811 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 22 Apr 2023 14:19:42 +0200
Subject: Load correct localized version of emoji dictionary and guard against
 access violation exception

---
 indra/llui/llemojidictionary.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index d306407484..bb5c94689a 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -141,7 +141,13 @@ void LLEmojiDictionary::initClass()
 
 	LLSD data;
 
-	const std::string filename = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_EMOJI_FILENAME, LLDir::CURRENT_SKIN).front();
+	auto filenames = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_EMOJI_FILENAME, LLDir::CURRENT_SKIN);
+	if (filenames.empty())
+	{
+		LL_WARNS() << "Emoji file characters not found" << LL_ENDL;
+		return;
+	}
+	const std::string filename = filenames.back();
 	llifstream file(filename.c_str());
 	if (file.is_open())
 	{
-- 
cgit v1.2.3


From fbf5b199f3bd9775bc992609baf6c093177a70d8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 00:44:25 +0200
Subject: SL-19575 LLFloaterEmojiPicker - code cleanup and layout fixup

---
 doc/contributions.txt                              |  1 +
 indra/llui/llemojidictionary.h                     |  3 ++
 indra/llui/llview.h                                | 24 +++++------
 indra/newview/llfloateremojipicker.cpp             | 27 ++++++------
 .../skins/default/xui/en/floater_emoji_picker.xml  | 50 +++++++++++-----------
 5 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8e5d4e831d..4a7b8f14dd 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -237,6 +237,7 @@ Ansariel Hiller
 	SL-15227
 	SL-15398
 	SL-18432
+	SL-19575
 	SL-19623
 Aralara Rajal
 Arare Chantilly
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index cbb0ac577d..88ff5b8300 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -57,8 +57,11 @@ class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLI
 
 public:
 	typedef std::map<llwchar, const LLEmojiDescriptor*> emoji2descr_map_t;
+	typedef std::pair<llwchar, const LLEmojiDescriptor*> emoji2descr_item_t;
 	typedef std::map<std::string, const LLEmojiDescriptor*> code2descr_map_t;
+	typedef std::pair<std::string, const LLEmojiDescriptor*> code2descr_item_t;
 	typedef std::map<std::string, std::vector<const LLEmojiDescriptor*>> cat2descrs_map_t;
+	typedef std::pair<std::string, std::vector<const LLEmojiDescriptor*>> cat2descrs_item_t;
 
 	static void initClass();
 	LLWString   findMatchingEmojis(const std::string& needle) const;
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index bec45df78a..0add3839bb 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -111,7 +111,7 @@ public:
 		Alternative<std::string>	string;
 		Alternative<U32>			flags;
 
-        Follows();
+		Follows();
 	};
 
 	struct Params : public LLInitParam::Block<Params>
@@ -656,8 +656,8 @@ public:
 	// Draw debug rectangles around widgets to help with alignment and spacing
 	static bool	sDebugRects;
 
-    static bool sIsRectDirty;
-    static LLRect sDirtyRect;
+	static bool sIsRectDirty;
+	static LLRect sDirtyRect;
 
 	// Draw widget names and sizes when drawing debug rectangles, turning this
 	// off is useful to make the rectangles themselves easier to see.
@@ -700,20 +700,16 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) co
 		if (!result)
 		{
 			result = LLUICtrlFactory::getDefaultWidget<T>(name);
-
-			if (result)
-			{
-				// *NOTE: You cannot call mFoo = getChild<LLFoo>("bar")
-				// in a floater or panel constructor.  The widgets will not
-				// be ready.  Instead, put it in postBuild().
-				LL_WARNS() << "Making dummy " << typeid(T).name() << " named \"" << name << "\" in " << getName() << LL_ENDL;
-			}
-			else
+			if (!result)
 			{
-				LL_WARNS() << "Failed to create dummy " << typeid(T).name() << LL_ENDL;
-				return NULL;
+				LL_ERRS() << "Failed to create dummy " << typeid(T).name() << LL_ENDL;
 			}
 
+			// *NOTE: You cannot call mFoo = getChild<LLFoo>("bar")
+			// in a floater or panel constructor.  The widgets will not
+			// be ready.  Instead, put it in postBuild().
+			LL_WARNS() << "Making dummy " << typeid(T).name() << " named \"" << name << "\" in " << getName() << LL_ENDL;
+
 			getDefaultWidgetContainer().addChild(result);
 		}
 	}
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index ab81b2936f..9d28f7d4dc 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -73,15 +73,14 @@ LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
 {
 	LLFloaterEmojiPicker* floater = LLFloaterReg::getTypedInstance<LLFloaterEmojiPicker>("emoji_picker");
 	if (!floater)
-		LL_WARNS() << "Cannot instantiate emoji picker" << LL_ENDL;
+		LL_ERRS() << "Cannot instantiate emoji picker" << LL_ENDL;
 	return floater;
 }
 
 LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_callback, close_callback_t close_callback)
 {
 	LLFloaterEmojiPicker* floater = getInstance();
-	if (floater)
-		floater->show(pick_callback, close_callback);
+	floater->show(pick_callback, close_callback);
 	return floater;
 }
 
@@ -106,9 +105,9 @@ BOOL LLFloaterEmojiPicker::postBuild()
 
 	mCategory = getChild<LLComboBox>("Category");
 	mCategory->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onCategoryCommit, this));
-	const auto& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
+	const LLEmojiDictionary::cat2descrs_map_t& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
 	mCategory->clearRows();
-	for (const auto& item : cat2Descrs)
+	for (const LLEmojiDictionary::cat2descrs_item_t& item : cat2Descrs)
 	{
 		std::string value = item.first;
 		std::string name = value;
@@ -139,8 +138,8 @@ void LLFloaterEmojiPicker::fillEmojis()
 {
 	mEmojis->clearRows();
 
-	const auto& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
-	for (const std::pair<const llwchar, const LLEmojiDescriptor*>& it : emoji2Descr)
+	const LLEmojiDictionary::emoji2descr_map_t& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
+	for (const LLEmojiDictionary::emoji2descr_item_t& it : emoji2Descr)
 	{
 		const LLEmojiDescriptor* descr = it.second;
 
@@ -179,10 +178,10 @@ bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
 {
 	if (descr->Name.find(mSearchPattern) != std::string::npos)
 		return true;
-	for (auto shortCode : descr->ShortCodes)
+	for (const std::string& shortCode : descr->ShortCodes)
 		if (shortCode.find(mSearchPattern) != std::string::npos)
 			return true;
-	for (auto category : descr->Categories)
+	for (const std::string& category : descr->Categories)
 		if (category.find(mSearchPattern) != std::string::npos)
 			return true;
 	return false;
@@ -204,7 +203,7 @@ void LLFloaterEmojiPicker::onSearchKeystroke(LLLineEditor* caller, void* user_da
 
 void LLFloaterEmojiPicker::onPreviewEmojiClick()
 {
-	if (mEmojis && mEmojiPickCallback)
+	if (mEmojiPickCallback)
 	{
 		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected()))
 		{
@@ -221,8 +220,7 @@ void LLFloaterEmojiPicker::onEmojiSelect()
 		mSelectedEmojiIndex = mEmojis->getFirstSelectedIndex();
 		LLUIString text;
 		text.insert(0, LLWString(1, item->getEmoji()));
-		if (mPreviewEmoji)
-			mPreviewEmoji->setLabel(text);
+		mPreviewEmoji->setLabel(text);
 		return;
 	}
 
@@ -232,13 +230,12 @@ void LLFloaterEmojiPicker::onEmojiSelect()
 void LLFloaterEmojiPicker::onEmojiEmpty()
 {
 	mSelectedEmojiIndex = 0;
-	if (mPreviewEmoji)
-		mPreviewEmoji->setLabel(LLUIString());
+	mPreviewEmoji->setLabel(LLUIString());
 }
 
 void LLFloaterEmojiPicker::onEmojiPick()
 {
-	if (mEmojis && mEmojiPickCallback)
+	if (mEmojiPickCallback)
 	{
 		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected()))
 		{
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index f339c7428f..000d779759 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -11,44 +11,44 @@
     width="200">
   <line_editor
       name="Search"
-      label="Type to search an emoji"
+      label="Type to search"
       layout="bottomleft"
       follows="bottom|left|right"
       text_tentative_color="TextFgTentativeColor"
       max_length_bytes="63"
-	  bottom="5"
-	  left="39"
+      bottom="14"
+      left="34"
       height="29"
-      width="158" />
+      width="162" />
   <button
-	  name="PreviewEmoji"
+      name="PreviewEmoji"
       layout="bottomleft"
       follows="bottom|left"
-	  font="EmojiHuge"
-	  use_font_color="true"
-	  bottom="5"
-	  left="5"
-	  height="29"
-	  width="29" />
+      font="EmojiHuge"
+      use_font_color="true"
+      bottom="14"
+      left="2"
+      height="29"
+      width="29" />
   <scroll_list
       name="Emojis"
       layout="topleft"
       follows="all"
       sort_column="0"
-	  max_chars="63"
-	  commit_on_selection_change="true"
+      max_chars="63"
+      commit_on_selection_change="true"
       draw_heading="true"
       heading_height="25"
-	  left="5"
-	  row_padding="0"
-	  top="25"
-	  height="338"
-	  width="192">
+      row_padding="0"
+      top="25"
+      left="0"
+      height="330"
+      width="200">
     <columns
-        label="Look"
+        label="@"
         name="look"
-        width="50" />
-	<columns
+        width="16" />
+    <columns
         label="Name"
         name="name" />
   </scroll_list>
@@ -57,9 +57,9 @@
       label="Choose a category"
       layout="topleft"
       follows="top|left|right"
-	  allow_text_entry="true"
-	  top="0"
-	  left="5"
+      allow_text_entry="true"
+      top="0"
+      left="2"
       height="25"
-      width="192" />
+      width="196" />
 </floater>
-- 
cgit v1.2.3


From 671978e3927bc3ba9fc34008bbb7efd6f07b6c81 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 17 May 2023 14:28:36 +0200
Subject: SL-19575 Create emoji gallery (fix bug with drawing emojis in chat
 history)

---
 indra/llcommon/llstring.cpp                        | 13 ++++-
 indra/llui/llemojidictionary.cpp                   | 11 ++++
 indra/llui/llemojidictionary.h                     |  1 +
 indra/llui/lltextbase.cpp                          | 41 ++++++++------
 indra/llui/lltextbase.h                            |  2 +-
 indra/newview/llchathistory.cpp                    | 62 +++++++---------------
 indra/newview/llfloateremojipicker.cpp             | 38 +++++++++----
 indra/newview/llfloateremojipicker.h               |  2 +-
 indra/newview/llfloaterimsessiontab.cpp            | 50 ++++++++---------
 indra/newview/llfloaterimsessiontab.h              |  2 +-
 indra/newview/llscripteditor.cpp                   |  2 +-
 .../skins/default/xui/en/widgets/chat_history.xml  | 10 ++--
 12 files changed, 125 insertions(+), 109 deletions(-)

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index cda1791e45..d68cbaa22c 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -837,10 +837,19 @@ std::string LLStringOps::sPM;
 // static
 bool LLStringOps::isEmoji(llwchar wch)
 {
-	switch (ublock_getCode(wch))
-	{
+	int ublock = ublock_getCode(wch);
+	switch (ublock)
+	{
+		case UBLOCK_GENERAL_PUNCTUATION:
+		case UBLOCK_LETTERLIKE_SYMBOLS:
+		case UBLOCK_ARROWS:
+		case UBLOCK_MISCELLANEOUS_TECHNICAL:
+		case UBLOCK_ENCLOSED_ALPHANUMERICS:
+		case UBLOCK_GEOMETRIC_SHAPES:
 		case UBLOCK_MISCELLANEOUS_SYMBOLS:
 		case UBLOCK_DINGBATS:
+		case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION:
+		case UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS:
 		case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS:
 		case UBLOCK_EMOTICONS:
 		case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS:
diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index bb5c94689a..179c5d25bf 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -199,6 +199,17 @@ std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch) const
 	return (mEmoji2Descr.end() != it) ? it->second->Name : LLStringUtil::null;
 }
 
+bool LLEmojiDictionary::isEmoji(llwchar ch) const
+{
+	// Currently used codes: A9,AE,203C,2049,2122,...,2B55,3030,303D,3297,3299,1F004,...,1FAF6
+	if (ch == 0xA9 || ch == 0xAE || (ch >= 0x2000 && ch < 0x3300) || (ch >= 0x1F000 && ch < 0x20000))
+	{
+		return mEmoji2Descr.find(ch) != mEmoji2Descr.end();
+	}
+
+	return false;
+}
+
 void LLEmojiDictionary::addEmoji(LLEmojiDescriptor&& descr)
 {
 	mEmojis.push_back(descr);
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index 88ff5b8300..cc26f75ea3 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -68,6 +68,7 @@ public:
 	const LLEmojiDescriptor* getDescriptorFromEmoji(llwchar emoji) const;
 	const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
 	std::string getNameFromEmoji(llwchar ch) const;
+	bool isEmoji(llwchar ch) const;
 
 	const emoji2descr_map_t& getEmoji2Descr() const { return mEmoji2Descr; }
 	const code2descr_map_t& getShortCode2Descr() const { return mShortCode2Descr; }
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 0066e09cfc..e7273c96c1 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -29,6 +29,7 @@
 
 #include "lltextbase.h"
 
+#include "llemojidictionary.h"
 #include "llemojihelper.h"
 #include "lllocalcliprect.h"
 #include "llmenugl.h"
@@ -366,7 +367,7 @@ void LLTextBase::onValueChange(S32 start, S32 end)
 {
 }
 
-std::vector<LLRect> LLTextBase::getSelctionRects()
+std::vector<LLRect> LLTextBase::getSelectionRects()
 {
     // Nor supposed to be called without selection
     llassert(hasSelection());
@@ -463,7 +464,7 @@ void LLTextBase::drawSelectionBackground()
     // Draw selection even if we don't have keyboard focus for search/replace
     if (hasSelection() && !mLineInfoList.empty())
     {
-        std::vector<LLRect> selection_rects = getSelctionRects();
+        std::vector<LLRect> selection_rects = getSelectionRects();
 		
 		// Draw the selection box (we're using a box instead of reversing the colors on the selected text).
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
@@ -904,9 +905,12 @@ S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::s
 	// Insert special segments where necessary (insertSegment takes care of splitting normal text segments around them for us)
 	{
 		LLStyleSP emoji_style;
+		LLEmojiDictionary* ed = LLEmojiDictionary::instanceExists() ? LLEmojiDictionary::getInstance() : NULL;
 		for (S32 text_kitty = 0, text_len = wstr.size(); text_kitty < text_len; text_kitty++)
 		{
-			if (LLStringOps::isEmoji(wstr[text_kitty]))
+			llwchar code = wstr[text_kitty];
+			bool isEmoji = ed ? ed->isEmoji(code) : LLStringOps::isEmoji(code);
+			if (isEmoji)
 			{
 				if (!emoji_style)
 				{
@@ -2181,8 +2185,8 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 		S32 start=0,end=0;
 		LLUrlMatch match;
 		std::string text = new_text;
-		while ( LLUrlRegistry::instance().findUrl(text, match,
-				boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3),isContentTrusted() || mAlwaysShowIcons))
+		while (LLUrlRegistry::instance().findUrl(text, match,
+				boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3), isContentTrusted() || mAlwaysShowIcons))
 		{
 			start = match.getStart();
 			end = match.getEnd()+1;
@@ -2430,18 +2434,18 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 			LLStyle::Params normal_style_params(style_params);
 			normal_style_params.font.style("NORMAL");
 			LLStyleConstSP normal_sp(new LLStyle(normal_style_params));
-			segments.push_back(new LLOnHoverChangeableTextSegment(sp, normal_sp, segment_start, segment_end, *this ));
+			segments.push_back(new LLOnHoverChangeableTextSegment(sp, normal_sp, segment_start, segment_end, *this));
 		}
 		else
 		{
-		segments.push_back(new LLNormalTextSegment(sp, segment_start, segment_end, *this ));
+			segments.push_back(new LLNormalTextSegment(sp, segment_start, segment_end, *this));
 		}
 
 		insertStringNoUndo(getLength(), wide_text, &segments);
 	}
 
 	// Set the cursor and scroll position
-	if( selection_start != selection_end )
+	if (selection_start != selection_end)
 	{
 		mSelectionStart = selection_start;
 		mSelectionEnd = selection_end;
@@ -2449,7 +2453,7 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 		mIsSelecting = was_selecting;
 		setCursorPos(cursor_pos);
 	}
-	else if( cursor_was_at_end )
+	else if (cursor_was_at_end)
 	{
 		setCursorPos(getLength());
 	}
@@ -2461,25 +2465,28 @@ void LLTextBase::appendAndHighlightTextImpl(const std::string &new_text, S32 hig
 
 void LLTextBase::appendAndHighlightText(const std::string &new_text, S32 highlight_part, const LLStyle::Params& style_params, bool underline_on_hover_only)
 {
-	if (new_text.empty()) return; 
+	if (new_text.empty())
+	{
+		return; 
+	}
 
 	std::string::size_type start = 0;
-	std::string::size_type pos = new_text.find("\n",start);
+	std::string::size_type pos = new_text.find("\n", start);
 	
-	while(pos!=-1)
+	while (pos != std::string::npos)
 	{
-		if(pos!=start)
+		if (pos != start)
 		{
 			std::string str = std::string(new_text,start,pos-start);
-			appendAndHighlightTextImpl(str,highlight_part, style_params, underline_on_hover_only);
+			appendAndHighlightTextImpl(str, highlight_part, style_params, underline_on_hover_only);
 		}
 		appendLineBreakSegment(style_params);
 		start = pos+1;
-		pos = new_text.find("\n",start);
+		pos = new_text.find("\n", start);
 	}
 
-	std::string str = std::string(new_text,start,new_text.length()-start);
-	appendAndHighlightTextImpl(str,highlight_part, style_params, underline_on_hover_only);
+	std::string str = std::string(new_text, start, new_text.length() - start);
+	appendAndHighlightTextImpl(str, highlight_part, style_params, underline_on_hover_only);
 }
 
 
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 9b3691e404..37ab798a1d 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -654,7 +654,7 @@ protected:
 		return mLabel.getString() + getToolTip();
 	}
 
-    std::vector<LLRect> getSelctionRects();
+    std::vector<LLRect> getSelectionRects();
 
 protected:
 	// text segmentation and flow
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index f4fa449ca2..f29d7ec29b 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -1215,9 +1215,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 
 	llassert(mEditor);
 	if (!mEditor)
-	{
 		return;
-	}
 
 	bool from_me = chat.mFromID == gAgent.getID();
 	mEditor->setPlainText(use_plain_text_chat_history);
@@ -1227,26 +1225,16 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		mUnreadChatSources.insert(chat.mFromName);
 		mMoreChatPanel->setVisible(TRUE);
 		std::string chatters;
-		for (unread_chat_source_t::iterator it = mUnreadChatSources.begin();
-			it != mUnreadChatSources.end();)
+		for (const std::string& source : mUnreadChatSources)
 		{
-			chatters += *it;
-			if (++it != mUnreadChatSources.end())
-			{
-				chatters += ", ";
-			}
+			chatters += chatters.size() ? ", " + source : source;
 		}
 		LLStringUtil::format_map_t args;
 		args["SOURCES"] = chatters;
 
-		if (mUnreadChatSources.size() == 1)
-		{
-			mMoreChatText->setValue(LLTrans::getString("unread_chat_single", args));
-		}
-		else
-		{
-			mMoreChatText->setValue(LLTrans::getString("unread_chat_multiple", args));
-		}
+		std::string xml_desc = mUnreadChatSources.size() == 1 ?
+			"unread_chat_single" : "unread_chat_multiple";
+		mMoreChatText->setValue(LLTrans::getString(xml_desc, args));
 		S32 height = mMoreChatText->getTextPixelHeight() + 5;
 		mMoreChatPanel->reshape(mMoreChatPanel->getRect().getWidth(), height);
 	}
@@ -1294,11 +1282,11 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		body_message_params.font.style = "ITALIC";
 	}
 
-	if(chat.mChatType == CHAT_TYPE_WHISPER)
+	if (chat.mChatType == CHAT_TYPE_WHISPER)
 	{
 		body_message_params.font.style = "ITALIC";
 	}
-	else if(chat.mChatType == CHAT_TYPE_SHOUT)
+	else if (chat.mChatType == CHAT_TYPE_SHOUT)
 	{
 		body_message_params.font.style = "BOLD";
 	}
@@ -1345,10 +1333,10 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		}
 
 		// names showing
-		if (args["show_names_for_p2p_conv"].asBoolean() && utf8str_trim(chat.mFromName).size() != 0)
+		if (args["show_names_for_p2p_conv"].asBoolean() && utf8str_trim(chat.mFromName).size())
 		{
 			// Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text.
-			if ( chat.mSourceType == CHAT_SOURCE_OBJECT && chat.mFromID.notNull())
+			if (chat.mSourceType == CHAT_SOURCE_OBJECT && chat.mFromID.notNull())
 			{
 				// for object IMs, create a secondlife:///app/objectim SLapp
 				std::string url = LLViewerChat::getSenderSLURL(chat, args);
@@ -1408,36 +1396,27 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 			&& mIsLastMessageFromLog == message_from_log)  //distinguish between current and previous chat session's histories
 		{
 			view = getSeparator();
-			p.top_pad = mTopSeparatorPad;
-			p.bottom_pad = mBottomSeparatorPad;
             if (!view)
             {
                 // Might be wiser to make this LL_ERRS, getSeparator() should work in case of correct instalation.
                 LL_WARNS() << "Failed to create separator from " << mMessageSeparatorFilename << ": can't append to history" << LL_ENDL;
                 return;
             }
+
+			p.top_pad = mTopSeparatorPad;
+			p.bottom_pad = mBottomSeparatorPad;
 		}
 		else
 		{
 			view = getHeader(chat, name_params, args);
-			if (mEditor->getLength() == 0)
-				p.top_pad = 0;
-			else
-				p.top_pad = mTopHeaderPad;
-            if (teleport_separator)
-            {
-                p.bottom_pad = mBottomSeparatorPad;
-            }
-            else
-            {
-                p.bottom_pad = mBottomHeaderPad;
-            }
-            if (!view)
-            {
-                LL_WARNS() << "Failed to create header from " << mMessageHeaderFilename << ": can't append to history" << LL_ENDL;
-                return;
-            }
+			if (!view)
+			{
+				LL_WARNS() << "Failed to create header from " << mMessageHeaderFilename << ": can't append to history" << LL_ENDL;
+				return;
+			}
 			
+			p.top_pad = mEditor->getLength() ? mTopHeaderPad : 0;
+			p.bottom_pad = teleport_separator ? mBottomSeparatorPad : mBottomHeaderPad;
 		}
 		p.view = view;
 
@@ -1510,11 +1489,10 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		}
 	}
 	// usual messages showing
-	else if(!teleport_separator)
+	else if (!teleport_separator)
 	{
 		std::string message = irc_me ? chat.mText.substr(3) : chat.mText;
 
-
 		//MESSAGE TEXT PROCESSING
 		//*HACK getting rid of redundant sender names in system notifications sent using sender name (see EXT-5010)
 		if (use_plain_text_chat_history && !from_me && chat.mFromID.notNull())
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 9d28f7d4dc..98fe1e7ca1 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -60,9 +60,25 @@ public:
 	{
 		LLScrollListItem::draw(rect, fg_color, hover_color, select_color, highlight_color, column_padding);
 
+		LLWString wstr(1, mEmoji);
 		S32 width = getColumn(0)->getWidth();
-		LLFontGL::getFontEmoji()->render(LLWString(1, mEmoji), 0, rect.mLeft + width / 2, rect.getCenterY(), LLColor4::white,
-			LLFontGL::HCENTER, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::DROP_SHADOW_SOFT, 1, S32_MAX, nullptr, false, true);
+		F32 x = rect.mLeft + width / 2;
+		F32 y = rect.getCenterY();
+		LLFontGL::getFontEmoji()->render(
+			wstr,                       // wstr
+			0,                          // begin_offset
+			x,                          // x
+			y,                          // y
+			LLColor4::white,            // color
+			LLFontGL::HCENTER,          // halign
+			LLFontGL::VCENTER,          // valign
+			LLFontGL::NORMAL,           // style
+			LLFontGL::DROP_SHADOW_SOFT, // shadow
+			1,                          // max_chars
+			S32_MAX,                    // max_pixels
+			nullptr,                    // right_x
+			false,                      // use_ellipses
+			true);                      // use_color
 	}
 
 private:
@@ -101,13 +117,13 @@ BOOL LLFloaterEmojiPicker::postBuild()
 {
 	// Should be initialized first
 	mPreviewEmoji = getChild<LLButton>("PreviewEmoji");
-	mPreviewEmoji->setClickedCallback(boost::bind(&LLFloaterEmojiPicker::onPreviewEmojiClick, this));
+	mPreviewEmoji->setClickedCallback([this](LLUICtrl*, const LLSD&) { onPreviewEmojiClick(); });
 
 	mCategory = getChild<LLComboBox>("Category");
-	mCategory->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onCategoryCommit, this));
+	mCategory->setCommitCallback([this](LLUICtrl*, const LLSD&) { onCategoryCommit(); });
 	const LLEmojiDictionary::cat2descrs_map_t& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
 	mCategory->clearRows();
-	for (const LLEmojiDictionary::cat2descrs_item_t& item : cat2Descrs)
+	for (const LLEmojiDictionary::cat2descrs_item_t item : cat2Descrs)
 	{
 		std::string value = item.first;
 		std::string name = value;
@@ -117,13 +133,13 @@ BOOL LLFloaterEmojiPicker::postBuild()
 	mCategory->setSelectedByValue(mSelectedCategory, true);
 
 	mSearch = getChild<LLLineEditor>("Search");
-	mSearch->setKeystrokeCallback(boost::bind(&LLFloaterEmojiPicker::onSearchKeystroke, this, _1, _2), NULL);
+	mSearch->setKeystrokeCallback([this](LLLineEditor*, void*) { onSearchKeystroke(); }, NULL);
 	mSearch->setFont(LLViewerChat::getChatFont());
 	mSearch->setText(mSearchPattern);
 
 	mEmojis = getChild<LLScrollListCtrl>("Emojis");
-	mEmojis->setCommitCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiSelect, this));
-	mEmojis->setDoubleClickCallback(boost::bind(&LLFloaterEmojiPicker::onEmojiPick, this));
+	mEmojis->setCommitCallback([this](LLUICtrl*, const LLSD&) { onEmojiSelect(); });
+	mEmojis->setDoubleClickCallback([this]() { onEmojiPick(); });
 	fillEmojis();
 
 	return TRUE;
@@ -139,7 +155,7 @@ void LLFloaterEmojiPicker::fillEmojis()
 	mEmojis->clearRows();
 
 	const LLEmojiDictionary::emoji2descr_map_t& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
-	for (const LLEmojiDictionary::emoji2descr_item_t& it : emoji2Descr)
+	for (const LLEmojiDictionary::emoji2descr_item_t it : emoji2Descr)
 	{
 		const LLEmojiDescriptor* descr = it.second;
 
@@ -150,6 +166,8 @@ void LLFloaterEmojiPicker::fillEmojis()
 			continue;
 
 		LLScrollListItem::Params params;
+		// The following line adds default monochrome view of the emoji (is shown as an example)
+		//params.columns.add().column("look").value(wstring_to_utf8str(LLWString(1, it.first)));
 		params.columns.add().column("name").value(descr->Name);
 		mEmojis->addRow(new LLEmojiScrollListItem(it.first, params), params);
 	}
@@ -194,7 +212,7 @@ void LLFloaterEmojiPicker::onCategoryCommit()
 	fillEmojis();
 }
 
-void LLFloaterEmojiPicker::onSearchKeystroke(LLLineEditor* caller, void* user_data)
+void LLFloaterEmojiPicker::onSearchKeystroke()
 {
 	mSearchPattern = mSearch->getText();
 	mSelectedEmojiIndex = 0;
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 01335bbb5b..7327fb945e 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -57,7 +57,7 @@ private:
 	bool matchesPattern(const LLEmojiDescriptor* descr);
 
 	void onCategoryCommit();
-	void onSearchKeystroke(class LLLineEditor* caller, void* user_data);
+	void onSearchKeystroke();
 	void onPreviewEmojiClick();
 	void onEmojiSelect();
 	void onEmojiEmpty();
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 0571a0d855..dbd2d71f94 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -435,8 +435,8 @@ void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self)
 		if (!picker->isShown())
 		{
 			picker->show(
-				boost::bind(&LLFloaterIMSessionTab::onEmojiPicked, self, _1),
-				boost::bind(&LLFloaterIMSessionTab::onEmojiPickerClosed, self));
+				[self](llwchar emoji) { self->onEmojiPicked(emoji); },
+				[self]() { self->onEmojiPickerClosed(); });
 			if (LLFloater* root_floater = gFloaterView->getParentFloater(self))
 			{
 				root_floater->addDependentFloater(picker, TRUE, TRUE);
@@ -461,51 +461,43 @@ void LLFloaterIMSessionTab::onEmojiPickerClosed()
 
 std::string LLFloaterIMSessionTab::appendTime()
 {
-	time_t utc_time;
-	utc_time = time_corrected();
-	std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["
-		+LLTrans::getString("TimeMin")+"]";
+	std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
+						  "[" + LLTrans::getString("TimeMin") + "]";
 
 	LLSD substitution;
-
-	substitution["datetime"] = (S32) utc_time;
-	LLStringUtil::format (timeStr, substitution);
+	substitution["datetime"] = (S32)time_corrected();
+	LLStringUtil::format(timeStr, substitution);
 
 	return timeStr;
 }
 
-void LLFloaterIMSessionTab::appendMessage(const LLChat& chat, const LLSD &args)
+void LLFloaterIMSessionTab::appendMessage(const LLChat& chat, const LLSD& args)
 {
+	if (chat.mMuted || !mChatHistory)
+		return;
 
 	// Update the participant activity time
 	LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance();
 	if (im_box)
 	{
-		im_box->setTimeNow(mSessionID,chat.mFromID);
+		im_box->setTimeNow(mSessionID, chat.mFromID);
 	}
 	
-
 	LLChat& tmp_chat = const_cast<LLChat&>(chat);
 
-	if(tmp_chat.mTimeStr.empty())
+	if (tmp_chat.mTimeStr.empty())
 		tmp_chat.mTimeStr = appendTime();
 
-	if (!chat.mMuted)
-	{
-		tmp_chat.mFromName = chat.mFromName;
-		LLSD chat_args;
-		if (args) chat_args = args;
-		chat_args["use_plain_text_chat_history"] =
-				gSavedSettings.getBOOL("PlainTextChatHistory");
-		chat_args["show_time"] = gSavedSettings.getBOOL("IMShowTime");
-		chat_args["show_names_for_p2p_conv"] =
-				!mIsP2PChat || gSavedSettings.getBOOL("IMShowNamesForP2PConv");
-
-		if (mChatHistory)
-		{
-			mChatHistory->appendMessage(chat, chat_args);
-		}
-	}
+	tmp_chat.mFromName = chat.mFromName;
+
+	LLSD chat_args = args;
+	chat_args["use_plain_text_chat_history"] =
+			gSavedSettings.getBOOL("PlainTextChatHistory");
+	chat_args["show_time"] = gSavedSettings.getBOOL("IMShowTime");
+	chat_args["show_names_for_p2p_conv"] = !mIsP2PChat ||
+			gSavedSettings.getBOOL("IMShowNamesForP2PConv");
+
+	mChatHistory->appendMessage(chat, chat_args);
 }
 
 static LLTrace::BlockTimerStatHandle FTM_BUILD_CONVERSATION_VIEW_PARTICIPANT("Build Conversation View");
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 3dcb767aa6..49be4f6bd1 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -140,7 +140,7 @@ protected:
 	/* virtual */ void onFocusReceived();
 
 	// prepare chat's params and out one message to chatHistory
-	void appendMessage(const LLChat& chat, const LLSD &args = 0);
+	void appendMessage(const LLChat& chat, const LLSD& args = LLSD());
 
 	std::string appendTime();
 	void assignResizeLimits();
diff --git a/indra/newview/llscripteditor.cpp b/indra/newview/llscripteditor.cpp
index 140cbbedbe..3278bd3aa9 100644
--- a/indra/newview/llscripteditor.cpp
+++ b/indra/newview/llscripteditor.cpp
@@ -187,7 +187,7 @@ void LLScriptEditor::drawSelectionBackground()
 	// Draw selection even if we don't have keyboard focus for search/replace
 	if( hasSelection() && !mLineInfoList.empty())
 	{
-        std::vector<LLRect> selection_rects = getSelctionRects();
+        std::vector<LLRect> selection_rects = getSelectionRects();
 
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		const LLColor4& color = mReadOnly ? mReadOnlyFgColor : mFgColor;
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index c0a948931c..c4300c9350 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -10,11 +10,11 @@
   bottom_separator_pad="1"
   top_header_pad="12"
   bottom_header_pad="5"
-	max_length="2147483647"
-	track_bottom="true"
-	name="chat_history"
-	type="string"
-	word_wrap="true"
+  max_length="2147483647"
+  track_bottom="true"
+  name="chat_history"
+  type="string"
+  word_wrap="true"
   line_spacing.multiple="1.0" 
   font="SansSerif">
   <more_chat_text
-- 
cgit v1.2.3


From 347c804bfe53b400420e943d9084f088ae7e1c63 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 17 May 2023 18:17:06 -0700
Subject: More tweaks

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c57140af9c..d4d962abf4 100644
--- a/README.md
+++ b/README.md
@@ -41,3 +41,4 @@ pull requests and more. See the [open source portal][] for details.
 [download]: https://secondlife.com/support/downloads/
 [tpv]: http://wiki.secondlife.com/wiki/Third_Party_Viewer_Directory
 [open source portal]: http://wiki.secondlife.com/wiki/Open_Source_Portal
+
-- 
cgit v1.2.3


From bb97f3bf03cfa776b09dc2c0929fbb100a11c775 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Thu, 18 May 2023 07:47:54 +0200
Subject: SL-19575 Create emoji gallery (use ::value_type in LLEmojiDictionary
 typedefs)

---
 indra/llui/llemojidictionary.h         | 6 +++---
 indra/newview/llfloateremojipicker.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index cc26f75ea3..1507ebfad3 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -57,11 +57,11 @@ class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLI
 
 public:
 	typedef std::map<llwchar, const LLEmojiDescriptor*> emoji2descr_map_t;
-	typedef std::pair<llwchar, const LLEmojiDescriptor*> emoji2descr_item_t;
+	typedef emoji2descr_map_t::value_type emoji2descr_item_t;
 	typedef std::map<std::string, const LLEmojiDescriptor*> code2descr_map_t;
-	typedef std::pair<std::string, const LLEmojiDescriptor*> code2descr_item_t;
+	typedef code2descr_map_t::value_type code2descr_item_t;
 	typedef std::map<std::string, std::vector<const LLEmojiDescriptor*>> cat2descrs_map_t;
-	typedef std::pair<std::string, std::vector<const LLEmojiDescriptor*>> cat2descrs_item_t;
+	typedef cat2descrs_map_t::value_type cat2descrs_item_t;
 
 	static void initClass();
 	LLWString   findMatchingEmojis(const std::string& needle) const;
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 98fe1e7ca1..7fbaaaaa89 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -123,7 +123,7 @@ BOOL LLFloaterEmojiPicker::postBuild()
 	mCategory->setCommitCallback([this](LLUICtrl*, const LLSD&) { onCategoryCommit(); });
 	const LLEmojiDictionary::cat2descrs_map_t& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
 	mCategory->clearRows();
-	for (const LLEmojiDictionary::cat2descrs_item_t item : cat2Descrs)
+	for (const LLEmojiDictionary::cat2descrs_item_t& item : cat2Descrs)
 	{
 		std::string value = item.first;
 		std::string name = value;
@@ -155,9 +155,9 @@ void LLFloaterEmojiPicker::fillEmojis()
 	mEmojis->clearRows();
 
 	const LLEmojiDictionary::emoji2descr_map_t& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
-	for (const LLEmojiDictionary::emoji2descr_item_t it : emoji2Descr)
+	for (const LLEmojiDictionary::emoji2descr_item_t& item : emoji2Descr)
 	{
-		const LLEmojiDescriptor* descr = it.second;
+		const LLEmojiDescriptor* descr = item.second;
 
 		if (!mSelectedCategory.empty() && !matchesCategory(descr))
 			continue;
@@ -169,7 +169,7 @@ void LLFloaterEmojiPicker::fillEmojis()
 		// The following line adds default monochrome view of the emoji (is shown as an example)
 		//params.columns.add().column("look").value(wstring_to_utf8str(LLWString(1, it.first)));
 		params.columns.add().column("name").value(descr->Name);
-		mEmojis->addRow(new LLEmojiScrollListItem(it.first, params), params);
+		mEmojis->addRow(new LLEmojiScrollListItem(item.first, params), params);
 	}
 
 	if (mEmojis->getItemCount())
-- 
cgit v1.2.3


From 2e57a6978e388c9c4b3682af388d0a205dd53367 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 18 May 2023 16:27:52 -0700
Subject: Trigger a new TeamCity build

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index d4d962abf4..c57140af9c 100644
--- a/README.md
+++ b/README.md
@@ -41,4 +41,3 @@ pull requests and more. See the [open source portal][] for details.
 [download]: https://secondlife.com/support/downloads/
 [tpv]: http://wiki.secondlife.com/wiki/Third_Party_Viewer_Directory
 [open source portal]: http://wiki.secondlife.com/wiki/Open_Source_Portal
-
-- 
cgit v1.2.3


From fbccf6119dbb5c5f6bdc0379247439af38ffb44f Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 23 May 2023 11:11:13 -0700
Subject: DRTVWR-489: Pull in a new build of 3p-colladadom that has the same
 version for all 3 platforms/bit widths (580295) - previously, the macOS
 version was different and the DRTVWR Readiness Script got sad about it

---
 autobuild.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index d6e1c7c9ab..d7c3291b14 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" ?>
-<llsd><map>
+<llsd>
+<map>
     <key>installables</key>
     <map>
       <key>SDL</key>
@@ -235,9 +236,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>df05eee28649996c78a47dd054de2a47</string>
+              <string>4e34187bee5e61210514fad9269a2856</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112764/977018/colladadom-2.3.579218-darwin64-579218.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115308/993050/colladadom-2.3.580295-darwin64-580295.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -259,9 +260,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6752b4f098a522bb22b6334cdfba7614</string>
+              <string>12b400f26a141a9dccefd684f60a16a2</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112771/977087/colladadom-2.3.579224-windows-579224.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115310/993062/colladadom-2.3.580295-windows-580295.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -271,16 +272,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>81de6dc4a79b547a25d0040370c42fec</string>
+              <string>51374b87bab088470316048e48b4687f</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/112770/977082/colladadom-2.3.579224-windows64-579224.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115309/993056/colladadom-2.3.580295-windows64-580295.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.3.579218</string>
+        <string>2.3.580295</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
@@ -3635,4 +3636,5 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
     <string>autobuild</string>
     <key>version</key>
     <string>1.3</string>
-  </map></llsd>
+  </map>
+</llsd>
-- 
cgit v1.2.3


From b6d4a373a4da3478a48f24e8e6b3d1d97a1611b6 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 24 May 2023 11:58:00 -0700
Subject: DRTVWR-489: Trying to determine why the DRTVWR Readiness Report gets
 sad about the NanoSVG package - I didn't think it's analysis applied to Linux
 3p packages but maybe it does

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index d7c3291b14..dc4056afbe 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2093,9 +2093,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c5a2ae5ecc8ade5a85b674e4426d6403</string>
+              <string>4e76a6e967bacf2bc9bb92a16ab26a93</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107186/935576/nanosvg-2022.09.27-linux-576467.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109527/952888/nanosvg-2022.09.27-linux-577709.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
-- 
cgit v1.2.3


From 7feba334157a97a19b558cc0dd5b2b151f129572 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 25 May 2023 10:33:45 -0700
Subject: DRTVWR-489: Update NanoSVG build to keep readiness report happier.
 Remove reference to Linux version of ColladaDOM - out of date, we don't have
 a newer build and it's making the Readiness Report sad.

---
 autobuild.xml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index dc4056afbe..50dff9f41c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -243,18 +243,6 @@
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>linux64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>c90613240ba3e3a171d3379275ae4ee3</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9695/45732/colladadom-2.3.509683-linux64-509683.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux64</string>
-          </map>
           <key>windows</key>
           <map>
             <key>archive</key>
@@ -2081,9 +2069,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bee6bf71cec184ab26c89c486fc5f427</string>
+              <string>69d324948b1fce45dc2fea7d9d4f235d</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109526/952883/nanosvg-2022.09.27-darwin64-577709.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115396/993659/nanosvg-2022.09.27-darwin64-580337.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2093,9 +2081,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4e76a6e967bacf2bc9bb92a16ab26a93</string>
+              <string>84698f044598ff79e255965f3d1c3e80</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109527/952888/nanosvg-2022.09.27-linux-577709.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115397/993664/nanosvg-2022.09.27-linux-580337.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -2105,9 +2093,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b7d1baa8003f64bed4efc2c163ee7e26</string>
+              <string>1c475d446cfbd4533de194149a5c456e</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109529/952902/nanosvg-2022.09.27-windows-577709.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115400/993676/nanosvg-2022.09.27-windows-580337.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2117,9 +2105,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b8b51ad6b65be5bbc1470ee939c6bfae</string>
+              <string>5236f7db7424ee4d00783bc8a17cf457</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/109528/952895/nanosvg-2022.09.27-windows64-577709.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115399/993677/nanosvg-2022.09.27-windows64-580337.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From 886c6089672cc24a4ce5d2f84f388087e7d6281b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 30 May 2023 16:14:45 -0700
Subject: DRTVWR-489: Incorporate new 3p libs for Collada and NanoSVG that have
 both been built after merging with master (and VS 2022 for Collada DOM).

---
 autobuild.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 50dff9f41c..899ef96297 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -236,9 +236,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4e34187bee5e61210514fad9269a2856</string>
+              <string>cb76a5dcef6577fefff3f070029a4012</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115308/993050/colladadom-2.3.580295-darwin64-580295.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115496/994482/colladadom-2.3.580380-darwin64-580380.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -248,9 +248,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>12b400f26a141a9dccefd684f60a16a2</string>
+              <string>31996b4f4bbf478298edcd28a6581f92</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115310/993062/colladadom-2.3.580295-windows-580295.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115498/994495/colladadom-2.3.580380-windows-580380.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -260,16 +260,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>51374b87bab088470316048e48b4687f</string>
+              <string>9b0de47cd59e1aa88617d751c40dcff7</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115309/993056/colladadom-2.3.580295-windows64-580295.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115497/994489/colladadom-2.3.580380-windows64-580380.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>2.3.580295</string>
+        <string>2.3.580380</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
@@ -2069,9 +2069,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>69d324948b1fce45dc2fea7d9d4f235d</string>
+              <string>32ead724319c2ea6f65fc5be0e3157cc</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115396/993659/nanosvg-2022.09.27-darwin64-580337.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115452/994130/nanosvg-2022.09.27-darwin64-580364.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2093,9 +2093,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>1c475d446cfbd4533de194149a5c456e</string>
+              <string>4e56202b09c026e08fc51116b22feabc</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115400/993676/nanosvg-2022.09.27-windows-580337.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115456/994153/nanosvg-2022.09.27-windows-580364.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2105,9 +2105,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>5236f7db7424ee4d00783bc8a17cf457</string>
+              <string>ee61ff8b866be04c325f1fe2db516d71</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115399/993677/nanosvg-2022.09.27-windows64-580337.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/115454/994144/nanosvg-2022.09.27-windows64-580364.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From 8bbbce015b6dae1bdafe0bba329463322642ca85 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 4 Jul 2023 07:38:05 +0200
Subject: SL-19575 Rework emoji picker layout similar to Slack

---
 indra/llui/llscrollingpanellist.cpp                | 184 +++++-----
 indra/llui/llscrollingpanellist.h                  |  37 +-
 indra/newview/llfloateremojipicker.cpp             | 375 +++++++++++++++++++--
 indra/newview/llfloateremojipicker.h               |  27 +-
 .../skins/default/xui/en/floater_activeim.xml      |   2 +-
 .../skins/default/xui/en/floater_emoji_picker.xml  |  29 +-
 6 files changed, 544 insertions(+), 110 deletions(-)

diff --git a/indra/llui/llscrollingpanellist.cpp b/indra/llui/llscrollingpanellist.cpp
index b6f2eb8ba2..3a819e7d06 100644
--- a/indra/llui/llscrollingpanellist.cpp
+++ b/indra/llui/llscrollingpanellist.cpp
@@ -37,53 +37,44 @@ static LLDefaultChildRegistry::Register<LLScrollingPanelList> r("scrolling_panel
 
 // This could probably be integrated with LLScrollContainer -SJB
 
+LLScrollingPanelList::Params::Params()
+	: is_horizontal("is_horizontal")
+	, padding("padding")
+	, spacing("spacing")
+{
+}
+
+LLScrollingPanelList::LLScrollingPanelList(const Params& p)
+	: LLUICtrl(p)
+	, mIsHorizontal(p.is_horizontal)
+	, mPadding(p.padding.isProvided() ? p.padding : DEFAULT_PADDING)
+	, mSpacing(p.spacing.isProvided() ? p.spacing : DEFAULT_SPACING)
+{
+}
+
 void LLScrollingPanelList::clearPanels()
 {
 	deleteAllChildren();
 	mPanelList.clear();
-
-	LLRect rc = getRect();
-	rc.setLeftTopAndSize(rc.mLeft, rc.mTop, 1, 1);
-	setRect(rc);
-
-	notifySizeChanged(rc.getHeight());
+	rearrange();
 }
 
-S32 LLScrollingPanelList::addPanel( LLScrollingPanel* panel )
+S32 LLScrollingPanelList::addPanel(LLScrollingPanel* panel, bool back)
 {
-	addChildInBack( panel );
-	mPanelList.push_front( panel );
-
-	// Resize this view
-	S32 total_height = 0;
-	S32 max_width = 0;
-	S32 cur_gap = 0;
-	for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
-		 iter != mPanelList.end(); ++iter)
+	if (back)
 	{
-		LLScrollingPanel *childp = *iter;
-		total_height += childp->getRect().getHeight() + cur_gap;
-		max_width = llmax( max_width, childp->getRect().getWidth() );
-		cur_gap = GAP_BETWEEN_PANELS;
+		addChild(panel);
+		mPanelList.push_back(panel);
 	}
- 	LLRect rc = getRect();
- 	rc.setLeftTopAndSize(rc.mLeft, rc.mTop, max_width, total_height);
- 	setRect(rc);
-
-	notifySizeChanged(rc.getHeight());
-
-	// Reposition each of the child views
-	S32 cur_y = total_height;
-	for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
-		 iter != mPanelList.end(); ++iter)
+	else
 	{
-		LLScrollingPanel *childp = *iter;
-		cur_y -= childp->getRect().getHeight();
-		childp->translate( -childp->getRect().mLeft, cur_y - childp->getRect().mBottom);
-		cur_y -= GAP_BETWEEN_PANELS;
+		addChildInBack(panel);
+		mPanelList.push_front(panel);
 	}
 
-	return total_height;
+	rearrange();
+
+	return mIsHorizontal ? getRect().getWidth() : getRect().getHeight();
 }
 
 void LLScrollingPanelList::removePanel(LLScrollingPanel* panel) 
@@ -100,7 +91,7 @@ void LLScrollingPanelList::removePanel(LLScrollingPanel* panel)
 				break;
 			}
 		}
-		if(iter != mPanelList.end())
+		if (iter != mPanelList.end())
 		{
 			removePanel(index);
 		}
@@ -120,62 +111,104 @@ void LLScrollingPanelList::removePanel( U32 panel_index )
 		mPanelList.erase( mPanelList.begin() + panel_index );
 	}
 
-	const S32 GAP_BETWEEN_PANELS = 6;
+	rearrange();
+}
 
-	// Resize this view
-	S32 total_height = 0;
-	S32 max_width = 0;
-	S32 cur_gap = 0;
-	for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
+void LLScrollingPanelList::updatePanels(BOOL allow_modify)
+{
+    for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
 		 iter != mPanelList.end(); ++iter)
-	{
+    {
 		LLScrollingPanel *childp = *iter;
-		total_height += childp->getRect().getHeight() + cur_gap;
-		max_width = llmax( max_width, childp->getRect().getWidth() );
-		cur_gap = GAP_BETWEEN_PANELS;
+		childp->updatePanel(allow_modify);
+    }
+}
+
+void LLScrollingPanelList::rearrange()
+{
+	// Resize this view
+	S32 new_width, new_height;
+	if (!mPanelList.empty())
+	{
+		new_width = new_height = mPadding * 2;
+		for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
+			iter != mPanelList.end(); ++iter)
+		{
+			LLScrollingPanel* childp = *iter;
+			const LLRect& rect = childp->getRect();
+			if (mIsHorizontal)
+			{
+				new_width += rect.getWidth() + mSpacing;
+				new_height = llmax(new_height, rect.getHeight());
+			}
+			else
+			{
+				new_height += rect.getHeight() + mSpacing;
+				new_width = llmax(new_width, rect.getWidth());
+			}
+		}
+
+		if (mIsHorizontal)
+		{
+			new_width -= mSpacing;
+		}
+		else
+		{
+			new_height -= mSpacing;
+		}
 	}
+	else
+	{
+		new_width = new_height = 1;
+	}
+
 	LLRect rc = getRect();
-	rc.setLeftTopAndSize(rc.mLeft, rc.mTop, max_width, total_height);
-	setRect(rc);
+	if (mIsHorizontal || !followsRight())
+	{
+		rc.mRight = rc.mLeft + new_width;
+	}
+	if (!mIsHorizontal || !followsBottom())
+	{
+		rc.mBottom = rc.mTop - new_height;
+	}
 
-	notifySizeChanged(rc.getHeight());
+	if (rc.mRight != getRect().mRight || rc.mBottom != getRect().mBottom)
+	{
+		setRect(rc);
+		notifySizeChanged();
+	}
 
 	// Reposition each of the child views
-	S32 cur_y = total_height;
+	S32 pos = mIsHorizontal ? mPadding : rc.getHeight() - mPadding;
 	for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
-		 iter != mPanelList.end(); ++iter)
+		iter != mPanelList.end(); ++iter)
 	{
-		LLScrollingPanel *childp = *iter;
-		cur_y -= childp->getRect().getHeight();
-		childp->translate( -childp->getRect().mLeft, cur_y - childp->getRect().mBottom);
-		cur_y -= GAP_BETWEEN_PANELS;
+		LLScrollingPanel* childp = *iter;
+		const LLRect& rect = childp->getRect();
+		if (mIsHorizontal)
+		{
+			childp->translate(pos - rect.mLeft, rc.getHeight() - mPadding - rect.mTop);
+			pos += rect.getWidth() + mSpacing;
+		}
+		else
+		{
+			childp->translate(mPadding - rect.mLeft, pos - rect.mTop);
+			pos -= rect.getHeight() + mSpacing;
+		}
 	}
 }
 
-void LLScrollingPanelList::updatePanels(BOOL allow_modify)
-{
-    for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
-		 iter != mPanelList.end(); ++iter)
-    {
-		LLScrollingPanel *childp = *iter;
-		childp->updatePanel(allow_modify);
-    }
-}
-
 void LLScrollingPanelList::updatePanelVisiblilty()
 {
 	// Determine visibility of children.
-	S32 BORDER_WIDTH = 2;  // HACK
 
-	LLRect parent_local_rect = getParent()->getRect();
-	parent_local_rect.stretch( -BORDER_WIDTH );
-	
 	LLRect parent_screen_rect;
-	getParent()->localPointToScreen( 
-		BORDER_WIDTH, 0, 
+	getParent()->localPointToScreen(
+		mPadding, mPadding,
 		&parent_screen_rect.mLeft, &parent_screen_rect.mBottom );
-	getParent()->localPointToScreen( 
-		parent_local_rect.getWidth() - BORDER_WIDTH, parent_local_rect.getHeight() - BORDER_WIDTH,
+	getParent()->localPointToScreen(
+		getParent()->getRect().getWidth() - mPadding,
+		getParent()->getRect().getHeight() - mPadding,
 		&parent_screen_rect.mRight, &parent_screen_rect.mTop );
 
 	for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
@@ -207,11 +240,12 @@ void LLScrollingPanelList::draw()
 	LLUICtrl::draw();
 }
 
-void LLScrollingPanelList::notifySizeChanged(S32 height)
+void LLScrollingPanelList::notifySizeChanged()
 {
 	LLSD info;
 	info["action"] = "size_changes";
-	info["height"] = height;
+	info["height"] = getRect().getHeight();
+	info["width"] = getRect().getWidth();
 	notifyParent(info);
 }
 
diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h
index e8df176ec3..9dc65dabb5 100644
--- a/indra/llui/llscrollingpanellist.h
+++ b/indra/llui/llscrollingpanellist.h
@@ -51,12 +51,18 @@ class LLScrollingPanelList : public LLUICtrl
 {
 public:
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{};
-	LLScrollingPanelList(const Params& p)
-	:	LLUICtrl(p) 
-	{}
+	{
+		Optional<bool> is_horizontal;
+		Optional<S32> padding;
+		Optional<S32> spacing;
+
+		Params();
+	};
+
+	LLScrollingPanelList(const Params& p);
 	
-	static const S32 GAP_BETWEEN_PANELS = 6;
+	static const S32 DEFAULT_SPACING = 6;
+	static const S32 DEFAULT_PADDING = 2;
 
 	typedef std::deque<LLScrollingPanel*>	panel_list_t;
 
@@ -65,11 +71,18 @@ public:
 	virtual void		draw();
 
 	void				clearPanels();
-	S32					addPanel( LLScrollingPanel* panel );
-	void				removePanel( LLScrollingPanel* panel );
-	void				removePanel( U32 panel_index );
+	S32					addPanel(LLScrollingPanel* panel, bool back = false);
+	void				removePanel(LLScrollingPanel* panel);
+	void				removePanel(U32 panel_index);
 	void				updatePanels(BOOL allow_modify);
-	const panel_list_t&	getPanelList() { return mPanelList; }
+	void				rearrange();
+
+	const panel_list_t&	getPanelList() const { return mPanelList; }
+	bool				getIsHorizontal() const { return mIsHorizontal; }
+	void				setPadding(S32 padding) { mPadding = padding; rearrange(); }
+	void				setSpacing(S32 spacing) { mSpacing = spacing; rearrange(); }
+	S32					getPadding() const { return mPadding; }
+	S32					getSpacing() const { return mSpacing; }
 
 private:
 	void				updatePanelVisiblilty();
@@ -77,7 +90,11 @@ private:
 	/**
 	 * Notify parent about size change, makes sense when used inside accordion
 	 */
-	void				notifySizeChanged(S32 height);
+	void				notifySizeChanged();
+
+	bool				mIsHorizontal;
+	S32					mPadding;
+	S32					mSpacing;
 
 	panel_list_t		mPanelList;
 };
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 7fbaaaaa89..8c7f38d324 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -30,7 +30,10 @@
 #include "llcombobox.h"
 #include "llemojidictionary.h"
 #include "llfloaterreg.h"
+#include "llkeyboard.h"
 #include "lllineeditor.h"
+#include "llscrollcontainer.h"
+#include "llscrollingpanellist.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
 #include "lltextbox.h" 
@@ -39,6 +42,7 @@
 std::string LLFloaterEmojiPicker::mSelectedCategory;
 std::string LLFloaterEmojiPicker::mSearchPattern;
 int LLFloaterEmojiPicker::mSelectedEmojiIndex;
+bool LLFloaterEmojiPicker::mUseGrid = true;
 
 class LLEmojiScrollListItem : public LLScrollListItem
 {
@@ -85,6 +89,114 @@ private:
 	llwchar mEmoji;
 };
 
+class LLEmojiGridRow : public LLScrollingPanel
+{
+public:
+	LLEmojiGridRow(const LLPanel::Params& panel_params,
+		const LLScrollingPanelList::Params& list_params)
+		: LLScrollingPanel(panel_params)
+		, mList(new LLScrollingPanelList(list_params))
+	{
+		addChild(mList);
+	}
+
+	virtual void updatePanel(BOOL allow_modify)
+	{
+	}
+
+public:
+	LLScrollingPanelList* mList;
+};
+
+class LLEmojiGridDivider : public LLScrollingPanel
+{
+public:
+	LLEmojiGridDivider(const LLPanel::Params& panel_params, std::string text)
+		: LLScrollingPanel(panel_params)
+		, mText(utf8string_to_wstring(text))
+	{
+	}
+
+	virtual void draw() override
+	{
+		LLScrollingPanel::draw();
+
+		F32 x = 4; // padding-left
+		F32 y = getRect().getHeight() / 2;
+		LLFontGL::getFontSansSerifBold()->render(
+			mText,                      // wstr
+			0,                          // begin_offset
+			x,                          // x
+			y,                          // y
+			LLColor4::white,            // color
+			LLFontGL::LEFT,             // halign
+			LLFontGL::VCENTER,          // valign
+			LLFontGL::NORMAL,           // style
+			LLFontGL::DROP_SHADOW_SOFT, // shadow
+			mText.size(),               // max_chars
+			S32_MAX,                    // max_pixels
+			nullptr,                    // right_x
+			false,                      // use_ellipses
+			true);                      // use_color
+	}
+
+	virtual void updatePanel(BOOL allow_modify)
+	{
+	}
+
+private:
+	const LLWString mText;
+};
+
+class LLEmojiGridIcon : public LLScrollingPanel
+{
+public:
+	LLEmojiGridIcon(const LLPanel::Params& panel_params, const LLEmojiDescriptor* descr, std::string category)
+		: LLScrollingPanel(panel_params)
+		, mEmoji(descr->Character)
+		, mText(LLWString(1, mEmoji))
+		, mDescr(descr->Name)
+		, mCategory(category)
+	{
+	}
+
+	virtual void draw() override
+	{
+		LLScrollingPanel::draw();
+
+		F32 x = getRect().getWidth() / 2;
+		F32 y = getRect().getHeight() / 2;
+		LLFontGL::getFontEmoji()->render(
+			mText,                      // wstr
+			0,                          // begin_offset
+			x,                          // x
+			y,                          // y
+			LLColor4::white,            // color
+			LLFontGL::HCENTER,          // halign
+			LLFontGL::VCENTER,          // valign
+			LLFontGL::NORMAL,           // style
+			LLFontGL::DROP_SHADOW_SOFT, // shadow
+			1,                          // max_chars
+			S32_MAX,                    // max_pixels
+			nullptr,                    // right_x
+			false,                      // use_ellipses
+			true);                      // use_color
+	}
+
+	virtual void updatePanel(BOOL allow_modify) {}
+
+	llwchar getEmoji() const { return mEmoji; }
+	LLWString getText() const { return mText; }
+	std::string getDescr() const { return mDescr; }
+	std::string getCategory() const { return mCategory; }
+
+private:
+	const llwchar mEmoji;
+	const LLWString mText;
+	const std::string mDescr;
+	const std::string mCategory;
+};
+
 LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
 {
 	LLFloaterEmojiPicker* floater = LLFloaterReg::getTypedInstance<LLFloaterEmojiPicker>("emoji_picker");
@@ -102,6 +214,9 @@ LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_ca
 
 void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t close_callback)
 {
+	// Temporary solution to support both layouts
+	mUseGrid = !gKeyboard->getKeyDown(KEY_SHIFT);
+
 	mEmojiPickCallback = pick_callback;
 	mFloaterCloseCallback = close_callback;
 	openFloater(mKey);
@@ -119,6 +234,9 @@ BOOL LLFloaterEmojiPicker::postBuild()
 	mPreviewEmoji = getChild<LLButton>("PreviewEmoji");
 	mPreviewEmoji->setClickedCallback([this](LLUICtrl*, const LLSD&) { onPreviewEmojiClick(); });
 
+	mDescription = getChild<LLTextBox>("Description");
+	mDescription->setVisible(FALSE);
+
 	mCategory = getChild<LLComboBox>("Category");
 	mCategory->setCommitCallback([this](LLUICtrl*, const LLSD&) { onCategoryCommit(); });
 	const LLEmojiDictionary::cat2descrs_map_t& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
@@ -137,14 +255,33 @@ BOOL LLFloaterEmojiPicker::postBuild()
 	mSearch->setFont(LLViewerChat::getChatFont());
 	mSearch->setText(mSearchPattern);
 
-	mEmojis = getChild<LLScrollListCtrl>("Emojis");
-	mEmojis->setCommitCallback([this](LLUICtrl*, const LLSD&) { onEmojiSelect(); });
-	mEmojis->setDoubleClickCallback([this]() { onEmojiPick(); });
+	mEmojiList = getChild<LLScrollListCtrl>("EmojiList");
+	mEmojiList->setCommitCallback([this](LLUICtrl*, const LLSD&) { onEmojiSelect(); });
+	mEmojiList->setDoubleClickCallback([this]() { onEmojiPick(); });
+	mEmojiList->setVisible(!mUseGrid);
+
+	mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
+	mEmojiScroll->setVisible(mUseGrid);
+	mEmojiScroll->setMouseEnterCallback([this](LLUICtrl*, const LLSD&) { onGridMouseEnter(); });
+	mEmojiScroll->setMouseLeaveCallback([this](LLUICtrl*, const LLSD&) { onGridMouseLeave(); });
+
+	mEmojiGrid = getChild<LLScrollingPanelList>("EmojiGrid");
+
 	fillEmojis();
 
 	return TRUE;
 }
 
+void LLFloaterEmojiPicker::dirtyRect()
+{
+	super::dirtyRect();
+
+	if (mUseGrid && mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
+	{
+		fillEmojiGrid();
+	}
+}
+
 LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
 {
 	gFocusMgr.releaseFocusIfNeeded( this );
@@ -152,7 +289,15 @@ LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
 
 void LLFloaterEmojiPicker::fillEmojis()
 {
-	mEmojis->clearRows();
+	if (mUseGrid)
+		fillEmojiGrid();
+	else
+		fillEmojiList();
+}
+
+void LLFloaterEmojiPicker::fillEmojiList()
+{
+	mEmojiList->clearRows();
 
 	const LLEmojiDictionary::emoji2descr_map_t& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
 	for (const LLEmojiDictionary::emoji2descr_item_t& item : emoji2Descr)
@@ -169,17 +314,17 @@ void LLFloaterEmojiPicker::fillEmojis()
 		// The following line adds default monochrome view of the emoji (is shown as an example)
 		//params.columns.add().column("look").value(wstring_to_utf8str(LLWString(1, it.first)));
 		params.columns.add().column("name").value(descr->Name);
-		mEmojis->addRow(new LLEmojiScrollListItem(item.first, params), params);
+		mEmojiList->addRow(new LLEmojiScrollListItem(item.first, params), params);
 	}
 
-	if (mEmojis->getItemCount())
+	if (mEmojiList->getItemCount())
 	{
-		if (mSelectedEmojiIndex > 0 && mSelectedEmojiIndex < mEmojis->getItemCount())
-			mEmojis->selectNthItem(mSelectedEmojiIndex);
+		if (mSelectedEmojiIndex > 0 && mSelectedEmojiIndex < mEmojiList->getItemCount())
+			mEmojiList->selectNthItem(mSelectedEmojiIndex);
 		else
-			mEmojis->selectFirstItem();
+			mEmojiList->selectFirstItem();
 
-		mEmojis->scrollToShowSelected();
+		mEmojiList->scrollToShowSelected();
 	}
 	else
 	{
@@ -187,6 +332,103 @@ void LLFloaterEmojiPicker::fillEmojis()
 	}
 }
 
+void LLFloaterEmojiPicker::fillEmojiGrid()
+{
+	mEmojiGrid->clearPanels();
+
+	S32 scrollbarSize = mEmojiScroll->getSize();
+	if (scrollbarSize < 0)
+	{
+		static LLUICachedControl<S32> scrollbar_size_control("UIScrollbarSize", 0);
+		scrollbarSize = scrollbar_size_control;
+	}
+
+	mRecentGridWidth = mEmojiScroll->getRect().getWidth();
+	const S32 clientWidth = mRecentGridWidth - scrollbarSize - mEmojiScroll->getBorderWidth() * 2;
+	if (mEmojiGrid->getRect().getWidth() != clientWidth)
+	{
+		LLRect rect = mEmojiGrid->getRect();
+		rect.mRight = rect.mLeft + clientWidth;
+		mEmojiGrid->setRect(rect);
+	}
+
+	const S32 gridPadding = mEmojiGrid->getPadding();
+	const S32 iconSpacing = mEmojiGrid->getSpacing();
+	const S32 rowWidth = clientWidth - gridPadding * 2;
+	const S32 iconSize = 28; // icon width and height
+	const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
+
+	LLPanel::Params row_panel_params;
+	row_panel_params.rect = LLRect(0, iconSize, rowWidth, 0);
+
+	LLScrollingPanelList::Params row_list_params;
+	row_list_params.rect = row_panel_params.rect;
+	row_list_params.is_horizontal = TRUE;
+	row_list_params.padding = 0;
+	row_list_params.spacing = iconSpacing;
+
+	LLPanel::Params icon_params;
+	LLRect icon_rect(0, iconSize, iconSize, 0);
+
+	auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis, bool showDivider)
+	{
+		int iconIndex = 0;
+		LLEmojiGridRow* row = nullptr;
+		LLStringUtil::capitalize(category);
+		for (const LLEmojiDescriptor* descr : emojis)
+		{
+			if (mSearchPattern.empty() || matchesPattern(descr))
+			{
+				// Place a category title if needed
+				if (showDivider)
+				{
+					LLEmojiGridDivider* div = new LLEmojiGridDivider(row_panel_params, category);
+					mEmojiGrid->addPanel(div, true);
+					showDivider = false;
+				}
+
+				// Place a new row each (maxIcons) icons
+				if (!(iconIndex % maxIcons))
+				{
+					row = new LLEmojiGridRow(row_panel_params, row_list_params);
+					mEmojiGrid->addPanel(row, true);
+				}
+
+				// Place a new icon to the current row
+				LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, descr, category);
+				icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
+				icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
+				icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK mask) { onEmojiMouseClick(ctrl, mask); });
+				icon->setRect(icon_rect);
+				row->mList->addPanel(icon, true);
+
+				iconIndex++;
+			}
+		}
+	};
+
+	const LLEmojiDictionary::cat2descrs_map_t& category2Descr = LLEmojiDictionary::instance().getCategory2Descrs();
+	if (mSelectedCategory.empty())
+	{
+		// List all categories with titles
+		for (const LLEmojiDictionary::cat2descrs_item_t& item : category2Descr)
+		{
+			listCategory(item.first, item.second, TRUE);
+		}
+	}
+	else
+	{
+		// List one category without title
+		const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(mSelectedCategory);
+		if (item != category2Descr.end())
+		{
+			listCategory(mSelectedCategory, item->second, FALSE);
+		}
+	}
+
+	onEmojiEmpty();
+}
+
 bool LLFloaterEmojiPicker::matchesCategory(const LLEmojiDescriptor* descr)
 {
 	return std::find(descr->Categories.begin(), descr->Categories.end(), mSelectedCategory) != descr->Categories.end();
@@ -223,19 +465,85 @@ void LLFloaterEmojiPicker::onPreviewEmojiClick()
 {
 	if (mEmojiPickCallback)
 	{
-		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected()))
+		if (mUseGrid)
 		{
-			mEmojiPickCallback(item->getEmoji());
+			if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
+			{
+				mEmojiPickCallback(icon->getEmoji());
+			}
+		}
+		else
+		{
+			if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
+			{
+				mEmojiPickCallback(item->getEmoji());
+			}
+		}
+	}
+}
+
+void LLFloaterEmojiPicker::onGridMouseEnter()
+{
+	mSearch->setVisible(FALSE);
+	mDescription->setText(LLStringExplicit(""), LLStyle::Params());
+	mDescription->setVisible(TRUE);
+}
+
+void LLFloaterEmojiPicker::onGridMouseLeave()
+{
+	mDescription->setVisible(FALSE);
+	mDescription->setText(LLStringExplicit(""), LLStyle::Params());
+	mSearch->setVisible(TRUE);
+	mSearch->setFocus(TRUE);
+}
+
+void LLFloaterEmojiPicker::onEmojiMouseEnter(LLUICtrl* ctrl)
+{
+	if (ctrl)
+	{
+		if (mHoveredIcon && mHoveredIcon != ctrl)
+		{
+			unselectGridIcon(mHoveredIcon);
+		}
+
+		selectGridIcon(ctrl);
+
+		mHoveredIcon = ctrl;
+	}
+}
+
+void LLFloaterEmojiPicker::onEmojiMouseLeave(LLUICtrl* ctrl)
+{
+	if (ctrl)
+	{
+		if (ctrl == mHoveredIcon)
+		{
+			unselectGridIcon(ctrl);
+		}
+	}
+}
+
+void LLFloaterEmojiPicker::onEmojiMouseClick(LLUICtrl* ctrl, MASK mask)
+{
+	if (mEmojiPickCallback)
+	{
+		if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+		{
+			mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, TRUE);
+			mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, FALSE);
+			if (!(mask & 4))
+			{
+				closeFloater();
+			}
 		}
 	}
 }
 
 void LLFloaterEmojiPicker::onEmojiSelect()
 {
-	const LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected());
-	if (item)
+	if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
 	{
-		mSelectedEmojiIndex = mEmojis->getFirstSelectedIndex();
+		mSelectedEmojiIndex = mEmojiList->getFirstSelectedIndex();
 		LLUIString text;
 		text.insert(0, LLWString(1, item->getEmoji()));
 		mPreviewEmoji->setLabel(text);
@@ -255,7 +563,7 @@ void LLFloaterEmojiPicker::onEmojiPick()
 {
 	if (mEmojiPickCallback)
 	{
-		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojis->getFirstSelected()))
+		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
 		{
 			mEmojiPickCallback(item->getEmoji());
 			closeFloater();
@@ -263,6 +571,31 @@ void LLFloaterEmojiPicker::onEmojiPick()
 	}
 }
 
+void LLFloaterEmojiPicker::selectGridIcon(LLUICtrl* ctrl)
+{
+	if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+	{
+		icon->setBackgroundVisible(TRUE);
+
+		LLUIString text;
+		text.insert(0, icon->getText());
+		mPreviewEmoji->setLabel(text);
+
+		std::string descr = icon->getDescr() + "\n" + icon->getCategory();
+		mDescription->setText(LLStringExplicit(descr), LLStyle::Params());
+	}
+}
+
+void LLFloaterEmojiPicker::unselectGridIcon(LLUICtrl* ctrl)
+{
+	if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+	{
+		icon->setBackgroundVisible(FALSE);
+		mPreviewEmoji->setLabel(LLUIString());
+		mDescription->setText(LLStringExplicit(""), LLStyle::Params());
+	}
+}
+
 // virtual
 BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
 {
@@ -279,12 +612,12 @@ BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
 			closeFloater();
 			return TRUE;
 		case KEY_UP:
-			mEmojis->selectPrevItem();
-			mEmojis->scrollToShowSelected();
+			mEmojiList->selectPrevItem();
+			mEmojiList->scrollToShowSelected();
 			return TRUE;
 		case KEY_DOWN:
-			mEmojis->selectNextItem();
-			mEmojis->scrollToShowSelected();
+			mEmojiList->selectNextItem();
+			mEmojiList->scrollToShowSelected();
 			return TRUE;
 		}
 	}
@@ -297,5 +630,7 @@ void LLFloaterEmojiPicker::closeFloater(bool app_quitting)
 {
 	LLFloater::closeFloater(app_quitting);
 	if (mFloaterCloseCallback)
+	{
 		mFloaterCloseCallback();
+	}
 }
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 7327fb945e..ba71f04830 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -33,6 +33,8 @@ struct LLEmojiDescriptor;
 
 class LLFloaterEmojiPicker : public LLFloater
 {
+	using super = LLFloater;
+
 public:
 	// The callback function will be called with an emoji char.
 	typedef boost::function<void (llwchar)> pick_callback_t;
@@ -45,7 +47,8 @@ public:
 	LLFloaterEmojiPicker(const LLSD& key);
 	virtual ~LLFloaterEmojiPicker();
 
-	virtual	BOOL postBuild();
+	virtual	BOOL postBuild() override;
+	virtual void dirtyRect() override;
 
 	void show(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
 
@@ -53,29 +56,47 @@ public:
 
 private:
 	void fillEmojis();
+	void fillEmojiList();
+	void fillEmojiGrid();
+
 	bool matchesCategory(const LLEmojiDescriptor* descr);
 	bool matchesPattern(const LLEmojiDescriptor* descr);
 
 	void onCategoryCommit();
 	void onSearchKeystroke();
 	void onPreviewEmojiClick();
+	void onGridMouseEnter();
+	void onGridMouseLeave();
+	void onEmojiMouseEnter(LLUICtrl* ctrl);
+	void onEmojiMouseLeave(LLUICtrl* ctrl);
+	void onEmojiMouseClick(LLUICtrl* ctrl, MASK mask);
 	void onEmojiSelect();
 	void onEmojiEmpty();
 	void onEmojiPick();
 
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
+	void selectGridIcon(LLUICtrl* ctrl);
+	void unselectGridIcon(LLUICtrl* ctrl);
+
+	virtual BOOL handleKeyHere(KEY key, MASK mask) override;
 
 	class LLComboBox* mCategory { nullptr };
 	class LLLineEditor* mSearch { nullptr };
-	class LLScrollListCtrl* mEmojis { nullptr };
+	class LLScrollListCtrl* mEmojiList { nullptr };
+	class LLScrollContainer* mEmojiScroll { nullptr };
+	class LLScrollingPanelList* mEmojiGrid { nullptr };
 	class LLButton* mPreviewEmoji { nullptr };
+	class LLTextBox* mDescription { nullptr };
 
 	pick_callback_t mEmojiPickCallback;
 	close_callback_t mFloaterCloseCallback;
 
+	S32 mRecentGridWidth { 0 };
+	LLUICtrl* mHoveredIcon { nullptr };
+
 	static std::string mSelectedCategory;
 	static std::string mSearchPattern;
 	static int mSelectedEmojiIndex;
+	static bool mUseGrid;
 };
 
 #endif
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
index b79c5d9a19..42c3e7e935 100644
--- a/indra/newview/skins/default/xui/en/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
@@ -23,7 +23,7 @@
 		<scrolling_panel_list
 			follows="left|right"
 			layout="topleft"
-      left="1"      
+			left="1"
 			name="chiclet_row_panel_list"
 			width="318"/>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 000d779759..76cd1c6d2a 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -20,6 +20,15 @@
       left="34"
       height="29"
       width="162" />
+  <text
+      name="Description"
+      layout="bottomleft"
+      follows="bottom|left|right"
+      font="SansSerifMedium"
+      bottom="14"
+      left="42"
+      height="29"
+      width="150" />
   <button
       name="PreviewEmoji"
       layout="bottomleft"
@@ -31,7 +40,7 @@
       height="29"
       width="29" />
   <scroll_list
-      name="Emojis"
+      name="EmojiList"
       layout="topleft"
       follows="all"
       sort_column="0"
@@ -52,6 +61,24 @@
         label="Name"
         name="name" />
   </scroll_list>
+  <scroll_container
+      name="EmojiGridContainer"
+      layout="topleft"
+      follows="all"
+      top="25"
+      left="0"
+      height="330"
+      width="200">
+    <scrolling_panel_list
+        name="EmojiGrid"
+        layout="topleft"
+        follows="top|left|right"
+        padding="4"
+        spacing="0"
+        top="0"
+        left="0"
+        width="200"/>
+  </scroll_container>
   <combo_box
       name="Category"
       label="Choose a category"
-- 
cgit v1.2.3


From 0414fada8163409adf95f9d7c75a7db5f0952103 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Wed, 5 Jul 2023 12:46:42 +0200
Subject: macos build fix

---
 indra/newview/llfloateremojipicker.cpp | 10 +++-------
 indra/newview/llfloateremojipicker.h   |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 8c7f38d324..67d5d8ea6b 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -100,9 +100,7 @@ public:
 		addChild(mList);
 	}
 
-	virtual void updatePanel(BOOL allow_modify)
-	{
-	}
+	virtual void updatePanel(BOOL allow_modify) override {}
 
 public:
 	LLScrollingPanelList* mList;
@@ -140,9 +138,7 @@ public:
 			true);                      // use_color
 	}
 
-	virtual void updatePanel(BOOL allow_modify)
-	{
-	}
+	virtual void updatePanel(BOOL allow_modify) override {}
 
 private:
 	const LLWString mText;
@@ -183,7 +179,7 @@ public:
 			true);                      // use_color
 	}
 
-	virtual void updatePanel(BOOL allow_modify) {}
+	virtual void updatePanel(BOOL allow_modify) override {}
 
 	llwchar getEmoji() const { return mEmoji; }
 	LLWString getText() const { return mText; }
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index ba71f04830..68c694d89a 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -52,7 +52,7 @@ public:
 
 	void show(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
 
-	virtual void closeFloater(bool app_quitting = false);
+	virtual void closeFloater(bool app_quitting = false) override;
 
 private:
 	void fillEmojis();
-- 
cgit v1.2.3


From 18039655ed91e87db1aca9f4d782e65725e30f12 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 5 Jul 2023 17:44:27 +0200
Subject: SL-19951 Make EmojiFloater UI design looking similar to Slack - bg
 colors

---
 indra/newview/llfloateremojipicker.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 67d5d8ea6b..e620d507ec 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -366,6 +366,18 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
 	LLPanel::Params icon_params;
 	LLRect icon_rect(0, iconSize, iconSize, 0);
 
+	static const LLColor4 bgcolors[] =
+	{
+		LLColor4(0.8f, 0.6f, 0.8f, 1.0f),
+		LLColor4(0.8f, 0.8f, 0.4f, 1.0f),
+		LLColor4(0.6f, 0.6f, 0.8f, 1.0f),
+		LLColor4(0.4f, 0.7f, 0.4f, 1.0f),
+		LLColor4(0.5f, 0.7f, 0.9f, 1.0f),
+		LLColor4(0.7f, 0.8f, 0.2f, 1.0f)
+	};
+
+	static constexpr U32 bgcolorCount = sizeof(bgcolors) / sizeof(*bgcolors);
+
 	auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis, bool showDivider)
 	{
 		int iconIndex = 0;
@@ -395,6 +407,8 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
 				icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
 				icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
 				icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK mask) { onEmojiMouseClick(ctrl, mask); });
+				icon->setBackgroundColor(bgcolors[iconIndex % bgcolorCount]);
+				icon->setBackgroundOpaque(1);
 				icon->setRect(icon_rect);
 				row->mList->addPanel(icon, true);
 
-- 
cgit v1.2.3


From deb394e2075e031bfe1472fdc3bc638360683c85 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 6 Jul 2023 09:33:22 +0200
Subject: SL-19951 Delete unused UI elements (old design)

---
 indra/newview/llfloateremojipicker.cpp             | 153 ++++-----------------
 indra/newview/llfloateremojipicker.h               |   9 +-
 .../skins/default/xui/en/floater_emoji_picker.xml  |  22 ---
 3 files changed, 25 insertions(+), 159 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index e620d507ec..e94fc203f0 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -41,8 +41,6 @@
 
 std::string LLFloaterEmojiPicker::mSelectedCategory;
 std::string LLFloaterEmojiPicker::mSearchPattern;
-int LLFloaterEmojiPicker::mSelectedEmojiIndex;
-bool LLFloaterEmojiPicker::mUseGrid = true;
 
 class LLEmojiScrollListItem : public LLScrollListItem
 {
@@ -210,9 +208,6 @@ LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_ca
 
 void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t close_callback)
 {
-	// Temporary solution to support both layouts
-	mUseGrid = !gKeyboard->getKeyDown(KEY_SHIFT);
-
 	mEmojiPickCallback = pick_callback;
 	mFloaterCloseCallback = close_callback;
 	openFloater(mKey);
@@ -251,19 +246,13 @@ BOOL LLFloaterEmojiPicker::postBuild()
 	mSearch->setFont(LLViewerChat::getChatFont());
 	mSearch->setText(mSearchPattern);
 
-	mEmojiList = getChild<LLScrollListCtrl>("EmojiList");
-	mEmojiList->setCommitCallback([this](LLUICtrl*, const LLSD&) { onEmojiSelect(); });
-	mEmojiList->setDoubleClickCallback([this]() { onEmojiPick(); });
-	mEmojiList->setVisible(!mUseGrid);
-
 	mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
-	mEmojiScroll->setVisible(mUseGrid);
 	mEmojiScroll->setMouseEnterCallback([this](LLUICtrl*, const LLSD&) { onGridMouseEnter(); });
 	mEmojiScroll->setMouseLeaveCallback([this](LLUICtrl*, const LLSD&) { onGridMouseLeave(); });
 
 	mEmojiGrid = getChild<LLScrollingPanelList>("EmojiGrid");
 
-	fillEmojis();
+	fillEmojiGrid();
 
 	return TRUE;
 }
@@ -272,7 +261,7 @@ void LLFloaterEmojiPicker::dirtyRect()
 {
 	super::dirtyRect();
 
-	if (mUseGrid && mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
+	if (mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
 	{
 		fillEmojiGrid();
 	}
@@ -283,54 +272,9 @@ LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
 	gFocusMgr.releaseFocusIfNeeded( this );
 }
 
-void LLFloaterEmojiPicker::fillEmojis()
-{
-	if (mUseGrid)
-		fillEmojiGrid();
-	else
-		fillEmojiList();
-}
-
-void LLFloaterEmojiPicker::fillEmojiList()
-{
-	mEmojiList->clearRows();
-
-	const LLEmojiDictionary::emoji2descr_map_t& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
-	for (const LLEmojiDictionary::emoji2descr_item_t& item : emoji2Descr)
-	{
-		const LLEmojiDescriptor* descr = item.second;
-
-		if (!mSelectedCategory.empty() && !matchesCategory(descr))
-			continue;
-
-		if (!mSearchPattern.empty() && !matchesPattern(descr))
-			continue;
-
-		LLScrollListItem::Params params;
-		// The following line adds default monochrome view of the emoji (is shown as an example)
-		//params.columns.add().column("look").value(wstring_to_utf8str(LLWString(1, it.first)));
-		params.columns.add().column("name").value(descr->Name);
-		mEmojiList->addRow(new LLEmojiScrollListItem(item.first, params), params);
-	}
-
-	if (mEmojiList->getItemCount())
-	{
-		if (mSelectedEmojiIndex > 0 && mSelectedEmojiIndex < mEmojiList->getItemCount())
-			mEmojiList->selectNthItem(mSelectedEmojiIndex);
-		else
-			mEmojiList->selectFirstItem();
-
-		mEmojiList->scrollToShowSelected();
-	}
-	else
-	{
-		onEmojiEmpty();
-	}
-}
-
 void LLFloaterEmojiPicker::fillEmojiGrid()
 {
-	mEmojiGrid->clearPanels();
+	mRecentGridWidth = mEmojiScroll->getRect().getWidth();
 
 	S32 scrollbarSize = mEmojiScroll->getSize();
 	if (scrollbarSize < 0)
@@ -339,8 +283,22 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
 		scrollbarSize = scrollbar_size_control;
 	}
 
-	mRecentGridWidth = mEmojiScroll->getRect().getWidth();
 	const S32 clientWidth = mRecentGridWidth - scrollbarSize - mEmojiScroll->getBorderWidth() * 2;
+	const S32 gridPadding = mEmojiGrid->getPadding();
+	const S32 iconSpacing = mEmojiGrid->getSpacing();
+	const S32 rowWidth = clientWidth - gridPadding * 2;
+	const S32 iconSize = 28; // icon width and height
+	const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
+
+	// Optimization: don't rearrange for different widths with the same maxIcons
+	if (maxIcons == mRecentMaxIcons)
+		return;
+	mRecentMaxIcons = maxIcons;
+
+	mHoveredIcon = nullptr;
+	mEmojiGrid->clearPanels();
+	mPreviewEmoji->setLabel(LLUIString());
+
 	if (mEmojiGrid->getRect().getWidth() != clientWidth)
 	{
 		LLRect rect = mEmojiGrid->getRect();
@@ -348,12 +306,6 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
 		mEmojiGrid->setRect(rect);
 	}
 
-	const S32 gridPadding = mEmojiGrid->getPadding();
-	const S32 iconSpacing = mEmojiGrid->getSpacing();
-	const S32 rowWidth = clientWidth - gridPadding * 2;
-	const S32 iconSize = 28; // icon width and height
-	const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
-
 	LLPanel::Params row_panel_params;
 	row_panel_params.rect = LLRect(0, iconSize, rowWidth, 0);
 
@@ -435,8 +387,6 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
 			listCategory(mSelectedCategory, item->second, FALSE);
 		}
 	}
-
-	onEmojiEmpty();
 }
 
 bool LLFloaterEmojiPicker::matchesCategory(const LLEmojiDescriptor* descr)
@@ -460,34 +410,24 @@ bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
 void LLFloaterEmojiPicker::onCategoryCommit()
 {
 	mSelectedCategory = mCategory->getSelectedValue().asString();
-	mSelectedEmojiIndex = 0;
-	fillEmojis();
+	mRecentMaxIcons = 0;
+	fillEmojiGrid();
 }
 
 void LLFloaterEmojiPicker::onSearchKeystroke()
 {
 	mSearchPattern = mSearch->getText();
-	mSelectedEmojiIndex = 0;
-	fillEmojis();
+	mRecentMaxIcons = 0;
+	fillEmojiGrid();
 }
 
 void LLFloaterEmojiPicker::onPreviewEmojiClick()
 {
 	if (mEmojiPickCallback)
 	{
-		if (mUseGrid)
+		if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
 		{
-			if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
-			{
-				mEmojiPickCallback(icon->getEmoji());
-			}
-		}
-		else
-		{
-			if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
-			{
-				mEmojiPickCallback(item->getEmoji());
-			}
+			mEmojiPickCallback(icon->getEmoji());
 		}
 	}
 }
@@ -549,38 +489,6 @@ void LLFloaterEmojiPicker::onEmojiMouseClick(LLUICtrl* ctrl, MASK mask)
 	}
 }
 
-void LLFloaterEmojiPicker::onEmojiSelect()
-{
-	if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
-	{
-		mSelectedEmojiIndex = mEmojiList->getFirstSelectedIndex();
-		LLUIString text;
-		text.insert(0, LLWString(1, item->getEmoji()));
-		mPreviewEmoji->setLabel(text);
-		return;
-	}
-
-	onEmojiEmpty();
-}
-
-void LLFloaterEmojiPicker::onEmojiEmpty()
-{
-	mSelectedEmojiIndex = 0;
-	mPreviewEmoji->setLabel(LLUIString());
-}
-
-void LLFloaterEmojiPicker::onEmojiPick()
-{
-	if (mEmojiPickCallback)
-	{
-		if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
-		{
-			mEmojiPickCallback(item->getEmoji());
-			closeFloater();
-		}
-	}
-}
-
 void LLFloaterEmojiPicker::selectGridIcon(LLUICtrl* ctrl)
 {
 	if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
@@ -613,22 +521,9 @@ BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
 	{
 		switch (key)
 		{
-		case KEY_RETURN:
-			if (mCategory->hasFocus())
-				break;
-			onEmojiPick();
-			return TRUE;
 		case KEY_ESCAPE:
 			closeFloater();
 			return TRUE;
-		case KEY_UP:
-			mEmojiList->selectPrevItem();
-			mEmojiList->scrollToShowSelected();
-			return TRUE;
-		case KEY_DOWN:
-			mEmojiList->selectNextItem();
-			mEmojiList->scrollToShowSelected();
-			return TRUE;
 		}
 	}
 
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 68c694d89a..b36e09fd5b 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -55,8 +55,6 @@ public:
 	virtual void closeFloater(bool app_quitting = false) override;
 
 private:
-	void fillEmojis();
-	void fillEmojiList();
 	void fillEmojiGrid();
 
 	bool matchesCategory(const LLEmojiDescriptor* descr);
@@ -70,9 +68,6 @@ private:
 	void onEmojiMouseEnter(LLUICtrl* ctrl);
 	void onEmojiMouseLeave(LLUICtrl* ctrl);
 	void onEmojiMouseClick(LLUICtrl* ctrl, MASK mask);
-	void onEmojiSelect();
-	void onEmojiEmpty();
-	void onEmojiPick();
 
 	void selectGridIcon(LLUICtrl* ctrl);
 	void unselectGridIcon(LLUICtrl* ctrl);
@@ -81,7 +76,6 @@ private:
 
 	class LLComboBox* mCategory { nullptr };
 	class LLLineEditor* mSearch { nullptr };
-	class LLScrollListCtrl* mEmojiList { nullptr };
 	class LLScrollContainer* mEmojiScroll { nullptr };
 	class LLScrollingPanelList* mEmojiGrid { nullptr };
 	class LLButton* mPreviewEmoji { nullptr };
@@ -91,12 +85,11 @@ private:
 	close_callback_t mFloaterCloseCallback;
 
 	S32 mRecentGridWidth { 0 };
+	S32 mRecentMaxIcons { 0 };
 	LLUICtrl* mHoveredIcon { nullptr };
 
 	static std::string mSelectedCategory;
 	static std::string mSearchPattern;
-	static int mSelectedEmojiIndex;
-	static bool mUseGrid;
 };
 
 #endif
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 76cd1c6d2a..2e153933c0 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -39,28 +39,6 @@
       left="2"
       height="29"
       width="29" />
-  <scroll_list
-      name="EmojiList"
-      layout="topleft"
-      follows="all"
-      sort_column="0"
-      max_chars="63"
-      commit_on_selection_change="true"
-      draw_heading="true"
-      heading_height="25"
-      row_padding="0"
-      top="25"
-      left="0"
-      height="330"
-      width="200">
-    <columns
-        label="@"
-        name="look"
-        width="16" />
-    <columns
-        label="Name"
-        name="name" />
-  </scroll_list>
   <scroll_container
       name="EmojiGridContainer"
       layout="topleft"
-- 
cgit v1.2.3


From 4abecaa04bd003136ed027e3892a2ca13d895936 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 6 Jul 2023 11:17:20 +0200
Subject: SL-19951 Delete unused code

---
 indra/newview/llfloateremojipicker.cpp | 8 --------
 indra/newview/llfloateremojipicker.h   | 1 -
 2 files changed, 9 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index e94fc203f0..f63062f03a 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -389,11 +389,6 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
 	}
 }
 
-bool LLFloaterEmojiPicker::matchesCategory(const LLEmojiDescriptor* descr)
-{
-	return std::find(descr->Categories.begin(), descr->Categories.end(), mSelectedCategory) != descr->Categories.end();
-}
-
 bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
 {
 	if (descr->Name.find(mSearchPattern) != std::string::npos)
@@ -401,9 +396,6 @@ bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
 	for (const std::string& shortCode : descr->ShortCodes)
 		if (shortCode.find(mSearchPattern) != std::string::npos)
 			return true;
-	for (const std::string& category : descr->Categories)
-		if (category.find(mSearchPattern) != std::string::npos)
-			return true;
 	return false;
 }
 
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index b36e09fd5b..300d9a4d4a 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -57,7 +57,6 @@ public:
 private:
 	void fillEmojiGrid();
 
-	bool matchesCategory(const LLEmojiDescriptor* descr);
 	bool matchesPattern(const LLEmojiDescriptor* descr);
 
 	void onCategoryCommit();
-- 
cgit v1.2.3


From 9793308a600c1e1ce35ec727ed6341e7668848ea Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 6 Jul 2023 23:48:06 +0200
Subject: SL-19951 Organize emoji categories in groups

---
 indra/llui/llemojidictionary.cpp                   | 424 +++++++---
 indra/llui/llemojidictionary.h                     |  78 +-
 indra/newview/app_settings/emoji_groups.xml        |  82 ++
 indra/newview/llfloateremojipicker.cpp             | 849 ++++++++++++---------
 indra/newview/llfloateremojipicker.h               | 102 +--
 .../skins/default/xui/da/emoji_categories.xml      |  59 ++
 .../skins/default/xui/de/emoji_categories.xml      |  59 ++
 .../skins/default/xui/en/emoji_categories.xml      |  59 ++
 .../skins/default/xui/en/floater_emoji_picker.xml  |  33 +-
 .../skins/default/xui/es/emoji_categories.xml      |  59 ++
 .../skins/default/xui/fr/emoji_categories.xml      |  59 ++
 .../skins/default/xui/it/emoji_categories.xml      |  59 ++
 .../skins/default/xui/ja/emoji_categories.xml      |  59 ++
 .../skins/default/xui/pl/emoji_categories.xml      |  59 ++
 .../skins/default/xui/pt/emoji_categories.xml      |  59 ++
 .../skins/default/xui/ru/emoji_categories.xml      |  59 ++
 .../skins/default/xui/zh/emoji_categories.xml      |  59 ++
 17 files changed, 1633 insertions(+), 584 deletions(-)
 create mode 100644 indra/newview/app_settings/emoji_groups.xml
 create mode 100644 indra/newview/skins/default/xui/da/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/de/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/en/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/es/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/fr/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/it/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/ja/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/pl/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/pt/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/ru/emoji_categories.xml
 create mode 100644 indra/newview/skins/default/xui/zh/emoji_categories.xml

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index 179c5d25bf..cdcf5a93d6 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -38,7 +38,12 @@
 // Constants
 //
 
-constexpr char SKINNED_EMOJI_FILENAME[] = "emoji_characters.xml";
+static const std::string SKINNED_EMOJI_FILENAME("emoji_characters.xml");
+static const std::string SKINNED_CATEGORY_FILENAME("emoji_categories.xml");
+static const std::string COMMON_GROUP_FILENAME("emoji_groups.xml");
+static const std::string GROUP_NAME_ALL("all");
+static const std::string GROUP_NAME_OTHERS("others");
+static const std::string GROUP_NAME_SKIP("skip");
 
 // ============================================================================
 // Helper functions
@@ -50,82 +55,68 @@ std::list<T> llsd_array_to_list(const LLSD& sd, std::function<void(T&)> mutator
 template<>
 std::list<std::string> llsd_array_to_list(const LLSD& sd, std::function<void(std::string&)> mutator)
 {
-	std::list<std::string> result;
-	for (LLSD::array_const_iterator it = sd.beginArray(), end = sd.endArray(); it != end; ++it)
-	{
-		const LLSD& entry = *it;
-		if (!entry.isString())
-			continue;
-
-		result.push_back(entry.asStringRef());
-		if (mutator)
-		{
-			mutator(result.back());
-		}
-	}
-	return result;
-}
-
-LLEmojiDescriptor::LLEmojiDescriptor(const LLSD& descriptor_sd)
-{
-	Name = descriptor_sd["Name"].asStringRef();
-
-	const LLWString emoji_string = utf8str_to_wstring(descriptor_sd["Character"].asString());
-	Character = (1 == emoji_string.size()) ? emoji_string[0] : L'\0'; // We don't currently support character composition
-
-	auto toLower = [](std::string& str) { LLStringUtil::toLower(str); };
-	ShortCodes = llsd_array_to_list<std::string>(descriptor_sd["ShortCodes"], toLower);
-	Categories = llsd_array_to_list<std::string>(descriptor_sd["Categories"], toLower);
-
-	if (Name.empty())
-	{
-		Name = ShortCodes.front();
-	}
-}
-
-bool LLEmojiDescriptor::isValid() const
-{
-	return
-		Character &&
-		!ShortCodes.empty() &&
-		!Categories.empty();
+    std::list<std::string> result;
+    for (LLSD::array_const_iterator it = sd.beginArray(), end = sd.endArray(); it != end; ++it)
+    {
+        const LLSD& entry = *it;
+        if (!entry.isString())
+            continue;
+
+        result.push_back(entry.asStringRef());
+        if (mutator)
+        {
+            mutator(result.back());
+        }
+    }
+    return result;
 }
 
 struct emoji_filter_base
 {
-	emoji_filter_base(const std::string& needle)
-	{
-		// Search without the colon (if present) so the user can type ':food' and see all emojis in the 'Food' category
-		mNeedle = (boost::starts_with(needle, ":")) ? needle.substr(1) : needle;
-		LLStringUtil::toLower(mNeedle);
-	}
+    emoji_filter_base(const std::string& needle)
+    {
+        // Search without the colon (if present) so the user can type ':food' and see all emojis in the 'Food' category
+        mNeedle = (boost::starts_with(needle, ":")) ? needle.substr(1) : needle;
+        LLStringUtil::toLower(mNeedle);
+    }
 
 protected:
-	std::string mNeedle;
+    std::string mNeedle;
 };
 
 struct emoji_filter_shortcode_or_category_contains : public emoji_filter_base
 {
-	emoji_filter_shortcode_or_category_contains(const std::string& needle) : emoji_filter_base(needle) {}
+    emoji_filter_shortcode_or_category_contains(const std::string& needle) : emoji_filter_base(needle) {}
 
-	bool operator()(const LLEmojiDescriptor& descr) const
-	{
-		for (const auto& short_code : descr.ShortCodes)
-		{
-			if (boost::icontains(short_code, mNeedle))
-				return true;
-		}
+    bool operator()(const LLEmojiDescriptor& descr) const
+    {
+        for (const auto& short_code : descr.ShortCodes)
+        {
+            if (boost::icontains(short_code, mNeedle))
+                return true;
+        }
 
-		for (const auto& category : descr.Categories)
-		{
-			if (boost::icontains(category, mNeedle))
-				return true;
-		}
+        if (boost::icontains(descr.Category, mNeedle))
+            return true;
 
-		return false;
-	}
+        return false;
+    }
 };
 
+std::string LLEmojiDescriptor::getShortCodes() const
+{
+    std::string result;
+    for (const std::string& shortCode : ShortCodes)
+    {
+        if (!result.empty())
+        {
+            result += ", ";
+        }
+        result += shortCode;
+    }
+    return result;
+}
+
 // ============================================================================
 // LLEmojiDictionary class
 //
@@ -137,91 +128,278 @@ LLEmojiDictionary::LLEmojiDictionary()
 // static
 void LLEmojiDictionary::initClass()
 {
-	LLEmojiDictionary* pThis = &LLEmojiDictionary::initParamSingleton();
-
-	LLSD data;
-
-	auto filenames = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_EMOJI_FILENAME, LLDir::CURRENT_SKIN);
-	if (filenames.empty())
-	{
-		LL_WARNS() << "Emoji file characters not found" << LL_ENDL;
-		return;
-	}
-	const std::string filename = filenames.back();
-	llifstream file(filename.c_str());
-	if (file.is_open())
-	{
-		LL_DEBUGS() << "Loading emoji characters file at " << filename << LL_ENDL;
-		LLSDSerialize::fromXML(data, file);
-	}
-
-	if (data.isUndefined())
-	{
-		LL_WARNS() << "Emoji file characters missing or ill-formed" << LL_ENDL;
-		return;
-	}
-
-	for (LLSD::array_const_iterator descriptor_it = data.beginArray(), descriptor_end = data.endArray(); descriptor_it != descriptor_end; ++descriptor_it)
-	{
-		LLEmojiDescriptor descriptor(*descriptor_it);
-		if (!descriptor.isValid())
-		{
-			LL_WARNS() << "Skipping invalid emoji descriptor " << descriptor.Character << LL_ENDL;
-			continue;
-		}
-		pThis->addEmoji(std::move(descriptor));
-	}
+    LLEmojiDictionary* pThis = &LLEmojiDictionary::initParamSingleton();
+
+    pThis->loadTranslations();
+    pThis->loadGroups();
+    pThis->loadEmojis();
 }
 
 LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
 {
-	LLWString result;
-	boost::transform(mEmojis | boost::adaptors::filtered(emoji_filter_shortcode_or_category_contains(needle)),
-		             std::back_inserter(result), [](const auto& descr) { return descr.Character; });
-	return result;
+    LLWString result;
+    boost::transform(mEmojis | boost::adaptors::filtered(emoji_filter_shortcode_or_category_contains(needle)),
+                     std::back_inserter(result), [](const auto& descr) { return descr.Character; });
+    return result;
 }
 
 const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromEmoji(llwchar emoji) const
 {
-	const auto it = mEmoji2Descr.find(emoji);
-	return (mEmoji2Descr.end() != it) ? it->second : nullptr;
+    const auto it = mEmoji2Descr.find(emoji);
+    return (mEmoji2Descr.end() != it) ? it->second : nullptr;
 }
 
 const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromShortCode(const std::string& short_code) const
 {
-	const auto it = mShortCode2Descr.find(short_code);
-	return (mShortCode2Descr.end() != it) ? it->second : nullptr;
+    const auto it = mShortCode2Descr.find(short_code);
+    return (mShortCode2Descr.end() != it) ? it->second : nullptr;
 }
 
 std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch) const
 {
-	const auto it = mEmoji2Descr.find(ch);
-	return (mEmoji2Descr.end() != it) ? it->second->Name : LLStringUtil::null;
+    const auto it = mEmoji2Descr.find(ch);
+    return (mEmoji2Descr.end() != it) ? it->second->ShortCodes.front() : LLStringUtil::null;
 }
 
 bool LLEmojiDictionary::isEmoji(llwchar ch) const
 {
-	// Currently used codes: A9,AE,203C,2049,2122,...,2B55,3030,303D,3297,3299,1F004,...,1FAF6
-	if (ch == 0xA9 || ch == 0xAE || (ch >= 0x2000 && ch < 0x3300) || (ch >= 0x1F000 && ch < 0x20000))
-	{
-		return mEmoji2Descr.find(ch) != mEmoji2Descr.end();
-	}
+    // Currently used codes: A9,AE,203C,2049,2122,...,2B55,3030,303D,3297,3299,1F004,...,1FAF6
+    if (ch == 0xA9 || ch == 0xAE || (ch >= 0x2000 && ch < 0x3300) || (ch >= 0x1F000 && ch < 0x20000))
+    {
+        return mEmoji2Descr.find(ch) != mEmoji2Descr.end();
+    }
 
-	return false;
+    return false;
+}
+
+void LLEmojiDictionary::loadTranslations()
+{
+    std::vector<std::string> filenames = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_CATEGORY_FILENAME, LLDir::CURRENT_SKIN);
+    if (filenames.empty())
+    {
+        LL_WARNS() << "Emoji file categories not found" << LL_ENDL;
+        return;
+    }
+
+    const std::string filename = filenames.back();
+    llifstream file(filename.c_str());
+    if (!file.is_open())
+    {
+        LL_WARNS() << "Emoji file categories failed to open" << LL_ENDL;
+        return;
+    }
+
+    LL_DEBUGS() << "Loading emoji categories file at " << filename << LL_ENDL;
+
+    LLSD data;
+    LLSDSerialize::fromXML(data, file);
+    if (data.isUndefined())
+    {
+        LL_WARNS() << "Emoji file categories missing or ill-formed" << LL_ENDL;
+        return;
+    }
+
+    // Register translations for all categories
+    for (LLSD::array_const_iterator it = data.beginArray(), end = data.endArray(); it != end; ++it)
+    {
+        const LLSD& sd = *it;
+        const std::string& name = sd["Name"].asStringRef();
+        const std::string& category = sd["Category"].asStringRef();
+        if (!name.empty() && !category.empty())
+        {
+            mTranslations[name] = category;
+        }
+        else
+        {
+            LL_WARNS() << "Skipping invalid emoji category '" << name << "' => '" << category << "'" << LL_ENDL;
+        }
+    }
+}
+
+void LLEmojiDictionary::loadGroups()
+{
+    const std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, COMMON_GROUP_FILENAME);
+    llifstream file(filename.c_str());
+    if (!file.is_open())
+    {
+        LL_WARNS() << "Emoji file groups failed to open" << LL_ENDL;
+        return;
+    }
+
+    LL_DEBUGS() << "Loading emoji groups file at " << filename << LL_ENDL;
+
+    LLSD data;
+    LLSDSerialize::fromXML(data, file);
+    if (data.isUndefined())
+    {
+        LL_WARNS() << "Emoji file groups missing or ill-formed" << LL_ENDL;
+        return;
+    }
+
+    mGroups.clear();
+    // Add group "all"
+    mGroups.emplace_back();
+    // https://www.compart.com/en/unicode/U+1F50D
+    mGroups.front().Character = 0x1F50D;
+    // https://www.compart.com/en/unicode/U+1F302
+    llwchar iconOthers = 0x1F302;
+
+    // Register all groups
+    for (LLSD::array_const_iterator it = data.beginArray(), end = data.endArray(); it != end; ++it)
+    {
+        const LLSD& sd = *it;
+        const std::string& name = sd["Name"].asStringRef();
+        if (name == GROUP_NAME_ALL)
+        {
+            mGroups.front().Character = loadIcon(sd);
+        }
+        else if (name == GROUP_NAME_OTHERS)
+        {
+            iconOthers = loadIcon(sd);
+        }
+        else if (name == GROUP_NAME_SKIP)
+        {
+            mSkipCategories = loadCategories(sd);
+            translateCategories(mSkipCategories);
+        }
+        else
+        {
+            // Add new group
+            mGroups.emplace_back();
+            LLEmojiGroup& group = mGroups.back();
+            group.Character = loadIcon(sd);
+            group.Categories = loadCategories(sd);
+            translateCategories(group.Categories);
+
+            for (const std::string& category : group.Categories)
+            {
+                mCategory2Group.insert(std::make_pair(category, &group));
+            }
+        }
+    }
+
+    // Add group "others"
+    mGroups.emplace_back();
+    mGroups.back().Character = iconOthers;
+}
+
+void LLEmojiDictionary::loadEmojis()
+{
+    std::vector<std::string> filenames = gDirUtilp->findSkinnedFilenames(LLDir::XUI, SKINNED_EMOJI_FILENAME, LLDir::CURRENT_SKIN);
+    if (filenames.empty())
+    {
+        LL_WARNS() << "Emoji file characters not found" << LL_ENDL;
+        return;
+    }
+
+    const std::string filename = filenames.back();
+    llifstream file(filename.c_str());
+    if (!file.is_open())
+    {
+        LL_WARNS() << "Emoji file characters failed to open" << LL_ENDL;
+        return;
+    }
+
+    LL_DEBUGS() << "Loading emoji characters file at " << filename << LL_ENDL;
+
+    LLSD data;
+    LLSDSerialize::fromXML(data, file);
+    if (data.isUndefined())
+    {
+        LL_WARNS() << "Emoji file characters missing or ill-formed" << LL_ENDL;
+        return;
+    }
+
+    for (LLSD::array_const_iterator it = data.beginArray(), end = data.endArray(); it != end; ++it)
+    {
+        const LLSD& sd = *it;
+
+        llwchar icon = loadIcon(sd);
+        if (!icon)
+        {
+            LL_WARNS() << "Skipping invalid emoji descriptor (no icon)" << LL_ENDL;
+            continue;
+        }
+
+        std::list<std::string> categories = loadCategories(sd);
+        if (categories.empty())
+        {
+            LL_WARNS() << "Skipping invalid emoji descriptor (no categories)" << LL_ENDL;
+            continue;
+        }
+
+        std::string category = categories.front();
+
+        if (std::find(mSkipCategories.begin(), mSkipCategories.end(), category) != mSkipCategories.end())
+        {
+            // This category is listed for skip
+            continue;
+        }
+
+        std::list<std::string> shortCodes = loadShortCodes(sd);
+        if (shortCodes.empty())
+        {
+            LL_WARNS() << "Skipping invalid emoji descriptor (no shortCodes)" << LL_ENDL;
+            continue;
+        }
+
+        if (mCategory2Group.find(category) == mCategory2Group.end())
+        {
+            // Add unknown category to "others" group
+            mGroups.back().Categories.push_back(category);
+            mCategory2Group.insert(std::make_pair(category, &mGroups.back()));
+        }
+
+        mEmojis.emplace_back();
+        LLEmojiDescriptor& emoji = mEmojis.back();
+        emoji.Character = icon;
+        emoji.Category = category;
+        emoji.ShortCodes = std::move(shortCodes);
+
+        mEmoji2Descr.insert(std::make_pair(icon, &emoji));
+        mCategory2Descrs[category].push_back(&emoji);
+        for (const std::string& shortCode : emoji.ShortCodes)
+        {
+            mShortCode2Descr.insert(std::make_pair(shortCode, &emoji));
+        }
+    }
+}
+
+llwchar LLEmojiDictionary::loadIcon(const LLSD& sd)
+{
+    // We don't currently support character composition
+    const LLWString icon = utf8str_to_wstring(sd["Character"].asString());
+    return (1 == icon.size()) ? icon[0] : L'\0';
+}
+
+static inline std::list<std::string> loadStrings(const LLSD& sd, const std::string key)
+{
+    auto toLower = [](std::string& str) { LLStringUtil::toLower(str); };
+    return llsd_array_to_list<std::string>(sd[key], toLower);
+}
+
+std::list<std::string> LLEmojiDictionary::loadCategories(const LLSD& sd)
+{
+    static const std::string categoriesKey("Categories");
+    return loadStrings(sd, categoriesKey);
+}
+
+std::list<std::string> LLEmojiDictionary::loadShortCodes(const LLSD& sd)
+{
+    static const std::string shortCodesKey("ShortCodes");
+    return loadStrings(sd, shortCodesKey);
 }
 
-void LLEmojiDictionary::addEmoji(LLEmojiDescriptor&& descr)
+void LLEmojiDictionary::translateCategories(std::list<std::string>& categories)
 {
-	mEmojis.push_back(descr);
-	mEmoji2Descr.insert(std::make_pair(descr.Character, &mEmojis.back()));
-	for (const std::string& shortCode : descr.ShortCodes)
-	{
-		mShortCode2Descr.insert(std::make_pair(shortCode, &mEmojis.back()));
-	}
-	for (const std::string& category : descr.Categories)
-	{
-		mCategory2Descrs[category].push_back(&mEmojis.back());
-	}
+    for (std::string& category : categories)
+    {
+        auto it = mTranslations.find(category);
+        if (it != mTranslations.end())
+        {
+            category = it->second;
+        }
+    }
 }
 
 // ============================================================================
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index 1507ebfad3..f6442684a7 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -36,14 +36,20 @@
 
 struct LLEmojiDescriptor
 {
-	LLEmojiDescriptor(const LLSD& descriptor_sd);
+    llwchar Character;
+    std::string Category;
+    std::list<std::string> ShortCodes;
+    std::string getShortCodes() const;
+};
 
-	bool isValid() const;
+// ============================================================================
+// LLEmojiGroup class
+//
 
-	std::string            Name;
-	llwchar                Character;
-	std::list<std::string> ShortCodes;
-	std::list<std::string> Categories;
+struct LLEmojiGroup
+{
+    llwchar Character;
+    std::list<std::string> Categories;
 };
 
 // ============================================================================
@@ -52,36 +58,48 @@ struct LLEmojiDescriptor
 
 class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLInitClass<LLEmojiDictionary>
 {
-	LLSINGLETON(LLEmojiDictionary);
-	~LLEmojiDictionary() override {};
+    LLSINGLETON(LLEmojiDictionary);
+    ~LLEmojiDictionary() override {};
 
 public:
-	typedef std::map<llwchar, const LLEmojiDescriptor*> emoji2descr_map_t;
-	typedef emoji2descr_map_t::value_type emoji2descr_item_t;
-	typedef std::map<std::string, const LLEmojiDescriptor*> code2descr_map_t;
-	typedef code2descr_map_t::value_type code2descr_item_t;
-	typedef std::map<std::string, std::vector<const LLEmojiDescriptor*>> cat2descrs_map_t;
-	typedef cat2descrs_map_t::value_type cat2descrs_item_t;
-
-	static void initClass();
-	LLWString   findMatchingEmojis(const std::string& needle) const;
-	const LLEmojiDescriptor* getDescriptorFromEmoji(llwchar emoji) const;
-	const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
-	std::string getNameFromEmoji(llwchar ch) const;
-	bool isEmoji(llwchar ch) const;
-
-	const emoji2descr_map_t& getEmoji2Descr() const { return mEmoji2Descr; }
-	const code2descr_map_t& getShortCode2Descr() const { return mShortCode2Descr; }
-	const cat2descrs_map_t& getCategory2Descrs() const { return mCategory2Descrs; }
+    typedef std::map<std::string, std::string> cat2cat_map_t;
+    typedef std::map<std::string, const LLEmojiGroup*> cat2group_map_t;
+    typedef std::map<llwchar, const LLEmojiDescriptor*> emoji2descr_map_t;
+    typedef std::map<std::string, const LLEmojiDescriptor*> code2descr_map_t;
+    typedef std::map<std::string, std::vector<const LLEmojiDescriptor*>> cat2descrs_map_t;
+
+    static void initClass();
+    LLWString findMatchingEmojis(const std::string& needle) const;
+    const LLEmojiDescriptor* getDescriptorFromEmoji(llwchar emoji) const;
+    const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
+    std::string getNameFromEmoji(llwchar ch) const;
+    bool isEmoji(llwchar ch) const;
+
+    const std::vector<LLEmojiGroup>& getGroups() const { return mGroups; }
+    const emoji2descr_map_t& getEmoji2Descr() const { return mEmoji2Descr; }
+    const cat2descrs_map_t& getCategory2Descrs() const { return mCategory2Descrs; }
+    const code2descr_map_t& getShortCode2Descr() const { return mShortCode2Descr; }
 
 private:
-	void addEmoji(LLEmojiDescriptor&& descr);
+    void loadTranslations();
+    void loadGroups();
+    void loadEmojis();
+
+    static llwchar loadIcon(const LLSD& sd);
+    static std::list<std::string> loadCategories(const LLSD& sd);
+    static std::list<std::string> loadShortCodes(const LLSD& sd);
+    void translateCategories(std::list<std::string>& categories);
 
 private:
-	std::list<LLEmojiDescriptor> mEmojis;
-	emoji2descr_map_t mEmoji2Descr;
-	code2descr_map_t mShortCode2Descr;
-	cat2descrs_map_t mCategory2Descrs;
+    std::vector<LLEmojiGroup> mGroups;
+    std::list<LLEmojiDescriptor> mEmojis;
+    std::list<std::string> mSkipCategories;
+
+    cat2cat_map_t mTranslations;
+    cat2group_map_t mCategory2Group;
+    emoji2descr_map_t mEmoji2Descr;
+    cat2descrs_map_t mCategory2Descrs;
+    code2descr_map_t mShortCode2Descr;
 };
 
 // ============================================================================
diff --git a/indra/newview/app_settings/emoji_groups.xml b/indra/newview/app_settings/emoji_groups.xml
new file mode 100644
index 0000000000..b433927f91
--- /dev/null
+++ b/indra/newview/app_settings/emoji_groups.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>all</string>
+      <key>Character</key>
+      <string>🔍</string>
+    </map>
+    <map>
+      <key>Character</key>
+      <string>😀</string>
+      <key>Categories</key>
+      <array>
+        <string>smileys and emotion</string>
+        <string>people and body</string>
+      </array>
+    </map>
+    <map>
+      <key>Character</key>
+      <string>🥬</string>
+      <key>Categories</key>
+      <array>
+        <string>animals and nature</string>
+      </array>
+    </map>
+    <map>
+      <key>Character</key>
+      <string>🍔</string>
+      <key>Categories</key>
+      <array>
+        <string>food and drink</string>
+      </array>
+    </map>
+    <map>
+      <key>Character</key>
+      <string>🛩</string>
+      <key>Categories</key>
+      <array>
+        <string>travel and places</string>
+      </array>
+    </map>
+    <map>
+      <key>Character</key>
+      <string>🏈</string>
+      <key>Categories</key>
+      <array>
+        <string>activities</string>
+      </array>
+    </map>
+    <map>
+      <key>Character</key>
+      <string>💡</string>
+      <key>Categories</key>
+      <array>
+        <string>objects</string>
+      </array>
+    </map>
+    <map>
+      <key>Character</key>
+      <string>⚠</string>
+      <key>Categories</key>
+      <array>
+        <string>symbols</string>
+      </array>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>others</string>
+      <key>Character</key>
+      <string>🌂</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>skip</string>
+      <key>Categories</key>
+      <array>
+        <string>components</string>
+      </array>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index f63062f03a..9194a49c45 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -27,6 +27,7 @@
 
 #include "llfloateremojipicker.h"
 
+#include "llbutton.h"
 #include "llcombobox.h"
 #include "llemojidictionary.h"
 #include "llfloaterreg.h"
@@ -39,179 +40,179 @@
 #include "lltextbox.h" 
 #include "llviewerchat.h" 
 
-std::string LLFloaterEmojiPicker::mSelectedCategory;
-std::string LLFloaterEmojiPicker::mSearchPattern;
+size_t LLFloaterEmojiPicker::sSelectedGroupIndex;
+std::string LLFloaterEmojiPicker::sSearchPattern;
 
 class LLEmojiScrollListItem : public LLScrollListItem
 {
 public:
-	LLEmojiScrollListItem(const llwchar emoji, const LLScrollListItem::Params& params)
-		: LLScrollListItem(params)
-		, mEmoji(emoji)
-	{
-	}
-
-	llwchar getEmoji() const { return mEmoji; }
-
-	virtual void draw(const LLRect& rect,
-		const LLColor4& fg_color,
-		const LLColor4& hover_color, // highlight/hover selection of whole item or cell
-		const LLColor4& select_color, // highlight/hover selection of whole item or cell
-		const LLColor4& highlight_color, // highlights contents of cells (ex: text)
-		S32 column_padding) override
-	{
-		LLScrollListItem::draw(rect, fg_color, hover_color, select_color, highlight_color, column_padding);
-
-		LLWString wstr(1, mEmoji);
-		S32 width = getColumn(0)->getWidth();
-		F32 x = rect.mLeft + width / 2;
-		F32 y = rect.getCenterY();
-		LLFontGL::getFontEmoji()->render(
-			wstr,                       // wstr
-			0,                          // begin_offset
-			x,                          // x
-			y,                          // y
-			LLColor4::white,            // color
-			LLFontGL::HCENTER,          // halign
-			LLFontGL::VCENTER,          // valign
-			LLFontGL::NORMAL,           // style
-			LLFontGL::DROP_SHADOW_SOFT, // shadow
-			1,                          // max_chars
-			S32_MAX,                    // max_pixels
-			nullptr,                    // right_x
-			false,                      // use_ellipses
-			true);                      // use_color
-	}
+    LLEmojiScrollListItem(const llwchar emoji, const LLScrollListItem::Params& params)
+        : LLScrollListItem(params)
+        , mEmoji(emoji)
+    {
+    }
+
+    llwchar getEmoji() const { return mEmoji; }
+
+    virtual void draw(const LLRect& rect,
+        const LLColor4& fg_color,
+        const LLColor4& hover_color, // highlight/hover selection of whole item or cell
+        const LLColor4& select_color, // highlight/hover selection of whole item or cell
+        const LLColor4& highlight_color, // highlights contents of cells (ex: text)
+        S32 column_padding) override
+    {
+        LLScrollListItem::draw(rect, fg_color, hover_color, select_color, highlight_color, column_padding);
+
+        LLWString wstr(1, mEmoji);
+        S32 width = getColumn(0)->getWidth();
+        F32 x = rect.mLeft + width / 2;
+        F32 y = rect.getCenterY();
+        LLFontGL::getFontEmoji()->render(
+            wstr,                       // wstr
+            0,                          // begin_offset
+            x,                          // x
+            y,                          // y
+            LLColor4::white,            // color
+            LLFontGL::HCENTER,          // halign
+            LLFontGL::VCENTER,          // valign
+            LLFontGL::NORMAL,           // style
+            LLFontGL::DROP_SHADOW_SOFT, // shadow
+            1,                          // max_chars
+            S32_MAX,                    // max_pixels
+            nullptr,                    // right_x
+            false,                      // use_ellipses
+            true);                      // use_color
+    }
 
 private:
-	llwchar mEmoji;
+    llwchar mEmoji;
 };
 
 class LLEmojiGridRow : public LLScrollingPanel
 {
 public:
-	LLEmojiGridRow(const LLPanel::Params& panel_params,
-		const LLScrollingPanelList::Params& list_params)
-		: LLScrollingPanel(panel_params)
-		, mList(new LLScrollingPanelList(list_params))
-	{
-		addChild(mList);
-	}
+    LLEmojiGridRow(const LLPanel::Params& panel_params,
+        const LLScrollingPanelList::Params& list_params)
+        : LLScrollingPanel(panel_params)
+        , mList(new LLScrollingPanelList(list_params))
+    {
+        addChild(mList);
+    }
 
-	virtual void updatePanel(BOOL allow_modify) override {}
+    virtual void updatePanel(BOOL allow_modify) override {}
 
 public:
-	LLScrollingPanelList* mList;
+    LLScrollingPanelList* mList;
 };
 
 class LLEmojiGridDivider : public LLScrollingPanel
 {
 public:
-	LLEmojiGridDivider(const LLPanel::Params& panel_params, std::string text)
-		: LLScrollingPanel(panel_params)
-		, mText(utf8string_to_wstring(text))
-	{
-	}
-
-	virtual void draw() override
-	{
-		LLScrollingPanel::draw();
-
-		F32 x = 4; // padding-left
-		F32 y = getRect().getHeight() / 2;
-		LLFontGL::getFontSansSerifBold()->render(
-			mText,                      // wstr
-			0,                          // begin_offset
-			x,                          // x
-			y,                          // y
-			LLColor4::white,            // color
-			LLFontGL::LEFT,             // halign
-			LLFontGL::VCENTER,          // valign
-			LLFontGL::NORMAL,           // style
-			LLFontGL::DROP_SHADOW_SOFT, // shadow
-			mText.size(),               // max_chars
-			S32_MAX,                    // max_pixels
-			nullptr,                    // right_x
-			false,                      // use_ellipses
-			true);                      // use_color
-	}
-
-	virtual void updatePanel(BOOL allow_modify) override {}
+    LLEmojiGridDivider(const LLPanel::Params& panel_params, std::string text)
+        : LLScrollingPanel(panel_params)
+        , mText(utf8string_to_wstring(text))
+    {
+    }
+
+    virtual void draw() override
+    {
+        LLScrollingPanel::draw();
+
+        F32 x = 4; // padding-left
+        F32 y = getRect().getHeight() / 2;
+        LLFontGL::getFontSansSerifBold()->render(
+            mText,                      // wstr
+            0,                          // begin_offset
+            x,                          // x
+            y,                          // y
+            LLColor4::white,            // color
+            LLFontGL::LEFT,             // halign
+            LLFontGL::VCENTER,          // valign
+            LLFontGL::NORMAL,           // style
+            LLFontGL::DROP_SHADOW_SOFT, // shadow
+            mText.size(),               // max_chars
+            S32_MAX,                    // max_pixels
+            nullptr,                    // right_x
+            false,                      // use_ellipses
+            true);                      // use_color
+    }
+
+    virtual void updatePanel(BOOL allow_modify) override {}
 
 private:
-	const LLWString mText;
+    const LLWString mText;
 };
 
 class LLEmojiGridIcon : public LLScrollingPanel
 {
 public:
-	LLEmojiGridIcon(const LLPanel::Params& panel_params, const LLEmojiDescriptor* descr, std::string category)
-		: LLScrollingPanel(panel_params)
-		, mEmoji(descr->Character)
-		, mText(LLWString(1, mEmoji))
-		, mDescr(descr->Name)
-		, mCategory(category)
-	{
-	}
-
-	virtual void draw() override
-	{
-		LLScrollingPanel::draw();
-
-		F32 x = getRect().getWidth() / 2;
-		F32 y = getRect().getHeight() / 2;
-		LLFontGL::getFontEmoji()->render(
-			mText,                      // wstr
-			0,                          // begin_offset
-			x,                          // x
-			y,                          // y
-			LLColor4::white,            // color
-			LLFontGL::HCENTER,          // halign
-			LLFontGL::VCENTER,          // valign
-			LLFontGL::NORMAL,           // style
-			LLFontGL::DROP_SHADOW_SOFT, // shadow
-			1,                          // max_chars
-			S32_MAX,                    // max_pixels
-			nullptr,                    // right_x
-			false,                      // use_ellipses
-			true);                      // use_color
-	}
-
-	virtual void updatePanel(BOOL allow_modify) override {}
-
-	llwchar getEmoji() const { return mEmoji; }
-	LLWString getText() const { return mText; }
-	std::string getDescr() const { return mDescr; }
-	std::string getCategory() const { return mCategory; }
+    LLEmojiGridIcon(const LLPanel::Params& panel_params, const LLEmojiDescriptor* descr, std::string category)
+        : LLScrollingPanel(panel_params)
+        , mEmoji(descr->Character)
+        , mText(LLWString(1, mEmoji))
+        , mDescr(descr->getShortCodes())
+        , mCategory(category)
+    {
+    }
+
+    virtual void draw() override
+    {
+        LLScrollingPanel::draw();
+
+        F32 x = getRect().getWidth() / 2;
+        F32 y = getRect().getHeight() / 2;
+        LLFontGL::getFontEmoji()->render(
+            mText,                      // wstr
+            0,                          // begin_offset
+            x,                          // x
+            y,                          // y
+            LLColor4::white,            // color
+            LLFontGL::HCENTER,          // halign
+            LLFontGL::VCENTER,          // valign
+            LLFontGL::NORMAL,           // style
+            LLFontGL::DROP_SHADOW_SOFT, // shadow
+            1,                          // max_chars
+            S32_MAX,                    // max_pixels
+            nullptr,                    // right_x
+            false,                      // use_ellipses
+            true);                      // use_color
+    }
+
+    virtual void updatePanel(BOOL allow_modify) override {}
+
+    llwchar getEmoji() const { return mEmoji; }
+    LLWString getText() const { return mText; }
+    std::string getDescr() const { return mDescr; }
+    std::string getCategory() const { return mCategory; }
 
 private:
-	const llwchar mEmoji;
-	const LLWString mText;
-	const std::string mDescr;
-	const std::string mCategory;
+    const llwchar mEmoji;
+    const LLWString mText;
+    const std::string mDescr;
+    const std::string mCategory;
 };
 
 LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
 {
-	LLFloaterEmojiPicker* floater = LLFloaterReg::getTypedInstance<LLFloaterEmojiPicker>("emoji_picker");
-	if (!floater)
-		LL_ERRS() << "Cannot instantiate emoji picker" << LL_ENDL;
-	return floater;
+    LLFloaterEmojiPicker* floater = LLFloaterReg::getTypedInstance<LLFloaterEmojiPicker>("emoji_picker");
+    if (!floater)
+        LL_ERRS() << "Cannot instantiate emoji picker" << LL_ENDL;
+    return floater;
 }
 
 LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_callback, close_callback_t close_callback)
 {
-	LLFloaterEmojiPicker* floater = getInstance();
-	floater->show(pick_callback, close_callback);
-	return floater;
+    LLFloaterEmojiPicker* floater = getInstance();
+    floater->show(pick_callback, close_callback);
+    return floater;
 }
 
 void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t close_callback)
 {
-	mEmojiPickCallback = pick_callback;
-	mFloaterCloseCallback = close_callback;
-	openFloater(mKey);
-	setFocus(TRUE);
+    mEmojiPickCallback = pick_callback;
+    mFloaterCloseCallback = close_callback;
+    openFloater(mKey);
+    setFocus(TRUE);
 }
 
 LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
@@ -221,313 +222,415 @@ LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
 
 BOOL LLFloaterEmojiPicker::postBuild()
 {
-	// Should be initialized first
-	mPreviewEmoji = getChild<LLButton>("PreviewEmoji");
-	mPreviewEmoji->setClickedCallback([this](LLUICtrl*, const LLSD&) { onPreviewEmojiClick(); });
-
-	mDescription = getChild<LLTextBox>("Description");
-	mDescription->setVisible(FALSE);
-
-	mCategory = getChild<LLComboBox>("Category");
-	mCategory->setCommitCallback([this](LLUICtrl*, const LLSD&) { onCategoryCommit(); });
-	const LLEmojiDictionary::cat2descrs_map_t& cat2Descrs = LLEmojiDictionary::instance().getCategory2Descrs();
-	mCategory->clearRows();
-	for (const LLEmojiDictionary::cat2descrs_item_t& item : cat2Descrs)
-	{
-		std::string value = item.first;
-		std::string name = value;
-		LLStringUtil::capitalize(name);
-		mCategory->add(name, value);
-	}
-	mCategory->setSelectedByValue(mSelectedCategory, true);
-
-	mSearch = getChild<LLLineEditor>("Search");
-	mSearch->setKeystrokeCallback([this](LLLineEditor*, void*) { onSearchKeystroke(); }, NULL);
-	mSearch->setFont(LLViewerChat::getChatFont());
-	mSearch->setText(mSearchPattern);
-
-	mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
-	mEmojiScroll->setMouseEnterCallback([this](LLUICtrl*, const LLSD&) { onGridMouseEnter(); });
-	mEmojiScroll->setMouseLeaveCallback([this](LLUICtrl*, const LLSD&) { onGridMouseLeave(); });
-
-	mEmojiGrid = getChild<LLScrollingPanelList>("EmojiGrid");
-
-	fillEmojiGrid();
-
-	return TRUE;
+    // Should be initialized first
+    mPreviewEmoji = getChild<LLButton>("PreviewEmoji");
+    mPreviewEmoji->setClickedCallback([this](LLUICtrl*, const LLSD&) { onPreviewEmojiClick(); });
+
+    mDescription = getChild<LLTextBox>("Description");
+    mDescription->setVisible(FALSE);
+
+    mGroups = getChild<LLPanel>("Groups");
+    mBadge = getChild<LLPanel>("Badge");
+
+    mSearch = getChild<LLLineEditor>("Search");
+    mSearch->setKeystrokeCallback([this](LLLineEditor*, void*) { onSearchKeystroke(); }, NULL);
+    mSearch->setFont(LLViewerChat::getChatFont());
+    mSearch->setText(sSearchPattern);
+
+    mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
+    mEmojiScroll->setMouseEnterCallback([this](LLUICtrl*, const LLSD&) { onGridMouseEnter(); });
+    mEmojiScroll->setMouseLeaveCallback([this](LLUICtrl*, const LLSD&) { onGridMouseLeave(); });
+
+    mEmojiGrid = getChild<LLScrollingPanelList>("EmojiGrid");
+
+    fillGroups();
+    fillEmojis();
+
+    return TRUE;
 }
 
 void LLFloaterEmojiPicker::dirtyRect()
 {
-	super::dirtyRect();
+    super::dirtyRect();
 
-	if (mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
-	{
-		fillEmojiGrid();
-	}
+    if (mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
+    {
+        moveGroups();
+        fillEmojis(true);
+    }
 }
 
 LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
 {
-	gFocusMgr.releaseFocusIfNeeded( this );
+    gFocusMgr.releaseFocusIfNeeded( this );
+}
+
+void LLFloaterEmojiPicker::fillGroups()
+{
+    LLButton::Params params;
+    params.font = LLFontGL::getFontEmoji();
+    //params.use_font_color = true;
+
+    LLRect rect;
+    rect.mTop = mGroups->getRect().getHeight();
+    rect.mBottom = mBadge->getRect().getHeight();
+
+    const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
+    for (const LLEmojiGroup& group : groups)
+    {
+        LLButton* button = LLUICtrlFactory::create<LLButton>(params);
+        button->setClickedCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonClick(ctrl); });
+        button->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseEnter(ctrl); });
+        button->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseLeave(ctrl); });
+
+        button->setRect(rect);
+
+        LLUIString text;
+        text.insert(0, LLWString(1, group.Character));
+        button->setLabel(text);
+
+        if (mGroupButtons.size() == sSelectedGroupIndex)
+        {
+            button->setToggleState(TRUE);
+        }
+
+        mGroupButtons.push_back(button);
+        mGroups->addChild(button);
+    }
+
+    moveGroups();
+}
+
+void LLFloaterEmojiPicker::moveGroups()
+{
+    const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
+    if (groups.empty())
+        return;
+
+    int badgeWidth = mGroups->getRect().getWidth() / groups.size();
+    if (badgeWidth == mRecentBadgeWidth)
+        return;
+
+    mRecentBadgeWidth = badgeWidth;
+
+    for (int i = 0; i < mGroupButtons.size(); ++i)
+    {
+        LLRect rect = mGroupButtons[i]->getRect();
+        rect.mLeft = badgeWidth * i;
+        rect.mRight = rect.mLeft + badgeWidth;
+        mGroupButtons[i]->setRect(rect);
+    }
+
+    LLRect rect = mBadge->getRect();
+    rect.mLeft = badgeWidth * sSelectedGroupIndex;
+    rect.mRight = rect.mLeft + badgeWidth;
+    mBadge->setRect(rect);
 }
 
-void LLFloaterEmojiPicker::fillEmojiGrid()
+void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
 {
-	mRecentGridWidth = mEmojiScroll->getRect().getWidth();
-
-	S32 scrollbarSize = mEmojiScroll->getSize();
-	if (scrollbarSize < 0)
-	{
-		static LLUICachedControl<S32> scrollbar_size_control("UIScrollbarSize", 0);
-		scrollbarSize = scrollbar_size_control;
-	}
-
-	const S32 clientWidth = mRecentGridWidth - scrollbarSize - mEmojiScroll->getBorderWidth() * 2;
-	const S32 gridPadding = mEmojiGrid->getPadding();
-	const S32 iconSpacing = mEmojiGrid->getSpacing();
-	const S32 rowWidth = clientWidth - gridPadding * 2;
-	const S32 iconSize = 28; // icon width and height
-	const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
-
-	// Optimization: don't rearrange for different widths with the same maxIcons
-	if (maxIcons == mRecentMaxIcons)
-		return;
-	mRecentMaxIcons = maxIcons;
-
-	mHoveredIcon = nullptr;
-	mEmojiGrid->clearPanels();
-	mPreviewEmoji->setLabel(LLUIString());
-
-	if (mEmojiGrid->getRect().getWidth() != clientWidth)
-	{
-		LLRect rect = mEmojiGrid->getRect();
-		rect.mRight = rect.mLeft + clientWidth;
-		mEmojiGrid->setRect(rect);
-	}
-
-	LLPanel::Params row_panel_params;
-	row_panel_params.rect = LLRect(0, iconSize, rowWidth, 0);
-
-	LLScrollingPanelList::Params row_list_params;
-	row_list_params.rect = row_panel_params.rect;
-	row_list_params.is_horizontal = TRUE;
-	row_list_params.padding = 0;
-	row_list_params.spacing = iconSpacing;
-
-	LLPanel::Params icon_params;
-	LLRect icon_rect(0, iconSize, iconSize, 0);
-
-	static const LLColor4 bgcolors[] =
-	{
-		LLColor4(0.8f, 0.6f, 0.8f, 1.0f),
-		LLColor4(0.8f, 0.8f, 0.4f, 1.0f),
-		LLColor4(0.6f, 0.6f, 0.8f, 1.0f),
-		LLColor4(0.4f, 0.7f, 0.4f, 1.0f),
-		LLColor4(0.5f, 0.7f, 0.9f, 1.0f),
-		LLColor4(0.7f, 0.8f, 0.2f, 1.0f)
-	};
-
-	static constexpr U32 bgcolorCount = sizeof(bgcolors) / sizeof(*bgcolors);
-
-	auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis, bool showDivider)
-	{
-		int iconIndex = 0;
-		LLEmojiGridRow* row = nullptr;
-		LLStringUtil::capitalize(category);
-		for (const LLEmojiDescriptor* descr : emojis)
-		{
-			if (mSearchPattern.empty() || matchesPattern(descr))
-			{
-				// Place a category title if needed
-				if (showDivider)
-				{
-					LLEmojiGridDivider* div = new LLEmojiGridDivider(row_panel_params, category);
-					mEmojiGrid->addPanel(div, true);
-					showDivider = false;
-				}
-
-				// Place a new row each (maxIcons) icons
-				if (!(iconIndex % maxIcons))
-				{
-					row = new LLEmojiGridRow(row_panel_params, row_list_params);
-					mEmojiGrid->addPanel(row, true);
-				}
-
-				// Place a new icon to the current row
-				LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, descr, category);
-				icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
-				icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
-				icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK mask) { onEmojiMouseClick(ctrl, mask); });
-				icon->setBackgroundColor(bgcolors[iconIndex % bgcolorCount]);
-				icon->setBackgroundOpaque(1);
-				icon->setRect(icon_rect);
-				row->mList->addPanel(icon, true);
-
-				iconIndex++;
-			}
-		}
-	};
-
-	const LLEmojiDictionary::cat2descrs_map_t& category2Descr = LLEmojiDictionary::instance().getCategory2Descrs();
-	if (mSelectedCategory.empty())
-	{
-		// List all categories with titles
-		for (const LLEmojiDictionary::cat2descrs_item_t& item : category2Descr)
-		{
-			listCategory(item.first, item.second, TRUE);
-		}
-	}
-	else
-	{
-		// List one category without title
-		const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(mSelectedCategory);
-		if (item != category2Descr.end())
-		{
-			listCategory(mSelectedCategory, item->second, FALSE);
-		}
-	}
+    mRecentGridWidth = mEmojiScroll->getRect().getWidth();
+
+    S32 scrollbarSize = mEmojiScroll->getSize();
+    if (scrollbarSize < 0)
+    {
+        static LLUICachedControl<S32> scrollbar_size_control("UIScrollbarSize", 0);
+        scrollbarSize = scrollbar_size_control;
+    }
+
+    const S32 clientWidth = mRecentGridWidth - scrollbarSize - mEmojiScroll->getBorderWidth() * 2;
+    const S32 gridPadding = mEmojiGrid->getPadding();
+    const S32 iconSpacing = mEmojiGrid->getSpacing();
+    const S32 rowWidth = clientWidth - gridPadding * 2;
+    const S32 iconSize = 28; // icon width and height
+    const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
+
+    // Optimization: don't rearrange for different widths with the same maxIcons
+    if (fromResize && (maxIcons == mRecentMaxIcons))
+        return;
+
+    mRecentMaxIcons = maxIcons;
+
+    mHoveredIcon = nullptr;
+    mEmojiGrid->clearPanels();
+    mPreviewEmoji->setLabel(LLUIString());
+
+    if (mEmojiGrid->getRect().getWidth() != clientWidth)
+    {
+        LLRect rect = mEmojiGrid->getRect();
+        rect.mRight = rect.mLeft + clientWidth;
+        mEmojiGrid->setRect(rect);
+    }
+
+    LLPanel::Params row_panel_params;
+    row_panel_params.rect = LLRect(0, iconSize, rowWidth, 0);
+
+    LLScrollingPanelList::Params row_list_params;
+    row_list_params.rect = row_panel_params.rect;
+    row_list_params.is_horizontal = TRUE;
+    row_list_params.padding = 0;
+    row_list_params.spacing = iconSpacing;
+
+    LLPanel::Params icon_params;
+    LLRect icon_rect(0, iconSize, iconSize, 0);
+
+    static const LLColor4 bgcolors[] =
+    {
+        LLColor4(0.8f, 0.6f, 0.8f, 1.0f),
+        LLColor4(0.8f, 0.8f, 0.4f, 1.0f),
+        LLColor4(0.6f, 0.6f, 0.8f, 1.0f),
+        LLColor4(0.4f, 0.7f, 0.4f, 1.0f),
+        LLColor4(0.5f, 0.7f, 0.9f, 1.0f),
+        LLColor4(0.7f, 0.8f, 0.2f, 1.0f)
+    };
+
+    static constexpr U32 bgcolorCount = sizeof(bgcolors) / sizeof(*bgcolors);
+
+    auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis)
+    {
+        int iconIndex = 0;
+        bool showDivider = true;
+        LLEmojiGridRow* row = nullptr;
+        LLStringUtil::capitalize(category);
+        for (const LLEmojiDescriptor* descr : emojis)
+        {
+            if (sSearchPattern.empty() || matchesPattern(descr))
+            {
+                // Place a category title if needed
+                if (showDivider)
+                {
+                    LLEmojiGridDivider* div = new LLEmojiGridDivider(row_panel_params, category);
+                    mEmojiGrid->addPanel(div, true);
+                    showDivider = false;
+                }
+
+                // Place a new row each (maxIcons) icons
+                if (!(iconIndex % maxIcons))
+                {
+                    row = new LLEmojiGridRow(row_panel_params, row_list_params);
+                    mEmojiGrid->addPanel(row, true);
+                }
+
+                // Place a new icon to the current row
+                LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, descr, category);
+                icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
+                icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
+                icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK mask) { onEmojiMouseClick(ctrl, mask); });
+                icon->setBackgroundColor(bgcolors[iconIndex % bgcolorCount]);
+                icon->setBackgroundOpaque(1);
+                icon->setRect(icon_rect);
+                row->mList->addPanel(icon, true);
+
+                iconIndex++;
+            }
+        }
+    };
+
+    const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
+    const LLEmojiDictionary::cat2descrs_map_t& category2Descr = LLEmojiDictionary::instance().getCategory2Descrs();
+    if (!sSelectedGroupIndex)
+    {
+        // List all groups
+        for (const LLEmojiGroup& group : groups)
+        {
+            // List all categories in group
+            for (const std::string& category : group.Categories)
+            {
+                // List all emojis in category
+                const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
+                if (item != category2Descr.end())
+                {
+                    listCategory(category, item->second);
+                }
+            }
+        }
+    }
+    else
+    {
+        // List all categories in the selected group
+        for (const std::string& category : groups[sSelectedGroupIndex].Categories)
+        {
+            // List all emojis in category
+            const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
+            if (item != category2Descr.end())
+            {
+                listCategory(category, item->second);
+            }
+        }
+    }
 }
 
 bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
 {
-	if (descr->Name.find(mSearchPattern) != std::string::npos)
-		return true;
-	for (const std::string& shortCode : descr->ShortCodes)
-		if (shortCode.find(mSearchPattern) != std::string::npos)
-			return true;
-	return false;
+    for (const std::string& shortCode : descr->ShortCodes)
+        if (shortCode.find(sSearchPattern) != std::string::npos)
+            return true;
+    return false;
 }
 
-void LLFloaterEmojiPicker::onCategoryCommit()
+void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
 {
-	mSelectedCategory = mCategory->getSelectedValue().asString();
-	mRecentMaxIcons = 0;
-	fillEmojiGrid();
+    if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
+    {
+        if (button == mGroupButtons[sSelectedGroupIndex] || button->getToggleState())
+            return;
+
+        auto it = std::find(mGroupButtons.begin(), mGroupButtons.end(), button);
+        if (it == mGroupButtons.end())
+            return;
+
+        mGroupButtons[sSelectedGroupIndex]->setToggleState(FALSE);
+        sSelectedGroupIndex = it - mGroupButtons.begin();
+        mGroupButtons[sSelectedGroupIndex]->setToggleState(TRUE);
+
+        LLRect rect = mBadge->getRect();
+        rect.mLeft = button->getRect().mLeft;
+        rect.mRight = button->getRect().mRight;
+        mBadge->setRect(rect);
+
+        mSearch->setFocus(TRUE);
+
+        fillEmojis();
+    }
 }
 
 void LLFloaterEmojiPicker::onSearchKeystroke()
 {
-	mSearchPattern = mSearch->getText();
-	mRecentMaxIcons = 0;
-	fillEmojiGrid();
+    sSearchPattern = mSearch->getText();
+    fillEmojis();
 }
 
 void LLFloaterEmojiPicker::onPreviewEmojiClick()
 {
-	if (mEmojiPickCallback)
-	{
-		if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
-		{
-			mEmojiPickCallback(icon->getEmoji());
-		}
-	}
+    if (mEmojiPickCallback)
+    {
+        if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
+        {
+            mEmojiPickCallback(icon->getEmoji());
+        }
+    }
 }
 
 void LLFloaterEmojiPicker::onGridMouseEnter()
 {
-	mSearch->setVisible(FALSE);
-	mDescription->setText(LLStringExplicit(""), LLStyle::Params());
-	mDescription->setVisible(TRUE);
+    mSearch->setVisible(FALSE);
+    mDescription->setText(LLStringExplicit(""), LLStyle::Params());
+    mDescription->setVisible(TRUE);
 }
 
 void LLFloaterEmojiPicker::onGridMouseLeave()
 {
-	mDescription->setVisible(FALSE);
-	mDescription->setText(LLStringExplicit(""), LLStyle::Params());
-	mSearch->setVisible(TRUE);
-	mSearch->setFocus(TRUE);
+    mDescription->setVisible(FALSE);
+    mDescription->setText(LLStringExplicit(""), LLStyle::Params());
+    mSearch->setVisible(TRUE);
+    mSearch->setFocus(TRUE);
+}
+
+void LLFloaterEmojiPicker::onGroupButtonMouseEnter(LLUICtrl* ctrl)
+{
+    if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
+    {
+        button->setUseFontColor(TRUE);
+    }
+}
+
+void LLFloaterEmojiPicker::onGroupButtonMouseLeave(LLUICtrl* ctrl)
+{
+    if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
+    {
+        button->setUseFontColor(FALSE);
+    }
 }
 
 void LLFloaterEmojiPicker::onEmojiMouseEnter(LLUICtrl* ctrl)
 {
-	if (ctrl)
-	{
-		if (mHoveredIcon && mHoveredIcon != ctrl)
-		{
-			unselectGridIcon(mHoveredIcon);
-		}
+    if (ctrl)
+    {
+        if (mHoveredIcon && mHoveredIcon != ctrl)
+        {
+            unselectGridIcon(mHoveredIcon);
+        }
 
-		selectGridIcon(ctrl);
+        selectGridIcon(ctrl);
 
-		mHoveredIcon = ctrl;
-	}
+        mHoveredIcon = ctrl;
+    }
 }
 
 void LLFloaterEmojiPicker::onEmojiMouseLeave(LLUICtrl* ctrl)
 {
-	if (ctrl)
-	{
-		if (ctrl == mHoveredIcon)
-		{
-			unselectGridIcon(ctrl);
-		}
-	}
+    if (ctrl)
+    {
+        if (ctrl == mHoveredIcon)
+        {
+            unselectGridIcon(ctrl);
+        }
+    }
 }
 
 void LLFloaterEmojiPicker::onEmojiMouseClick(LLUICtrl* ctrl, MASK mask)
 {
-	if (mEmojiPickCallback)
-	{
-		if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
-		{
-			mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, TRUE);
-			mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, FALSE);
-			if (!(mask & 4))
-			{
-				closeFloater();
-			}
-		}
-	}
+    if (mEmojiPickCallback)
+    {
+        if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+        {
+            mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, TRUE);
+            mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, FALSE);
+            if (!(mask & 4))
+            {
+                closeFloater();
+            }
+        }
+    }
 }
 
 void LLFloaterEmojiPicker::selectGridIcon(LLUICtrl* ctrl)
 {
-	if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
-	{
-		icon->setBackgroundVisible(TRUE);
+    if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+    {
+        icon->setBackgroundVisible(TRUE);
 
-		LLUIString text;
-		text.insert(0, icon->getText());
-		mPreviewEmoji->setLabel(text);
+        LLUIString text;
+        text.insert(0, icon->getText());
+        mPreviewEmoji->setLabel(text);
 
-		std::string descr = icon->getDescr() + "\n" + icon->getCategory();
-		mDescription->setText(LLStringExplicit(descr), LLStyle::Params());
-	}
+        std::string descr = icon->getDescr() + "\n" + icon->getCategory();
+        mDescription->setText(LLStringExplicit(descr), LLStyle::Params());
+    }
 }
 
 void LLFloaterEmojiPicker::unselectGridIcon(LLUICtrl* ctrl)
 {
-	if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
-	{
-		icon->setBackgroundVisible(FALSE);
-		mPreviewEmoji->setLabel(LLUIString());
-		mDescription->setText(LLStringExplicit(""), LLStyle::Params());
-	}
+    if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+    {
+        icon->setBackgroundVisible(FALSE);
+        mPreviewEmoji->setLabel(LLUIString());
+        mDescription->setText(LLStringExplicit(""), LLStyle::Params());
+    }
 }
 
 // virtual
 BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
 {
-	if (mask == MASK_NONE)
-	{
-		switch (key)
-		{
-		case KEY_ESCAPE:
-			closeFloater();
-			return TRUE;
-		}
-	}
-
-	return LLFloater::handleKeyHere(key, mask);
+    if (mask == MASK_NONE)
+    {
+        switch (key)
+        {
+        case KEY_ESCAPE:
+            closeFloater();
+            return TRUE;
+        }
+    }
+
+    return LLFloater::handleKeyHere(key, mask);
 }
 
 // virtual
 void LLFloaterEmojiPicker::closeFloater(bool app_quitting)
 {
-	LLFloater::closeFloater(app_quitting);
-	if (mFloaterCloseCallback)
-	{
-		mFloaterCloseCallback();
-	}
+    LLFloater::closeFloater(app_quitting);
+    if (mFloaterCloseCallback)
+    {
+        mFloaterCloseCallback();
+    }
 }
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 300d9a4d4a..7fa6ea46b0 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -33,62 +33,70 @@ struct LLEmojiDescriptor;
 
 class LLFloaterEmojiPicker : public LLFloater
 {
-	using super = LLFloater;
+    using super = LLFloater;
 
 public:
-	// The callback function will be called with an emoji char.
-	typedef boost::function<void (llwchar)> pick_callback_t;
-	typedef boost::function<void ()> close_callback_t;
+    // The callback function will be called with an emoji char.
+    typedef boost::function<void (llwchar)> pick_callback_t;
+    typedef boost::function<void ()> close_callback_t;
 
-	// Call this to select an emoji.
-	static LLFloaterEmojiPicker* getInstance();
-	static LLFloaterEmojiPicker* showInstance(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
+    // Call this to select an emoji.
+    static LLFloaterEmojiPicker* getInstance();
+    static LLFloaterEmojiPicker* showInstance(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
 
-	LLFloaterEmojiPicker(const LLSD& key);
-	virtual ~LLFloaterEmojiPicker();
+    LLFloaterEmojiPicker(const LLSD& key);
+    virtual ~LLFloaterEmojiPicker();
 
-	virtual	BOOL postBuild() override;
-	virtual void dirtyRect() override;
+    virtual	BOOL postBuild() override;
+    virtual void dirtyRect() override;
 
-	void show(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
+    void show(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
 
-	virtual void closeFloater(bool app_quitting = false) override;
+    virtual void closeFloater(bool app_quitting = false) override;
 
 private:
-	void fillEmojiGrid();
-
-	bool matchesPattern(const LLEmojiDescriptor* descr);
-
-	void onCategoryCommit();
-	void onSearchKeystroke();
-	void onPreviewEmojiClick();
-	void onGridMouseEnter();
-	void onGridMouseLeave();
-	void onEmojiMouseEnter(LLUICtrl* ctrl);
-	void onEmojiMouseLeave(LLUICtrl* ctrl);
-	void onEmojiMouseClick(LLUICtrl* ctrl, MASK mask);
-
-	void selectGridIcon(LLUICtrl* ctrl);
-	void unselectGridIcon(LLUICtrl* ctrl);
-
-	virtual BOOL handleKeyHere(KEY key, MASK mask) override;
-
-	class LLComboBox* mCategory { nullptr };
-	class LLLineEditor* mSearch { nullptr };
-	class LLScrollContainer* mEmojiScroll { nullptr };
-	class LLScrollingPanelList* mEmojiGrid { nullptr };
-	class LLButton* mPreviewEmoji { nullptr };
-	class LLTextBox* mDescription { nullptr };
-
-	pick_callback_t mEmojiPickCallback;
-	close_callback_t mFloaterCloseCallback;
-
-	S32 mRecentGridWidth { 0 };
-	S32 mRecentMaxIcons { 0 };
-	LLUICtrl* mHoveredIcon { nullptr };
-
-	static std::string mSelectedCategory;
-	static std::string mSearchPattern;
+    void fillGroups();
+    void moveGroups();
+    void fillEmojis(bool fromResize = false);
+
+    bool matchesPattern(const LLEmojiDescriptor* descr);
+
+    void onGroupButtonClick(LLUICtrl* ctrl);
+    void onSearchKeystroke();
+    void onPreviewEmojiClick();
+    void onGridMouseEnter();
+    void onGridMouseLeave();
+    void onGroupButtonMouseEnter(LLUICtrl* ctrl);
+    void onGroupButtonMouseLeave(LLUICtrl* ctrl);
+    void onEmojiMouseEnter(LLUICtrl* ctrl);
+    void onEmojiMouseLeave(LLUICtrl* ctrl);
+    void onEmojiMouseClick(LLUICtrl* ctrl, MASK mask);
+
+    void selectGridIcon(LLUICtrl* ctrl);
+    void unselectGridIcon(LLUICtrl* ctrl);
+
+    virtual BOOL handleKeyHere(KEY key, MASK mask) override;
+
+    class LLPanel* mGroups { nullptr };
+    class LLPanel* mBadge { nullptr };
+    class LLLineEditor* mSearch { nullptr };
+    class LLScrollContainer* mEmojiScroll { nullptr };
+    class LLScrollingPanelList* mEmojiGrid { nullptr };
+    class LLButton* mPreviewEmoji { nullptr };
+    class LLTextBox* mDescription { nullptr };
+
+    pick_callback_t mEmojiPickCallback;
+    close_callback_t mFloaterCloseCallback;
+
+    std::vector<class LLButton*> mGroupButtons;
+
+    S32 mRecentBadgeWidth { 0 };
+    S32 mRecentGridWidth { 0 };
+    S32 mRecentMaxIcons { 0 };
+    LLUICtrl* mHoveredIcon { nullptr };
+
+    static size_t sSelectedGroupIndex;
+    static std::string sSearchPattern;
 };
 
 #endif
diff --git a/indra/newview/skins/default/xui/da/emoji_categories.xml b/indra/newview/skins/default/xui/da/emoji_categories.xml
new file mode 100644
index 0000000000..456b18e4e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>smileys and følelser</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>mennesker and krop</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>komponenter</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>dyr and natur</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>mad and drikke</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>rejser and steder</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>oplevelser</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>objekter</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>symboler</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/de/emoji_categories.xml b/indra/newview/skins/default/xui/de/emoji_categories.xml
new file mode 100644
index 0000000000..ed63d0bac9
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>Smileys and Emotionen</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>Menschen and Körper</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>Komponenten</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>Tiere and Natur</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>Essen and Trinken</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>Reisen and Orte</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>Aktivitäten</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>Gegenstände</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>Symbole</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/en/emoji_categories.xml b/indra/newview/skins/default/xui/en/emoji_categories.xml
new file mode 100644
index 0000000000..0315d0c43a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>smileys and emotion</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>people and body</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>components</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>animals and nature</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>food and drink</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>travel and places</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>activities</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>objects</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>symbols</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 2e153933c0..2a534b23b9 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -7,8 +7,9 @@
     legacy_header_height="0"
     can_resize="true"
     layout="topleft"
+    min_width="250"
     height="400"
-    width="200">
+    width="250">
   <line_editor
       name="Search"
       label="Type to search"
@@ -19,7 +20,7 @@
       bottom="14"
       left="34"
       height="29"
-      width="162" />
+      width="212" />
   <text
       name="Description"
       layout="bottomleft"
@@ -28,7 +29,7 @@
       bottom="14"
       left="42"
       height="29"
-      width="150" />
+      width="200" />
   <button
       name="PreviewEmoji"
       layout="bottomleft"
@@ -46,7 +47,7 @@
       top="25"
       left="0"
       height="330"
-      width="200">
+      width="250">
     <scrolling_panel_list
         name="EmojiGrid"
         layout="topleft"
@@ -55,16 +56,26 @@
         spacing="0"
         top="0"
         left="0"
-        width="200"/>
+        width="250"/>
   </scroll_container>
-  <combo_box
-      name="Category"
-      label="Choose a category"
+  <panel
+      name="Groups"
       layout="topleft"
       follows="top|left|right"
-      allow_text_entry="true"
       top="0"
-      left="2"
+      left="0"
       height="25"
-      width="196" />
+      width="250">
+    <panel
+      name="Badge"
+      layout="bottomleft"
+      follows="bottom|left"
+      background_visible="true"
+      background_opaque="true"
+      bg_opaque_color="FrogGreen"
+      bottom="0"
+      height="2"
+      width="20"
+      />
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/emoji_categories.xml b/indra/newview/skins/default/xui/es/emoji_categories.xml
new file mode 100644
index 0000000000..b1b73eba5e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>emoticonos y emoción</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>personas y cuerpo</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>componentes</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>animales y la naturaleza</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>comida y bebida</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>viajes y lugares</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>actividades</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>objetos</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>símbolos</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/fr/emoji_categories.xml b/indra/newview/skins/default/xui/fr/emoji_categories.xml
new file mode 100644
index 0000000000..38dc9cb8f8
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>smileys et émotion</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>les gens et le corps</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>composants</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>animaux et la nature</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>nourriture et boissons</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>voyages et lieux</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>activités</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>objets</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>symboles</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/it/emoji_categories.xml b/indra/newview/skins/default/xui/it/emoji_categories.xml
new file mode 100644
index 0000000000..a4782e60a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>smileys and emozione</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>persone e corpo</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>componenti</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>animali and natura</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>cibo e bevande</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>viaggi and luoghi</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>attività</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>oggetti</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>simboli</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/ja/emoji_categories.xml b/indra/newview/skins/default/xui/ja/emoji_categories.xml
new file mode 100644
index 0000000000..7750f4ad2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>スマイリーと感情</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>人体</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>コンポーネント</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>動物自然</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>飲み物・食べ物</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>旅行・場所</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>有効化</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>オブジェクト</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>シンボル</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/pl/emoji_categories.xml b/indra/newview/skins/default/xui/pl/emoji_categories.xml
new file mode 100644
index 0000000000..9aad7af794
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>buźki and emocje</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>ludzie and ciało</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>składniki</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>zwierzęta and przyroda</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>jedzenie i picie</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>podróże and miejsca</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>aktywność</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>objekt</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>symbole</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/pt/emoji_categories.xml b/indra/newview/skins/default/xui/pt/emoji_categories.xml
new file mode 100644
index 0000000000..887444b957
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>sorrisos e emoção</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>pessoas e corpo</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>componentes</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>animais e natureza</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>comida e bebida</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>viagens e lugares</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>atividades</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>objetos</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>símbolos</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/ru/emoji_categories.xml b/indra/newview/skins/default/xui/ru/emoji_categories.xml
new file mode 100644
index 0000000000..b08f0d8117
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>смайлики и люди</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>тело людей</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>компонент</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>животные и природа</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>еда и напитки</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>путешествия и местности</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>варианты досуга</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>предметы</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>символы</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/zh/emoji_categories.xml b/indra/newview/skins/default/xui/zh/emoji_categories.xml
new file mode 100644
index 0000000000..fbe6165eeb
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>笑脸</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>人体</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>组件</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>野生动物</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>食物飲料</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>旅遊地點</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>个人活动</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>物件</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>人的符号</string>
+    </map>
+  </array>
+</llsd>
-- 
cgit v1.2.3


From e7f2fbf2a49aa4bea22889db545f08ff6d0b4921 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 7 Jul 2023 01:08:01 +0200
Subject: SL-19951 Highlight the selected tab by colored icon

---
 indra/newview/llfloateremojipicker.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 9194a49c45..02982bf63a 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -292,6 +292,7 @@ void LLFloaterEmojiPicker::fillGroups()
         if (mGroupButtons.size() == sSelectedGroupIndex)
         {
             button->setToggleState(TRUE);
+            button->setUseFontColor(TRUE);
         }
 
         mGroupButtons.push_back(button);
@@ -479,9 +480,11 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
         if (it == mGroupButtons.end())
             return;
 
+        mGroupButtons[sSelectedGroupIndex]->setUseFontColor(FALSE);
         mGroupButtons[sSelectedGroupIndex]->setToggleState(FALSE);
         sSelectedGroupIndex = it - mGroupButtons.begin();
         mGroupButtons[sSelectedGroupIndex]->setToggleState(TRUE);
+        mGroupButtons[sSelectedGroupIndex]->setUseFontColor(TRUE);
 
         LLRect rect = mBadge->getRect();
         rect.mLeft = button->getRect().mLeft;
@@ -538,7 +541,7 @@ void LLFloaterEmojiPicker::onGroupButtonMouseLeave(LLUICtrl* ctrl)
 {
     if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
     {
-        button->setUseFontColor(FALSE);
+        button->setUseFontColor(button->getToggleState());
     }
 }
 
-- 
cgit v1.2.3


From 16f0329d184f62437c296483143aef72f1aaa284 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 7 Jul 2023 23:35:01 +0200
Subject: SL-19951 Collect used icons in a special group 'Recently used'

---
 indra/llcommon/llstring.h                          |  10 +
 indra/newview/llfloateremojipicker.cpp             | 245 ++++++++++++++++++++-
 indra/newview/llfloateremojipicker.h               |   7 +-
 .../skins/default/xui/en/floater_emoji_picker.xml  |   2 +
 4 files changed, 254 insertions(+), 10 deletions(-)

diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index bdb90335e1..62403969e4 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -357,6 +357,7 @@ public:
 	static void	replaceNonstandardASCII( string_type& string, T replacement );
 	static void	replaceChar( string_type& string, T target, T replacement );
 	static void replaceString( string_type& string, string_type target, string_type replacement );
+	static string_type capitalize(const string_type& str);
 	static void capitalize(string_type& str);
 	
 	static BOOL	containsNonprintable(const string_type& string);
@@ -1596,6 +1597,15 @@ void LLStringUtilBase<T>::replaceTabsWithSpaces( string_type& str, size_type spa
 	str = out_str;
 }
 
+//static
+template<class T>
+std::basic_string<T> LLStringUtilBase<T>::capitalize(const string_type& str)
+{
+	string_type result(str);
+	capitalize(result);
+	return result;
+}
+
 //static
 template<class T>
 void LLStringUtilBase<T>::capitalize(string_type& str)
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 02982bf63a..08929b05f5 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -27,6 +27,7 @@
 
 #include "llfloateremojipicker.h"
 
+#include "llappviewer.h"
 #include "llbutton.h"
 #include "llcombobox.h"
 #include "llemojidictionary.h"
@@ -37,11 +38,27 @@
 #include "llscrollingpanellist.h"
 #include "llscrolllistctrl.h"
 #include "llscrolllistitem.h"
+#include "llsdserialize.h"
 #include "lltextbox.h" 
 #include "llviewerchat.h" 
 
-size_t LLFloaterEmojiPicker::sSelectedGroupIndex;
-std::string LLFloaterEmojiPicker::sSearchPattern;
+namespace {
+// The following variables and constants are used for storing the floater state
+// between different lifecycles of the floater and different sissions of the viewer
+
+// Floater state related variables
+static U32 sSelectedGroupIndex = 0;
+static std::string sSearchPattern;
+static std::list<llwchar> sRecentlyUsed;
+static std::list<std::pair<llwchar, U32>> sFrequentlyUsed;
+
+// State file related values
+static std::string sStateFileName;
+static const std::string sKeySelectedGroupIndex("SelectedGroupIndex");
+static const std::string sKeySearchPattern("SearchPattern");
+static const std::string sKeyRecentlyUsed("RecentlyUsed");
+static const std::string sKeyFrequentlyUsed("FrequentlyUsed");
+}
 
 class LLEmojiScrollListItem : public LLScrollListItem
 {
@@ -146,7 +163,10 @@ private:
 class LLEmojiGridIcon : public LLScrollingPanel
 {
 public:
-    LLEmojiGridIcon(const LLPanel::Params& panel_params, const LLEmojiDescriptor* descr, std::string category)
+    LLEmojiGridIcon(
+        const LLPanel::Params& panel_params
+        , const LLEmojiDescriptor* descr
+        , std::string category)
         : LLScrollingPanel(panel_params)
         , mEmoji(descr->Character)
         , mText(LLWString(1, mEmoji))
@@ -218,6 +238,7 @@ void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t
 LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
 : LLFloater(key)
 {
+    loadState();
 }
 
 BOOL LLFloaterEmojiPicker::postBuild()
@@ -269,7 +290,6 @@ void LLFloaterEmojiPicker::fillGroups()
 {
     LLButton::Params params;
     params.font = LLFontGL::getFontEmoji();
-    //params.use_font_color = true;
 
     LLRect rect;
     rect.mTop = mGroups->getRect().getHeight();
@@ -387,12 +407,17 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
 
     static constexpr U32 bgcolorCount = sizeof(bgcolors) / sizeof(*bgcolors);
 
-    auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis)
+    auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis, int maxRows = 0)
     {
+        int rowCount = 0;
         int iconIndex = 0;
         bool showDivider = true;
+        bool mixedFolder = maxRows;
         LLEmojiGridRow* row = nullptr;
-        LLStringUtil::capitalize(category);
+        if (!mixedFolder)
+        {
+            LLStringUtil::capitalize(category);
+        }
         for (const LLEmojiDescriptor* descr : emojis)
         {
             if (sSearchPattern.empty() || matchesPattern(descr))
@@ -408,12 +433,14 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
                 // Place a new row each (maxIcons) icons
                 if (!(iconIndex % maxIcons))
                 {
+                    if (maxRows && ++rowCount > maxRows)
+                        break;
                     row = new LLEmojiGridRow(row_panel_params, row_list_params);
                     mEmojiGrid->addPanel(row, true);
                 }
 
                 // Place a new icon to the current row
-                LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, descr, category);
+                LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, descr, mixedFolder ? LLStringUtil::capitalize(descr->Category) : category);
                 icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
                 icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
                 icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK mask) { onEmojiMouseClick(ctrl, mask); });
@@ -428,9 +455,32 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
     };
 
     const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
+    const LLEmojiDictionary::emoji2descr_map_t& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
     const LLEmojiDictionary::cat2descrs_map_t& category2Descr = LLEmojiDictionary::instance().getCategory2Descrs();
     if (!sSelectedGroupIndex)
     {
+        std::vector<const LLEmojiDescriptor*> recentlyUsed;
+        for (llwchar emoji : sRecentlyUsed)
+        {
+            auto it = emoji2descr.find(emoji);
+            if (it != emoji2descr.end())
+            {
+                recentlyUsed.push_back(it->second);
+            }
+        }
+        listCategory(getString("title_for_recently_used"), recentlyUsed, 1);
+
+        std::vector<const LLEmojiDescriptor*> frequentlyUsed;
+        for (auto& emoji : sFrequentlyUsed)
+        {
+            auto it = emoji2descr.find(emoji.first);
+            if (it != emoji2descr.end())
+            {
+                frequentlyUsed.push_back(it->second);
+            }
+        }
+        listCategory(getString("title_for_frequently_used"), frequentlyUsed, 1);
+
         // List all groups
         for (const LLEmojiGroup& group : groups)
         {
@@ -577,6 +627,7 @@ void LLFloaterEmojiPicker::onEmojiMouseClick(LLUICtrl* ctrl, MASK mask)
     {
         if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
         {
+            onEmojiUsed(icon->getEmoji());
             mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, TRUE);
             mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, FALSE);
             if (!(mask & 4))
@@ -631,9 +682,189 @@ BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
 // virtual
 void LLFloaterEmojiPicker::closeFloater(bool app_quitting)
 {
+    saveState();
     LLFloater::closeFloater(app_quitting);
     if (mFloaterCloseCallback)
     {
         mFloaterCloseCallback();
     }
 }
+
+void LLFloaterEmojiPicker::onEmojiUsed(llwchar emoji)
+{
+    // Update sRecentlyUsed
+    auto itr = std::find(sRecentlyUsed.begin(), sRecentlyUsed.end(), emoji);
+    if (itr == sRecentlyUsed.end())
+    {
+        sRecentlyUsed.push_front(emoji);
+    }
+    else if (itr != sRecentlyUsed.begin())
+    {
+        sRecentlyUsed.erase(itr);
+        sRecentlyUsed.push_front(emoji);
+    }
+
+    // Increment and reorder sFrequentlyUsed
+    auto itf = sFrequentlyUsed.begin();
+    while (itf != sFrequentlyUsed.end())
+    {
+        if (itf->first == emoji)
+        {
+            itf->second++;
+            while (itf != sFrequentlyUsed.begin())
+            {
+                auto prior = itf;
+                prior--;
+                if (prior->second > itf->second)
+                    break;
+                prior->swap(*itf);
+                itf = prior;
+            }
+            break;
+        }
+        itf++;
+    }
+    // Append new if not found
+    if (itf == sFrequentlyUsed.end())
+        sFrequentlyUsed.push_back(std::make_pair(emoji, 1));
+}
+
+void LLFloaterEmojiPicker::loadState()
+{
+    if (!sStateFileName.empty())
+        return; // Already loaded
+
+    sStateFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "emoji_floater_state.xml");
+
+    llifstream file;
+    file.open(sStateFileName.c_str());
+    if (!file.is_open())
+    {
+        LL_WARNS() << "Emoji floater state file is missing or inaccessible: " << sStateFileName << LL_ENDL;
+        return;
+    }
+
+    LLSD state;
+    LLSDSerialize::fromXML(state, file);
+    if (state.isUndefined())
+    {
+        LL_WARNS() << "Emoji floater state file is missing or ill-formed: " << sStateFileName << LL_ENDL;
+        return;
+    }
+
+    sSelectedGroupIndex = state[sKeySelectedGroupIndex].asInteger();
+
+    sSearchPattern = state[sKeySearchPattern].asString();
+
+    // Load and parse sRecentlyUsed
+    std::string recentlyUsed = state[sKeyRecentlyUsed];
+    std::vector<std::string> rtokens = LLStringUtil::getTokens(recentlyUsed, ",");
+    int maxCountR = 20;
+    for (const std::string& token : rtokens)
+    {
+        llwchar emoji = (llwchar)atoi(token.c_str());
+        if (std::find(sRecentlyUsed.begin(), sRecentlyUsed.end(), emoji) == sRecentlyUsed.end())
+        {
+            sRecentlyUsed.push_back(emoji);
+            if (!--maxCountR)
+                break;
+        }
+    }
+
+    // Load and parse sFrequentlyUsed
+    std::string frequentlyUsed = state[sKeyFrequentlyUsed];
+    std::vector<std::string> ftokens = LLStringUtil::getTokens(frequentlyUsed, ",");
+    int maxCountF = 20;
+    for (const std::string& token : ftokens)
+    {
+        std::vector<std::string> pair = LLStringUtil::getTokens(token, ":");
+        if (pair.size() == 2)
+        {
+            llwchar emoji = (llwchar)atoi(pair[0].c_str());
+            if (emoji)
+            {
+                U32 count = atoi(pair[1].c_str());
+                auto it = std::find_if(sFrequentlyUsed.begin(), sFrequentlyUsed.end(),
+                    [emoji](std::pair<llwchar, U32>& it) { return it.first == emoji; });
+                if (it != sFrequentlyUsed.end())
+                {
+                    it->second += count;
+                }
+                else
+                {
+                    sFrequentlyUsed.push_back(std::make_pair(emoji, count));
+                    if (!--maxCountF)
+                        break;
+                }
+            }
+        }
+    }
+
+    // Normalize by minimum
+    if (!sFrequentlyUsed.empty())
+    {
+        U32 delta = sFrequentlyUsed.back().second;
+        for (auto& it : sFrequentlyUsed)
+        {
+            it.second = std::max((U32)0, it.second - delta);
+        }
+    }
+}
+
+void LLFloaterEmojiPicker::saveState()
+{
+    if (sStateFileName.empty())
+        return; // Not loaded
+
+    if (LLAppViewer::instance()->isSecondInstance())
+        return; // Not allowed
+
+    LLSD state = LLSD::emptyMap();
+
+    if (sSelectedGroupIndex)
+    {
+        state[sKeySelectedGroupIndex] = (int)sSelectedGroupIndex;
+    }
+
+    if (!sSearchPattern.empty())
+    {
+        state[sKeySearchPattern] = sSearchPattern;
+    }
+
+    if (!sRecentlyUsed.empty())
+    {
+        U32 maxCount = 20;
+        std::string recentlyUsed;
+        for (llwchar emoji : sRecentlyUsed)
+        {
+            if (!recentlyUsed.empty())
+                recentlyUsed += ",";
+            char buffer[32];
+            sprintf(buffer, "%u", (U32)emoji);
+            recentlyUsed += buffer;
+            if (!--maxCount)
+                break;
+        }
+        state[sKeyRecentlyUsed] = recentlyUsed;
+    }
+
+    if (!sFrequentlyUsed.empty())
+    {
+        U32 maxCount = 20;
+        std::string frequentlyUsed;
+        for (auto& it : sFrequentlyUsed)
+        {
+            if (!frequentlyUsed.empty())
+                frequentlyUsed += ",";
+            char buffer[32];
+            sprintf(buffer, "%u:%u", (U32)it.first, (U32)it.second);
+            frequentlyUsed += buffer;
+            if (!--maxCount)
+                break;
+        }
+        state[sKeyFrequentlyUsed] = frequentlyUsed;
+    }
+
+    llofstream stream(sStateFileName.c_str());
+    LLSDSerialize::toPrettyXML(state, stream);
+}
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 7fa6ea46b0..d00391c61f 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -77,6 +77,10 @@ private:
 
     virtual BOOL handleKeyHere(KEY key, MASK mask) override;
 
+    void onEmojiUsed(llwchar emoji);
+    void loadState();
+    void saveState();
+
     class LLPanel* mGroups { nullptr };
     class LLPanel* mBadge { nullptr };
     class LLLineEditor* mSearch { nullptr };
@@ -94,9 +98,6 @@ private:
     S32 mRecentGridWidth { 0 };
     S32 mRecentMaxIcons { 0 };
     LLUICtrl* mHoveredIcon { nullptr };
-
-    static size_t sSelectedGroupIndex;
-    static std::string sSearchPattern;
 };
 
 #endif
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 2a534b23b9..4b4bf0c5a3 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -10,6 +10,8 @@
     min_width="250"
     height="400"
     width="250">
+  <floater.string name="title_for_recently_used" value="Recently used"/>
+  <floater.string name="title_for_frequently_used" value="Frequently used"/>
   <line_editor
       name="Search"
       label="Type to search"
-- 
cgit v1.2.3


From 8b718cbc2edc1f18bfa0cc0a76899fcade149813 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 12 Jul 2023 20:45:53 +0200
Subject: SL-19831 Check marks in the menu are less visible

---
 indra/llrender/llfontfreetype.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index e4010579b3..ca9f2ed778 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -461,6 +461,8 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch, EFontGlyphType glyph_type
 
 	// Fallback fonts with a functor have precedence over everything else
 	fallback_font_vector_t::const_iterator it_fallback = mFallbackFonts.cbegin();
+	/* This leads to a bug SL-19831 "Check marks in the menu are less visible."
+	** Also, LLFontRegistry::createFont() says: "Fallback fonts don't render"
 	for (; it_fallback != mFallbackFonts.cend() && it_fallback->second; ++it_fallback)
 	{
 		if (it_fallback->second(wch))
@@ -472,6 +474,7 @@ LLFontGlyphInfo* LLFontFreetype::addGlyph(llwchar wch, EFontGlyphType glyph_type
 			}
 		}
 	}
+	*/
 
 	// Initialize char to glyph map
 	glyph_index = FT_Get_Char_Index(mFTFace, wch);
-- 
cgit v1.2.3


From 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 13 Jul 2023 21:18:22 +0200
Subject: SL-20001 EmojiPicker - make the preview to be a panel instead of a
 button

---
 indra/llrender/llfontgl.cpp                        |  12 +-
 indra/llrender/llfontgl.h                          |   1 +
 indra/llui/lllineeditor.cpp                        |   4 +-
 indra/llui/lllineeditor.h                          |   2 +
 indra/newview/llfloateremojipicker.cpp             | 286 ++++++++++++---------
 indra/newview/llfloateremojipicker.h               |  11 +-
 indra/newview/llfloaterimnearbychat.cpp            |   5 +-
 .../skins/default/xui/en/floater_emoji_picker.xml  |  32 +--
 8 files changed, 191 insertions(+), 162 deletions(-)

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 001b7fd7b8..c95890981f 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -193,7 +193,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 
 	if (-1 == max_chars)
 	{
-		length = (S32)wstr.length() - begin_offset;
+		max_chars = length = (S32)wstr.length() - begin_offset;
 	}
 	else
 	{
@@ -254,7 +254,6 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 
 	const S32 LAST_CHARACTER = LLFontFreetype::LAST_CHAR_FULL;
 
-
 	BOOL draw_ellipses = FALSE;
 	if (use_ellipses)
 	{
@@ -1024,13 +1023,20 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
 	return gl_vfont_align;
 }
 
- //static
+//static
 LLFontGL* LLFontGL::getFontEmoji()
 {
 	static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0));
 	return fontp;;
 }
 
+//static
+LLFontGL* LLFontGL::getFontEmojiHuge()
+{
+	static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Huge", 0));
+	return fontp;;
+}
+
 //static
 LLFontGL* LLFontGL::getFontMonospace()
 {
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 915c2439a3..356cfaf404 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -195,6 +195,7 @@ public:
 	static void setFontDisplay(BOOL flag) { sDisplayFont = flag; }
 		
 	static LLFontGL* getFontEmoji();
+	static LLFontGL* getFontEmojiHuge();
 	static LLFontGL* getFontMonospace();
 	static LLFontGL* getFontSansSerifSmall();
 	static LLFontGL* getFontSansSerif();
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 940cf398c0..7d13d731e2 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -89,6 +89,7 @@ LLLineEditor::Params::Params()
 	background_image_disabled("background_image_disabled"),
 	background_image_focused("background_image_focused"),
 	bg_image_always_focused("bg_image_always_focused", false),
+	show_label_focused("show_label_focused", false),
 	select_on_focus("select_on_focus", false),
 	revert_on_esc("revert_on_esc", true),
 	spellcheck("spellcheck", false),
@@ -152,6 +153,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 	mBgImageDisabled( p.background_image_disabled ),
 	mBgImageFocused( p.background_image_focused ),
 	mShowImageFocused( p.bg_image_always_focused ),
+	mShowLabelFocused( p.show_label_focused ),
 	mUseBgColor(p.use_bg_color),
 	mHaveHistory(FALSE),
 	mReplaceNewlinesWithSpaces( TRUE ),
@@ -2068,7 +2070,7 @@ void LLLineEditor::draw()
 		//draw label if no text is provided
 		//but we should draw it in a different color
 		//to give indication that it is not text you typed in
-		if (0 == mText.length() && mReadOnly)
+		if (0 == mText.length() && (mReadOnly || mShowLabelFocused))
 		{
 			mGLFont->render(mLabel.getWString(), 0,
 							mTextLeftEdge, (F32)text_bottom,
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index ae4e05c065..624371ebda 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -91,6 +91,7 @@ public:
 										commit_on_focus_lost,
 										ignore_tab,
 										bg_image_always_focused,
+										show_label_focused,
 										is_password,
 										use_bg_color;
 
@@ -395,6 +396,7 @@ protected:
 	BOOL		mReadOnly;
 
 	BOOL 		mShowImageFocused;
+	BOOL 		mShowLabelFocused;
 
 	bool		mUseBgColor;
 
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 08929b05f5..808aca4bf4 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -48,63 +48,18 @@ namespace {
 
 // Floater state related variables
 static U32 sSelectedGroupIndex = 0;
-static std::string sSearchPattern;
+static std::string sFilterPattern;
 static std::list<llwchar> sRecentlyUsed;
 static std::list<std::pair<llwchar, U32>> sFrequentlyUsed;
 
 // State file related values
 static std::string sStateFileName;
 static const std::string sKeySelectedGroupIndex("SelectedGroupIndex");
-static const std::string sKeySearchPattern("SearchPattern");
+static const std::string sKeyFilterPattern("FilterPattern");
 static const std::string sKeyRecentlyUsed("RecentlyUsed");
 static const std::string sKeyFrequentlyUsed("FrequentlyUsed");
 }
 
-class LLEmojiScrollListItem : public LLScrollListItem
-{
-public:
-    LLEmojiScrollListItem(const llwchar emoji, const LLScrollListItem::Params& params)
-        : LLScrollListItem(params)
-        , mEmoji(emoji)
-    {
-    }
-
-    llwchar getEmoji() const { return mEmoji; }
-
-    virtual void draw(const LLRect& rect,
-        const LLColor4& fg_color,
-        const LLColor4& hover_color, // highlight/hover selection of whole item or cell
-        const LLColor4& select_color, // highlight/hover selection of whole item or cell
-        const LLColor4& highlight_color, // highlights contents of cells (ex: text)
-        S32 column_padding) override
-    {
-        LLScrollListItem::draw(rect, fg_color, hover_color, select_color, highlight_color, column_padding);
-
-        LLWString wstr(1, mEmoji);
-        S32 width = getColumn(0)->getWidth();
-        F32 x = rect.mLeft + width / 2;
-        F32 y = rect.getCenterY();
-        LLFontGL::getFontEmoji()->render(
-            wstr,                       // wstr
-            0,                          // begin_offset
-            x,                          // x
-            y,                          // y
-            LLColor4::white,            // color
-            LLFontGL::HCENTER,          // halign
-            LLFontGL::VCENTER,          // valign
-            LLFontGL::NORMAL,           // style
-            LLFontGL::DROP_SHADOW_SOFT, // shadow
-            1,                          // max_chars
-            S32_MAX,                    // max_pixels
-            nullptr,                    // right_x
-            false,                      // use_ellipses
-            true);                      // use_color
-    }
-
-private:
-    llwchar mEmoji;
-};
-
 class LLEmojiGridRow : public LLScrollingPanel
 {
 public:
@@ -137,7 +92,7 @@ public:
 
         F32 x = 4; // padding-left
         F32 y = getRect().getHeight() / 2;
-        LLFontGL::getFontSansSerifBold()->render(
+        LLFontGL::getFontSansSerif()->render(
             mText,                      // wstr
             0,                          // begin_offset
             x,                          // x
@@ -168,10 +123,8 @@ public:
         , const LLEmojiDescriptor* descr
         , std::string category)
         : LLScrollingPanel(panel_params)
-        , mEmoji(descr->Character)
-        , mText(LLWString(1, mEmoji))
-        , mDescr(descr->getShortCodes())
-        , mCategory(category)
+        , mDescr(descr)
+        , mText(LLWString(1, descr->Character))
     {
     }
 
@@ -200,16 +153,106 @@ public:
 
     virtual void updatePanel(BOOL allow_modify) override {}
 
-    llwchar getEmoji() const { return mEmoji; }
+    const LLEmojiDescriptor* getDescr() const { return mDescr; }
+    llwchar getEmoji() const { return mDescr->Character; }
     LLWString getText() const { return mText; }
-    std::string getDescr() const { return mDescr; }
-    std::string getCategory() const { return mCategory; }
 
 private:
-    const llwchar mEmoji;
+    const LLEmojiDescriptor* mDescr;
     const LLWString mText;
-    const std::string mDescr;
-    const std::string mCategory;
+};
+
+class LLEmojiPreviewPanel : public LLPanel
+{
+public:
+    LLEmojiPreviewPanel()
+        : LLPanel()
+    {
+    }
+
+    void setEmoji(const LLEmojiDescriptor* descr)
+    {
+        mDescr = descr;
+
+        if (!mDescr)
+            return;
+
+        mEmojiText = LLWString(1, descr->Character);
+    }
+
+    virtual void draw() override
+    {
+        LLPanel::draw();
+
+        if (!mDescr)
+            return;
+
+        S32 clientHeight = getRect().getHeight();
+        S32 clientWidth = getRect().getWidth();
+        S32 iconWidth = clientHeight;
+
+        F32 centerX = 0.5f * iconWidth;
+        F32 centerY = 0.5f * clientHeight;
+        drawIcon(centerX, centerY, iconWidth);
+
+        static LLColor4 defaultColor(0.75f, 0.75f, 0.75f, 1.0f);
+        LLColor4 textColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", defaultColor);
+        S32 max_pixels = clientWidth - iconWidth;
+        size_t count = mDescr->ShortCodes.size();
+        if (count == 1)
+        {
+            drawName(mDescr->ShortCodes.front(), iconWidth, centerY, max_pixels, textColor);
+        }
+        else if (count > 1)
+        {
+            F32 quarterY = 0.5f * centerY;
+            drawName(mDescr->ShortCodes.front(), iconWidth, centerY + quarterY, max_pixels, textColor);
+            drawName(*++mDescr->ShortCodes.begin(), iconWidth, quarterY, max_pixels, textColor);
+        }
+    }
+
+protected:
+    void drawIcon(F32 x, F32 y, S32 max_pixels)
+    {
+        LLFontGL::getFontEmojiHuge()->render(
+            mEmojiText,                 // wstr
+            0,                          // begin_offset
+            x,                          // x
+            y,                          // y
+            LLColor4::white,            // color
+            LLFontGL::HCENTER,          // halign
+            LLFontGL::VCENTER,          // valign
+            LLFontGL::NORMAL,           // style
+            LLFontGL::DROP_SHADOW_SOFT, // shadow
+            1,                          // max_chars
+            max_pixels,                 // max_pixels
+            nullptr,                    // right_x
+            false,                      // use_ellipses
+            true);                      // use_color
+    }
+
+    void drawName(std::string name, F32 x, F32 y, S32 max_pixels, LLColor4& color)
+    {
+        LLFontGL::getFontEmoji()->renderUTF8(
+            name,                       // wstr
+            0,                          // begin_offset
+            x,                          // x
+            y,                          // y
+            color,                      // color
+            LLFontGL::LEFT,             // halign
+            LLFontGL::VCENTER,          // valign
+            LLFontGL::NORMAL,           // style
+            LLFontGL::DROP_SHADOW_SOFT, // shadow
+            -1,                         // max_chars
+            max_pixels,                 // max_pixels
+            nullptr,                    // right_x
+            true,                       // use_ellipses
+            false);                     // use_color
+    }
+
+private:
+    const LLEmojiDescriptor* mDescr { nullptr };
+    LLWString mEmojiText;
 };
 
 LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
@@ -244,19 +287,17 @@ LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
 BOOL LLFloaterEmojiPicker::postBuild()
 {
     // Should be initialized first
-    mPreviewEmoji = getChild<LLButton>("PreviewEmoji");
-    mPreviewEmoji->setClickedCallback([this](LLUICtrl*, const LLSD&) { onPreviewEmojiClick(); });
-
-    mDescription = getChild<LLTextBox>("Description");
-    mDescription->setVisible(FALSE);
+    mPreview = new LLEmojiPreviewPanel();
+    mPreview->setVisible(FALSE);
+    addChild(mPreview);
 
     mGroups = getChild<LLPanel>("Groups");
     mBadge = getChild<LLPanel>("Badge");
 
-    mSearch = getChild<LLLineEditor>("Search");
-    mSearch->setKeystrokeCallback([this](LLLineEditor*, void*) { onSearchKeystroke(); }, NULL);
-    mSearch->setFont(LLViewerChat::getChatFont());
-    mSearch->setText(sSearchPattern);
+    mFilter = getChild<LLLineEditor>("Filter");
+    mFilter->setKeystrokeCallback([this](LLLineEditor*, void*) { onSearchKeystroke(); }, NULL);
+    mFilter->setFont(LLViewerChat::getChatFont());
+    mFilter->setText(sFilterPattern);
 
     mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
     mEmojiScroll->setMouseEnterCallback([this](LLUICtrl*, const LLSD&) { onGridMouseEnter(); });
@@ -274,6 +315,16 @@ void LLFloaterEmojiPicker::dirtyRect()
 {
     super::dirtyRect();
 
+    if (!mFilter)
+        return;
+
+    const S32 PADDING = 4;
+    LLRect rect(PADDING, mFilter->getRect().mTop, getRect().getWidth() - PADDING * 2, PADDING);
+    if (mPreview->getRect() != rect)
+    {
+        mPreview->setRect(rect);
+    }
+
     if (mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
     {
         moveGroups();
@@ -374,7 +425,7 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
 
     mHoveredIcon = nullptr;
     mEmojiGrid->clearPanels();
-    mPreviewEmoji->setLabel(LLUIString());
+    mPreview->setEmoji(nullptr);
 
     if (mEmojiGrid->getRect().getWidth() != clientWidth)
     {
@@ -395,18 +446,17 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
     LLPanel::Params icon_params;
     LLRect icon_rect(0, iconSize, iconSize, 0);
 
-    static const LLColor4 bgcolors[] =
+    static LLColor4 defaultColor(0.75f, 0.75f, 0.75f, 1.0f);
+    LLColor4 bgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", defaultColor);
+
+    auto matchesPattern = [](const LLEmojiDescriptor* descr) -> bool
     {
-        LLColor4(0.8f, 0.6f, 0.8f, 1.0f),
-        LLColor4(0.8f, 0.8f, 0.4f, 1.0f),
-        LLColor4(0.6f, 0.6f, 0.8f, 1.0f),
-        LLColor4(0.4f, 0.7f, 0.4f, 1.0f),
-        LLColor4(0.5f, 0.7f, 0.9f, 1.0f),
-        LLColor4(0.7f, 0.8f, 0.2f, 1.0f)
+        for (const std::string& shortCode : descr->ShortCodes)
+            if (shortCode.find(sFilterPattern) != std::string::npos)
+                return true;
+        return false;
     };
 
-    static constexpr U32 bgcolorCount = sizeof(bgcolors) / sizeof(*bgcolors);
-
     auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis, int maxRows = 0)
     {
         int rowCount = 0;
@@ -418,9 +468,10 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
         {
             LLStringUtil::capitalize(category);
         }
+
         for (const LLEmojiDescriptor* descr : emojis)
         {
-            if (sSearchPattern.empty() || matchesPattern(descr))
+            if (sFilterPattern.empty() || matchesPattern(descr))
             {
                 // Place a category title if needed
                 if (showDivider)
@@ -443,8 +494,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
                 LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, descr, mixedFolder ? LLStringUtil::capitalize(descr->Category) : category);
                 icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
                 icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
-                icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK mask) { onEmojiMouseClick(ctrl, mask); });
-                icon->setBackgroundColor(bgcolors[iconIndex % bgcolorCount]);
+                icon->setMouseDownCallback([this](LLUICtrl* ctrl, S32, S32, MASK) { onEmojiMouseDown(ctrl); });
+                icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK) { onEmojiMouseUp(ctrl); });
+                icon->setBackgroundColor(bgColor);
                 icon->setBackgroundOpaque(1);
                 icon->setRect(icon_rect);
                 row->mList->addPanel(icon, true);
@@ -511,14 +563,6 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
     }
 }
 
-bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
-{
-    for (const std::string& shortCode : descr->ShortCodes)
-        if (shortCode.find(sSearchPattern) != std::string::npos)
-            return true;
-    return false;
-}
-
 void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
 {
     if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
@@ -541,7 +585,7 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
         rect.mRight = button->getRect().mRight;
         mBadge->setRect(rect);
 
-        mSearch->setFocus(TRUE);
+        mFilter->setFocus(TRUE);
 
         fillEmojis();
     }
@@ -549,34 +593,22 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
 
 void LLFloaterEmojiPicker::onSearchKeystroke()
 {
-    sSearchPattern = mSearch->getText();
+    sFilterPattern = mFilter->getText();
     fillEmojis();
 }
 
-void LLFloaterEmojiPicker::onPreviewEmojiClick()
-{
-    if (mEmojiPickCallback)
-    {
-        if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
-        {
-            mEmojiPickCallback(icon->getEmoji());
-        }
-    }
-}
-
 void LLFloaterEmojiPicker::onGridMouseEnter()
 {
-    mSearch->setVisible(FALSE);
-    mDescription->setText(LLStringExplicit(""), LLStyle::Params());
-    mDescription->setVisible(TRUE);
+    mFilter->setVisible(FALSE);
+    mPreview->setEmoji(nullptr);
+    mPreview->setVisible(TRUE);
 }
 
 void LLFloaterEmojiPicker::onGridMouseLeave()
 {
-    mDescription->setVisible(FALSE);
-    mDescription->setText(LLStringExplicit(""), LLStyle::Params());
-    mSearch->setVisible(TRUE);
-    mSearch->setFocus(TRUE);
+    mPreview->setVisible(FALSE);
+    mFilter->setVisible(TRUE);
+    mFilter->setFocus(TRUE);
 }
 
 void LLFloaterEmojiPicker::onGroupButtonMouseEnter(LLUICtrl* ctrl)
@@ -621,18 +653,29 @@ void LLFloaterEmojiPicker::onEmojiMouseLeave(LLUICtrl* ctrl)
     }
 }
 
-void LLFloaterEmojiPicker::onEmojiMouseClick(LLUICtrl* ctrl, MASK mask)
+void LLFloaterEmojiPicker::onEmojiMouseDown(LLUICtrl* ctrl)
+{
+    if (getSoundFlags() & MOUSE_DOWN)
+    {
+        make_ui_sound("UISndClick");
+    }
+}
+
+void LLFloaterEmojiPicker::onEmojiMouseUp(LLUICtrl* ctrl)
 {
+    if (getSoundFlags() & MOUSE_UP)
+    {
+        make_ui_sound("UISndClickRelease");
+    }
+
     if (mEmojiPickCallback)
     {
         if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
         {
             onEmojiUsed(icon->getEmoji());
-            mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, TRUE);
-            mPreviewEmoji->handleAnyMouseClick(0, 0, 0, EMouseClickType::CLICK_LEFT, FALSE);
-            if (!(mask & 4))
+            if (mEmojiPickCallback)
             {
-                closeFloater();
+                mEmojiPickCallback(icon->getEmoji());
             }
         }
     }
@@ -643,13 +686,7 @@ void LLFloaterEmojiPicker::selectGridIcon(LLUICtrl* ctrl)
     if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
     {
         icon->setBackgroundVisible(TRUE);
-
-        LLUIString text;
-        text.insert(0, icon->getText());
-        mPreviewEmoji->setLabel(text);
-
-        std::string descr = icon->getDescr() + "\n" + icon->getCategory();
-        mDescription->setText(LLStringExplicit(descr), LLStyle::Params());
+        mPreview->setEmoji(icon->getDescr());
     }
 }
 
@@ -658,8 +695,7 @@ void LLFloaterEmojiPicker::unselectGridIcon(LLUICtrl* ctrl)
     if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
     {
         icon->setBackgroundVisible(FALSE);
-        mPreviewEmoji->setLabel(LLUIString());
-        mDescription->setText(LLStringExplicit(""), LLStyle::Params());
+        mPreview->setEmoji(nullptr);
     }
 }
 
@@ -754,7 +790,7 @@ void LLFloaterEmojiPicker::loadState()
 
     sSelectedGroupIndex = state[sKeySelectedGroupIndex].asInteger();
 
-    sSearchPattern = state[sKeySearchPattern].asString();
+    sFilterPattern = state[sKeyFilterPattern].asString();
 
     // Load and parse sRecentlyUsed
     std::string recentlyUsed = state[sKeyRecentlyUsed];
@@ -826,9 +862,9 @@ void LLFloaterEmojiPicker::saveState()
         state[sKeySelectedGroupIndex] = (int)sSelectedGroupIndex;
     }
 
-    if (!sSearchPattern.empty())
+    if (!sFilterPattern.empty())
     {
-        state[sKeySearchPattern] = sSearchPattern;
+        state[sKeyFilterPattern] = sFilterPattern;
     }
 
     if (!sRecentlyUsed.empty())
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index d00391c61f..e4b1216ce6 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -59,18 +59,16 @@ private:
     void moveGroups();
     void fillEmojis(bool fromResize = false);
 
-    bool matchesPattern(const LLEmojiDescriptor* descr);
-
     void onGroupButtonClick(LLUICtrl* ctrl);
     void onSearchKeystroke();
-    void onPreviewEmojiClick();
     void onGridMouseEnter();
     void onGridMouseLeave();
     void onGroupButtonMouseEnter(LLUICtrl* ctrl);
     void onGroupButtonMouseLeave(LLUICtrl* ctrl);
     void onEmojiMouseEnter(LLUICtrl* ctrl);
     void onEmojiMouseLeave(LLUICtrl* ctrl);
-    void onEmojiMouseClick(LLUICtrl* ctrl, MASK mask);
+    void onEmojiMouseDown(LLUICtrl* ctrl);
+    void onEmojiMouseUp(LLUICtrl* ctrl);
 
     void selectGridIcon(LLUICtrl* ctrl);
     void unselectGridIcon(LLUICtrl* ctrl);
@@ -83,11 +81,10 @@ private:
 
     class LLPanel* mGroups { nullptr };
     class LLPanel* mBadge { nullptr };
-    class LLLineEditor* mSearch { nullptr };
+    class LLLineEditor* mFilter { nullptr };
     class LLScrollContainer* mEmojiScroll { nullptr };
     class LLScrollingPanelList* mEmojiGrid { nullptr };
-    class LLButton* mPreviewEmoji { nullptr };
-    class LLTextBox* mDescription { nullptr };
+    class LLEmojiPreviewPanel* mPreview { nullptr };
 
     pick_callback_t mEmojiPickCallback;
     close_callback_t mFloaterCloseCallback;
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index f1807f1c5b..df780f152a 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -128,11 +128,12 @@ BOOL LLFloaterIMNearbyChat::postBuild()
 	mInputEditor->setKeystrokeCallback(boost::bind(&LLFloaterIMNearbyChat::onChatBoxKeystroke, this));
 	mInputEditor->setFocusLostCallback(boost::bind(&LLFloaterIMNearbyChat::onChatBoxFocusLost, this));
 	mInputEditor->setFocusReceivedCallback(boost::bind(&LLFloaterIMNearbyChat::onChatBoxFocusReceived, this));
-	mInputEditor->setLabel(LLTrans::getString("NearbyChatTitle"));
+	std::string nearbyChatTitle(LLTrans::getString("NearbyChatTitle"));
+	mInputEditor->setLabel(nearbyChatTitle);
 
 	// Title must be defined BEFORE call to addConversationListItem() because
 	// it is used to show the item's name in the conversations list
-	setTitle(LLTrans::getString("NearbyChatTitle"));
+	setTitle(nearbyChatTitle);
 
 	// obsolete, but may be needed for backward compatibility?
 	gSavedSettings.declareS32("nearbychat_showicons_and_names", 2, "NearByChat header settings", LLControlVariable::PERSIST_NONDFT);
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 4b4bf0c5a3..a2a290c306 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -13,42 +13,26 @@
   <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
   <line_editor
-      name="Search"
-      label="Type to search"
+      name="Filter"
+      label="Start typing to filter"
       layout="bottomleft"
       follows="bottom|left|right"
       text_tentative_color="TextFgTentativeColor"
+      show_label_focused="true"
       max_length_bytes="63"
+      text_pad_right="5"
+      text_pad_left="5"
       bottom="14"
-      left="34"
+      left="10"
       height="29"
-      width="212" />
-  <text
-      name="Description"
-      layout="bottomleft"
-      follows="bottom|left|right"
-      font="SansSerifMedium"
-      bottom="14"
-      left="42"
-      height="29"
-      width="200" />
-  <button
-      name="PreviewEmoji"
-      layout="bottomleft"
-      follows="bottom|left"
-      font="EmojiHuge"
-      use_font_color="true"
-      bottom="14"
-      left="2"
-      height="29"
-      width="29" />
+      width="230" />
   <scroll_container
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
       top="25"
       left="0"
-      height="330"
+      height="325"
       width="250">
     <scrolling_panel_list
         name="EmojiGrid"
-- 
cgit v1.2.3


From 6cd91770e13cc4a6520aca5f2683b74f8d6692e2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 19 Jul 2023 23:59:16 +0300
Subject: SL-19987 Landmark is shifting to the left of the pointed position

There is still a chance user will try to move multiple landmarks one after another, but if it didn't update in the time user moves landmarks it's going to end up out of order either way
---
 indra/newview/llfavoritesbar.cpp | 48 +++++++++++++++++++++++++++++++---------
 indra/newview/llfavoritesbar.h   |  5 +++--
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index cdce6f7156..c1d8828229 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -320,6 +320,7 @@ public:
 
 		if (item)
 		{
+            LLFavoritesBarCtrl::sWaitingForCallabck = 0.f;
 			LLFavoritesOrderStorage::instance().setSortIndex(item, mSortField);
 
 			item->setComplete(TRUE);
@@ -365,6 +366,9 @@ struct LLFavoritesSort
 	}
 };
 
+
+F64 LLFavoritesBarCtrl::sWaitingForCallabck = 0.f;
+
 LLFavoritesBarCtrl::Params::Params()
 : image_drag_indication("image_drag_indication"),
   more_button("more_button"),
@@ -381,7 +385,7 @@ LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p)
 	mShowDragMarker(FALSE),
 	mLandingTab(NULL),
 	mLastTab(NULL),
-	mTabsHighlightEnabled(TRUE),
+    mItemsListDirty(false),
 	mUpdateDropDownItems(true),
 	mRestoreOverflowMenu(false),
 	mGetPrevItems(true),
@@ -618,6 +622,9 @@ void LLFavoritesBarCtrl::handleNewFavoriteDragAndDrop(LLInventoryItem *item, con
 	int sortField = 0;
 	LLPointer<LLItemCopiedCallback> cb;
 
+    const F64 CALLBACK_WAIT_TIME = 30.f;
+    sWaitingForCallabck = LLTimer::getTotalSeconds() + CALLBACK_WAIT_TIME;
+
 	// current order is saved by setting incremental values (1, 2, 3, ...) for the sort field
 	for (LLInventoryModel::item_array_t::iterator i = mItems.begin(); i != mItems.end(); ++i)
 	{
@@ -691,16 +698,22 @@ void LLFavoritesBarCtrl::changed(U32 mask)
 			LLFavoritesOrderStorage::instance().getSLURL((*i)->getAssetUUID());
 		}
 
-		updateButtons();
-		if (!mItemsChangedTimer.getStarted())
-		{
-			mItemsChangedTimer.start();
-		}
-		else
-		{
-			mItemsChangedTimer.reset();
-		}
-
+        if (sWaitingForCallabck < LLTimer::getTotalSeconds())
+        {
+            updateButtons();
+            if (!mItemsChangedTimer.getStarted())
+            {
+                mItemsChangedTimer.start();
+            }
+            else
+            {
+                mItemsChangedTimer.reset();
+            }
+        }
+        else
+        {
+            mItemsListDirty = true;
+        }
 	}
 }
 
@@ -754,6 +767,18 @@ void LLFavoritesBarCtrl::draw()
 		mItemsChangedTimer.start();
 	}
 
+    if (mItemsListDirty && sWaitingForCallabck < LLTimer::getTotalSeconds())
+    {
+        updateButtons();
+        if (!mItemsChangedTimer.getStarted())
+        {
+            mItemsChangedTimer.start();
+        }
+        else
+        {
+            mItemsChangedTimer.reset();
+        }
+    }
 }
 
 const LLButton::Params& LLFavoritesBarCtrl::getButtonParams()
@@ -782,6 +807,7 @@ void LLFavoritesBarCtrl::updateButtons(bool force_update)
         return;
     }
 
+    mItemsListDirty = false;
 	mItems.clear();
 
 	if (!collectFavoriteItems(mItems))
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
index 3b439b31fd..68a679e27f 100644
--- a/indra/newview/llfavoritesbar.h
+++ b/indra/newview/llfavoritesbar.h
@@ -53,6 +53,7 @@ public:
 protected:
 	LLFavoritesBarCtrl(const Params&);
 	friend class LLUICtrlFactory;
+    friend class LLItemCopiedCallback;
 public:
 	virtual ~LLFavoritesBarCtrl();
 
@@ -84,7 +85,6 @@ protected:
 	void onButtonRightClick(LLUUID id,LLView* button,S32 x,S32 y,MASK mask);
 	
 	void onButtonMouseDown(LLUUID id, LLUICtrl* button, S32 x, S32 y, MASK mask);
-	void onOverflowMenuItemMouseDown(LLUUID id, LLUICtrl* item, S32 x, S32 y, MASK mask);
 	void onButtonMouseUp(LLUUID id, LLUICtrl* button, S32 x, S32 y, MASK mask);
 
 	void onEndDrag();
@@ -164,7 +164,8 @@ private:
 	BOOL mStartDrag;
 	LLInventoryModel::item_array_t mItems;
 
-	BOOL mTabsHighlightEnabled;
+    static F64 sWaitingForCallabck;
+    bool mItemsListDirty;
 
 	S32 mMouseX;
 	S32 mMouseY;
-- 
cgit v1.2.3


From 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 28 Jul 2023 18:42:57 +0200
Subject: SL-20088 EmojiPicker - replace the image on the activation button
 with an emoji

---
 indra/llui/lluistring.h                                   |   1 +
 indra/newview/llfloateremojipicker.cpp                    |   5 +----
 indra/newview/llfloaterimsessiontab.cpp                   |   1 +
 .../skins/default/textures/icons/emoji_picker_icon.png    | Bin 316 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml         |   1 -
 indra/newview/skins/default/xui/en/floater_im_session.xml |  11 ++++++-----
 6 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/emoji_picker_icon.png

diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h
index 07e02de6d8..b1089a3903 100644
--- a/indra/llui/lluistring.h
+++ b/indra/llui/lluistring.h
@@ -61,6 +61,7 @@ public:
 	LLUIString() : mArgs(NULL), mNeedsResult(false), mNeedsWResult(false) {}
 	LLUIString(const std::string& instring, const LLStringUtil::format_map_t& args);
 	LLUIString(const std::string& instring) : mArgs(NULL) { assign(instring); }
+	LLUIString(const LLWString& instring) : mArgs(NULL) { insert(0, instring); }
 	~LLUIString() { delete mArgs; }
 
 	void assign(const std::string& instring);
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 808aca4bf4..c3344fc18a 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -355,10 +355,7 @@ void LLFloaterEmojiPicker::fillGroups()
         button->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseLeave(ctrl); });
 
         button->setRect(rect);
-
-        LLUIString text;
-        text.insert(0, LLWString(1, group.Character));
-        button->setLabel(text);
+        button->setLabel(LLUIString(LLWString(1, group.Character)));
 
         if (mGroupButtons.size() == sSelectedGroupIndex)
         {
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 8ab41b227b..bacfd8ca33 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -254,6 +254,7 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mTearOffBtn->setCommitCallback(boost::bind(&LLFloaterIMSessionTab::onTearOffClicked, this));
 
 	mEmojiBtn = getChild<LLButton>("emoji_panel_btn");
+	mEmojiBtn->setLabel(LLUIString(LLWString(1, 128512)));
 	mEmojiBtn->setClickedCallback(boost::bind(&LLFloaterIMSessionTab::onEmojiPanelBtnClicked, this));
 
 	mGearBtn = getChild<LLButton>("gear_btn");
diff --git a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png
deleted file mode 100644
index 668dcaf193..0000000000
Binary files a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d8c873e791..8fa257131e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -206,7 +206,6 @@ with the same filename but different name
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
 
-  <texture name="Emoji_Picker_Icon" file_name="icons/emoji_picker_icon.png" preload="true" />
   <texture name="ExternalBrowser_Off" file_name="icons/ExternalBrowser_Off.png" preload="false" />
   <texture name="Edit_Wrench" file_name="icons/Edit_Wrench.png" preload="false" />
 
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 1592352d1b..fc54710941 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -300,16 +300,17 @@
                          right="-30"
                          wrap="true" />
                         <button
+                         name="emoji_panel_btn"
+                         tool_tip="Shows/hides emoji picker"
                          follows="right|bottom"
-                         bottom="-7"
-                         height="25"
+                         use_font_color="true"
+                         font="EmojiLarge"
                          image_hover_unselected="Toolbar_Middle_Over"
-                         image_overlay="Emoji_Picker_Icon"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
+                         bottom="-7"
                          right="-1"
-                         name="emoji_panel_btn"
-                         tool_tip="Shows/hides emoji panel"
+                         height="25"
                          width="25"/>
                     </layout_panel>
                     <layout_panel
-- 
cgit v1.2.3


From 62245de7ae38468f337e4c64bc2c254e13c6fedc Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 1 Aug 2023 20:14:27 +0300
Subject: SL-19982 Adjustable font size in LSL editor

---
 indra/llui/llkeywords.cpp                          |  47 +++++++++++----
 indra/llui/llkeywords.h                            |   9 ++-
 indra/newview/app_settings/settings.xml            |  11 ++++
 indra/newview/llfloaterpreference.cpp              |  20 +------
 indra/newview/llinventoryfunctions.cpp             |  18 ++++++
 indra/newview/llinventoryfunctions.h               |   1 +
 indra/newview/llpreviewscript.cpp                  |  48 +++++++++++++++-
 indra/newview/llpreviewscript.h                    |  13 ++++-
 indra/newview/llscripteditor.cpp                   |  45 +++++++++++++--
 indra/newview/llscripteditor.h                     |  10 +++-
 .../default/textures/icons/Icon_Color_Palette.png  | Bin 0 -> 3419 bytes
 .../default/textures/icons/Icon_Font_Size.png      | Bin 0 -> 2994 bytes
 indra/newview/skins/default/textures/textures.xml  |   3 +
 .../default/xui/en/floater_script_ed_prefs.xml     |   1 +
 .../default/xui/en/floater_script_preview.xml      |  23 ++++++--
 indra/newview/skins/default/xui/en/fonts.xml       |   8 +++
 .../skins/default/xui/en/menu_lsl_font_size.xml    |  64 +++++++++++++++++++++
 .../skins/default/xui/en/panel_script_ed.xml       |  36 ++++++++----
 18 files changed, 294 insertions(+), 63 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Icon_Color_Palette.png
 create mode 100644 indra/newview/skins/default/textures/icons/Icon_Font_Size.png
 create mode 100644 indra/newview/skins/default/xui/en/menu_lsl_font_size.xml

diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 69e338ddb9..56e0c4f0f8 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -479,7 +479,7 @@ LLTrace::BlockTimerStatHandle FTM_SYNTAX_COLORING("Syntax Coloring");
 
 // Walk through a string, applying the rules specified by the keyword token list and
 // create a list of color segments.
-void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLWString& wtext, const LLColor4 &defaultColor, LLTextEditor& editor)
+void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLWString& wtext, LLTextEditor& editor, LLStyleConstSP style)
 {
 	LL_RECORD_BLOCK_TIME(FTM_SYNTAX_COLORING);
 	seg_list->clear();
@@ -491,7 +491,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 
 	S32 text_len = wtext.size() + 1;
 
-	seg_list->push_back( new LLNormalTextSegment( defaultColor, 0, text_len, editor ) );
+	seg_list->push_back( new LLNormalTextSegment( style, 0, text_len, editor ) );
 
 	const llwchar* base = wtext.c_str();
 	const llwchar* cur = base;
@@ -503,7 +503,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 			{
 				LLTextSegmentPtr text_segment = new LLLineBreakTextSegment(cur-base);
 				text_segment->setToken( 0 );
-				insertSegment( *seg_list, text_segment, text_len, defaultColor, editor);
+				insertSegment( *seg_list, text_segment, text_len, style, editor);
 				cur++;
 				if( !*cur || *cur == '\n' )
 				{
@@ -541,7 +541,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 						S32 seg_end = cur - base;
 
 						//create segments from seg_start to seg_end
-						insertSegments(wtext, *seg_list,cur_token, text_len, seg_start, seg_end, defaultColor, editor);
+						insertSegments(wtext, *seg_list,cur_token, text_len, seg_start, seg_end, style, editor);
 						line_done = TRUE; // to break out of second loop.
 						break;
 					}
@@ -648,7 +648,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 						seg_end = seg_start + between_delimiters + cur_delimiter->getLengthHead();
 					}
 
-					insertSegments(wtext, *seg_list,cur_delimiter, text_len, seg_start, seg_end, defaultColor, editor);
+					insertSegments(wtext, *seg_list,cur_delimiter, text_len, seg_start, seg_end, style, editor);
 					/*
 					LLTextSegmentPtr text_segment = new LLNormalTextSegment( cur_delimiter->getColor(), seg_start, seg_end, editor );
 					text_segment->setToken( cur_delimiter );
@@ -682,7 +682,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 
 						// LL_INFOS("SyntaxLSL") << "Seg: [" << word.c_str() << "]" << LL_ENDL;
 
-						insertSegments(wtext, *seg_list,cur_token, text_len, seg_start, seg_end, defaultColor, editor);
+						insertSegments(wtext, *seg_list,cur_token, text_len, seg_start, seg_end, style, editor);
 					}
 					cur += seg_len;
 					continue;
@@ -697,30 +697,32 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 	}
 }
 
-void LLKeywords::insertSegments(const LLWString& wtext, std::vector<LLTextSegmentPtr>& seg_list, LLKeywordToken* cur_token, S32 text_len, S32 seg_start, S32 seg_end, const LLColor4 &defaultColor, LLTextEditor& editor )
+void LLKeywords::insertSegments(const LLWString& wtext, std::vector<LLTextSegmentPtr>& seg_list, LLKeywordToken* cur_token, S32 text_len, S32 seg_start, S32 seg_end, LLStyleConstSP style, LLTextEditor& editor )
 {
 	std::string::size_type pos = wtext.find('\n',seg_start);
+    
+    LLStyleConstSP cur_token_style = new LLStyle(LLStyle::Params().font(style->getFont()).color(cur_token->getColor()));
 
 	while (pos!=-1 && pos < (std::string::size_type)seg_end)
 	{
 		if (pos!=seg_start)
 		{
-			LLTextSegmentPtr text_segment = new LLNormalTextSegment( cur_token->getColor(), seg_start, pos, editor );
+            LLTextSegmentPtr text_segment = new LLNormalTextSegment(cur_token_style, seg_start, pos, editor);
 			text_segment->setToken( cur_token );
-			insertSegment( seg_list, text_segment, text_len, defaultColor, editor);
+			insertSegment( seg_list, text_segment, text_len, style, editor);
 		}
 
 		LLTextSegmentPtr text_segment = new LLLineBreakTextSegment(pos);
 		text_segment->setToken( cur_token );
-		insertSegment( seg_list, text_segment, text_len, defaultColor, editor);
+		insertSegment( seg_list, text_segment, text_len, style, editor);
 
 		seg_start = pos+1;
 		pos = wtext.find('\n',seg_start);
 	}
 
-	LLTextSegmentPtr text_segment = new LLNormalTextSegment( cur_token->getColor(), seg_start, seg_end, editor );
+	LLTextSegmentPtr text_segment = new LLNormalTextSegment(cur_token_style, seg_start, seg_end, editor);
 	text_segment->setToken( cur_token );
-	insertSegment( seg_list, text_segment, text_len, defaultColor, editor);
+	insertSegment( seg_list, text_segment, text_len, style, editor);
 }
 
 void LLKeywords::insertSegment(std::vector<LLTextSegmentPtr>& seg_list, LLTextSegmentPtr new_segment, S32 text_len, const LLColor4 &defaultColor, LLTextEditor& editor )
@@ -744,6 +746,27 @@ void LLKeywords::insertSegment(std::vector<LLTextSegmentPtr>& seg_list, LLTextSe
 	}
 }
 
+void LLKeywords::insertSegment(std::vector<LLTextSegmentPtr>& seg_list, LLTextSegmentPtr new_segment, S32 text_len, LLStyleConstSP style, LLTextEditor& editor )
+{
+	LLTextSegmentPtr last = seg_list.back();
+	S32 new_seg_end = new_segment->getEnd();
+
+	if( new_segment->getStart() == last->getStart() )
+	{
+		seg_list.pop_back();
+	}
+	else
+	{
+		last->setEnd( new_segment->getStart() );
+	}
+	seg_list.push_back( new_segment );
+
+	if( new_seg_end < text_len )
+	{
+		seg_list.push_back( new LLNormalTextSegment( style, new_seg_end, text_len, editor ) );
+	}
+}
+
 #ifdef _DEBUG
 void LLKeywords::dump()
 {
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index 18e2ed06c5..2410fe7d5a 100644
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -29,6 +29,7 @@
 
 
 #include "lldir.h"
+#include "llstyle.h"
 #include "llstring.h"
 #include "v3color.h"
 #include "v4color.h"
@@ -115,8 +116,8 @@ public:
 
 	void		findSegments(std::vector<LLTextSegmentPtr> *seg_list,
 							 const LLWString& text,
-							 const LLColor4 &defaultColor,
-							 class LLTextEditor& editor);
+							 class LLTextEditor& editor,
+                             LLStyleConstSP style);
 	void		initialize(LLSD SyntaxXML);
 	void		processTokens();
 
@@ -181,9 +182,11 @@ protected:
 							   S32 text_len,
 							   S32 seg_start,
 							   S32 seg_end,
-							   const LLColor4 &defaultColor,
+							   LLStyleConstSP style,
 							   LLTextEditor& editor);
 
+    void insertSegment(std::vector<LLTextSegmentPtr>& seg_list, LLTextSegmentPtr new_segment, S32 text_len, LLStyleConstSP style, LLTextEditor& editor );
+
 	bool		mLoaded;
 	LLSD		mSyntax;
 	word_token_map_t mWordTokenMap;
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ca1b1e2f20..c700302221 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5420,6 +5420,17 @@
       <key>Value</key>
       <string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string>
     </map>
+    <key>LSLFontSizeName</key>
+    <map>
+        <key>Comment</key>
+        <string>Text font size in LSL editor</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <string>Monospace</string>
+    </map>
     <key>GridStatusRSS</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 9ea49e935f..42b1c87314 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -114,6 +114,7 @@
 #include "llpresetsmanager.h"
 #include "llviewercontrol.h"
 #include "llpresetsmanager.h"
+#include "llinventoryfunctions.h"
 
 #include "llsearchableui.h"
 #include "llperfstats.h"
@@ -1609,25 +1610,6 @@ void LLFloaterPreference::onChangeMaturity()
 	getChild<LLIconCtrl>("rating_icon_adult")->setVisible(sim_access == SIM_ACCESS_ADULT);
 }
 
-std::string get_category_path(LLUUID cat_id)
-{
-    LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
-    std::string localized_cat_name;
-    if (!LLTrans::findString(localized_cat_name, "InvFolder " + cat->getName()))
-    {
-        localized_cat_name = cat->getName();
-    }
-
-    if (cat->getParentUUID().notNull())
-    {
-        return get_category_path(cat->getParentUUID()) + " > " + localized_cat_name;
-    }
-    else
-    {
-        return localized_cat_name;
-    }
-}
-
 std::string get_category_path(LLFolderType::EType cat_type)
 {
     LLUUID cat_id = gInventory.findUserDefinedCategoryUUIDForType(cat_type);
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 67240ac7e7..004f0425fd 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -1967,6 +1967,24 @@ void move_items_to_new_subfolder(const uuid_vec_t& selected_uuids, const std::st
 
 }
 
+std::string get_category_path(LLUUID cat_id)
+{
+    LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
+    std::string localized_cat_name;
+    if (!LLTrans::findString(localized_cat_name, "InvFolder " + cat->getName()))
+    {
+        localized_cat_name = cat->getName();
+    }
+
+    if (cat->getParentUUID().notNull())
+    {
+        return get_category_path(cat->getParentUUID()) + " > " + localized_cat_name;
+    }
+    else
+    {
+        return localized_cat_name;
+    }
+}
 ///----------------------------------------------------------------------------
 /// LLInventoryCollectFunctor implementations
 ///----------------------------------------------------------------------------
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 56ad6f6496..873bd7233c 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -97,6 +97,7 @@ void move_items_to_new_subfolder(const uuid_vec_t& selected_uuids, const std::st
 void move_items_to_folder(const LLUUID& new_cat_uuid, const uuid_vec_t& selected_uuids);
 bool is_only_cats_selected(const uuid_vec_t& selected_uuids);
 bool is_only_items_selected(const uuid_vec_t& selected_uuids);
+std::string get_category_path(LLUUID cat_id);
 
 /**                    Miscellaneous global functions
  **                                                                            **
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index d677a996c1..2add126b2d 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -86,6 +86,9 @@
 #include "llexperiencecache.h"
 #include "llfloaterexperienceprofile.h"
 #include "llviewerassetupload.h"
+#include "lltoggleablemenu.h"
+#include "llmenubutton.h"
+#include "llinventoryfunctions.h"
 
 const std::string HELLO_LSL =
 	"default\n"
@@ -459,6 +462,13 @@ BOOL LLScriptEdCore::postBuild()
 	LLSyntaxIdLSL::getInstance()->initialize();
 	processKeywords();
 
+    mCommitCallbackRegistrar.add("FontSize.Set", boost::bind(&LLScriptEdCore::onChangeFontSize, this, _2));
+    mEnableCallbackRegistrar.add("FontSize.Check", boost::bind(&LLScriptEdCore::isFontSizeChecked, this, _2));
+
+    LLToggleableMenu *context_menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>(
+        "menu_lsl_font_size.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+    getChild<LLMenuButton>("font_btn")->setMenu(context_menu, LLMenuButton::MP_BOTTOM_LEFT, true);
+
 	return TRUE;
 }
 
@@ -1287,7 +1297,21 @@ LLUUID LLScriptEdCore::getAssociatedExperience()const
 	return mAssociatedExperience;
 }
 
-void LLLiveLSLEditor::setExperienceIds( const LLSD& experience_ids )
+void LLScriptEdCore::onChangeFontSize(const LLSD &userdata)
+{
+    const std::string font_name = userdata.asString();
+    gSavedSettings.setString("LSLFontSizeName", font_name);
+}
+
+bool LLScriptEdCore::isFontSizeChecked(const LLSD &userdata)
+{
+    const std::string current_size_name = LLScriptEditor::getScriptFontSize();
+    const std::string size_name = userdata.asString();
+
+    return (size_name == current_size_name);
+}
+
+    void LLLiveLSLEditor::setExperienceIds( const LLSD& experience_ids )
 {
 	mExperienceIds=experience_ids;
 	updateExperiencePanel();
@@ -1475,7 +1499,21 @@ bool LLScriptEdContainer::onExternalChange(const std::string& filename)
 	return true;
 }
 
-/// ---------------------------------------------------------------------------
+BOOL LLScriptEdContainer::handleKeyHere(KEY key, MASK mask) 
+{
+    if (('A' == key) && (MASK_CONTROL == (mask & MASK_MODIFIERS)))
+    {
+        mScriptEd->selectAll();
+        return TRUE;
+    }
+
+    if (!LLPreview::handleKeyHere(key, mask)) 
+    {
+        return mScriptEd->handleKeyHere(key, mask);
+    }
+    return TRUE;
+}
+    /// ---------------------------------------------------------------------------
 /// LLPreviewLSL
 /// ---------------------------------------------------------------------------
 
@@ -1527,10 +1565,14 @@ BOOL LLPreviewLSL::postBuild()
 	if (item)
 	{
 		getChild<LLUICtrl>("desc")->setValue(item->getDescription());
+
+        std::string item_path = get_category_path(item->getParentUUID());
+        getChild<LLUICtrl>("path_txt")->setValue(item_path);
+        getChild<LLUICtrl>("path_txt")->setToolTip(item_path);
 	}
 	childSetCommitCallback("desc", LLPreview::onText, this);
 	getChild<LLLineEditor>("desc")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
-
+ 
 	return LLPreview::postBuild();
 }
 
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index f851ff6f3f..2e5b8ad9bb 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -36,6 +36,7 @@
 #include "llfloatergotoline.h"
 #include "lllivefile.h"
 #include "llsyntaxid.h"
+#include "llscripteditor.h"
 
 class LLLiveLSLFile;
 class LLMessageSystem;
@@ -145,7 +146,13 @@ public:
     void 			setAssetID( const LLUUID& asset_id){ mAssetID = asset_id; };
     LLUUID 			getAssetID() { return mAssetID; }
 
-private:
+    bool isFontSizeChecked(const LLSD &userdata);
+    void onChangeFontSize(const LLSD &size_name);
+
+    virtual BOOL handleKeyHere(KEY key, MASK mask);
+    void selectAll() { mEditor->selectAll(); }
+
+  private:
 	void		onBtnDynamicHelp();
 	void		onBtnUndoChanges();
 
@@ -153,8 +160,6 @@ private:
 
 	void selectFirstError();
 
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
-	
 	void enableSave(BOOL b) {mEnableSave = b;}
 
 protected:
@@ -207,6 +212,8 @@ public:
 	LLScriptEdContainer(const LLSD& key);
 	LLScriptEdContainer(const LLSD& key, const bool live);
 
+    BOOL handleKeyHere(KEY key, MASK mask);
+
 protected:
 	std::string		getTmpFileName(const std::string& script_name);
 	bool			onExternalChange(const std::string& filename);
diff --git a/indra/newview/llscripteditor.cpp b/indra/newview/llscripteditor.cpp
index 3278bd3aa9..693491e7e7 100644
--- a/indra/newview/llscripteditor.cpp
+++ b/indra/newview/llscripteditor.cpp
@@ -30,19 +30,22 @@
 
 #include "llsyntaxid.h"
 #include "lllocalcliprect.h"
+#include "llviewercontrol.h"
 
 const S32	UI_TEXTEDITOR_LINE_NUMBER_MARGIN = 32;
 
 static LLDefaultChildRegistry::Register<LLScriptEditor> r("script_editor");
 
 LLScriptEditor::Params::Params()
-:	show_line_numbers("show_line_numbers", true)
+:	show_line_numbers("show_line_numbers", true),
+    default_font_size("default_font_size", false)
 {}
 
 
 LLScriptEditor::LLScriptEditor(const Params& p)
 :	LLTextEditor(p)
-,	mShowLineNumbers(p.show_line_numbers)
+,	mShowLineNumbers(p.show_line_numbers),
+    mUseDefaultFontSize(p.default_font_size)
 {
 	if (mShowLineNumbers)
 	{
@@ -51,6 +54,12 @@ LLScriptEditor::LLScriptEditor(const Params& p)
 	}
 }
 
+BOOL LLScriptEditor::postBuild()
+{
+    gSavedSettings.getControl("LSLFontSizeName")->getCommitSignal()->connect(boost::bind(&LLScriptEditor::onFontSizeChange, this));
+    return LLTextEditor::postBuild();
+}
+
 void LLScriptEditor::draw()
 {
 	{
@@ -110,12 +119,11 @@ void LLScriptEditor::drawLineNumbers()
 			// draw the line numbers
 			if(line.mLineNum != last_line_num && line.mRect.mTop <= scrolled_view_rect.mTop)
 			{
-				const LLFontGL *num_font = LLFontGL::getFontMonospace();
 				const LLWString ltext = utf8str_to_wstring(llformat("%d", line.mLineNum ));
 				BOOL is_cur_line = cursor_line == line.mLineNum;
 				const U8 style = is_cur_line ? LLFontGL::BOLD : LLFontGL::NORMAL;
 				const LLColor4 fg_color = is_cur_line ? mCursorColor : mReadOnlyFgColor;
-				num_font->render(
+                getScriptFont()->render(
 								 ltext, // string to draw
 								 0, // begin offset
 								 UI_TEXTEDITOR_LINE_NUMBER_MARGIN - 2, // x
@@ -143,8 +151,10 @@ void LLScriptEditor::loadKeywords()
     LL_PROFILE_ZONE_SCOPED;
 	mKeywords.processTokens();
 	
+    LLStyleConstSP style = new LLStyle(LLStyle::Params().font(getScriptFont()).color(mDefaultColor.get()));
+
 	segment_vec_t segment_list;
-	mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this);
+    mKeywords.findSegments(&segment_list, getWText(), *this, style);
 	
 	mSegments.clear();
 	segment_set_t::iterator insert_it = mSegments.begin();
@@ -159,9 +169,12 @@ void LLScriptEditor::updateSegments()
 	if (mReflowIndex < S32_MAX && mKeywords.isLoaded() && mParseOnTheFly)
 	{
         LL_PROFILE_ZONE_SCOPED;
+
+        LLStyleConstSP style = new LLStyle(LLStyle::Params().font(getScriptFont()).color(mDefaultColor.get()));
+
 		// HACK:  No non-ascii keywords for now
 		segment_vec_t segment_list;
-		mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this);
+        mKeywords.findSegments(&segment_list, getWText(), *this, style);
 		
 		clearSegments();
 		for (segment_vec_t::iterator list_it = segment_list.begin(); list_it != segment_list.end(); ++list_it)
@@ -211,3 +224,23 @@ void LLScriptEditor::drawSelectionBackground()
 		}
 	}
 }
+
+std::string LLScriptEditor::getScriptFontSize()
+{ 
+    static LLCachedControl<std::string> size_name(gSavedSettings, "LSLFontSizeName", "Monospace");
+    return size_name;
+}
+
+LLFontGL* LLScriptEditor::getScriptFont()
+{
+    std::string font_size_name = mUseDefaultFontSize ? "Monospace" : getScriptFontSize();
+    return LLFontGL::getFont(LLFontDescriptor("Monospace", font_size_name, 0));
+}
+
+void LLScriptEditor::onFontSizeChange() 
+{
+    if (!mUseDefaultFontSize)
+    {
+        needsReflow();
+    }
+}
diff --git a/indra/newview/llscripteditor.h b/indra/newview/llscripteditor.h
index f458203a39..ef941f552a 100644
--- a/indra/newview/llscripteditor.h
+++ b/indra/newview/llscripteditor.h
@@ -37,7 +37,7 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
 	{
 		Optional<bool>		show_line_numbers;
-		
+        Optional<bool> default_font_size;
 		Params();
 	};
 	
@@ -45,6 +45,7 @@ public:
 	
 	// LLView override
 	virtual void	draw();
+    BOOL postBuild();
 	
 	void	initKeywords();
 	void	loadKeywords();
@@ -52,7 +53,11 @@ public:
 	LLKeywords::keyword_iterator_t keywordsBegin()	{ return mKeywords.begin(); }
 	LLKeywords::keyword_iterator_t keywordsEnd()	{ return mKeywords.end(); }
 	
-protected:
+    static std::string getScriptFontSize();
+    LLFontGL* getScriptFont();
+    void onFontSizeChange();
+
+  protected:
 	friend class LLUICtrlFactory;
 	LLScriptEditor(const Params& p);
 	
@@ -65,6 +70,7 @@ private:
 	
 	LLKeywords	mKeywords;
 	bool		mShowLineNumbers;
+    bool mUseDefaultFontSize;
 };
 
 #endif // LL_SCRIPTEDITOR_H
diff --git a/indra/newview/skins/default/textures/icons/Icon_Color_Palette.png b/indra/newview/skins/default/textures/icons/Icon_Color_Palette.png
new file mode 100644
index 0000000000..28906001ea
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Color_Palette.png differ
diff --git a/indra/newview/skins/default/textures/icons/Icon_Font_Size.png b/indra/newview/skins/default/textures/icons/Icon_Font_Size.png
new file mode 100644
index 0000000000..37bdde69aa
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Font_Size.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7d999a2ffa..21335bf6c3 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -881,4 +881,7 @@ with the same filename but different name
   <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
   <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png"	preload="true"/>
   <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png"	preload="true"/>
+
+  <texture name="Icon_Color_Palette" file_name="icons/Icon_Color_Palette.png" preload="false"/>
+  <texture name="Icon_Font_Size" file_name="icons/Icon_Font_Size.png" preload="false"/>
 </textures>
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 8e4bcb3eb0..8ae1e74d52 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -335,6 +335,7 @@
      layout="topleft"
      max_length="300"
      name="Script Preview"
+     default_font_size="true"
      text_color="ScriptText"
      default_color="ScriptText"
      bg_writeable_color="ScriptBackground"
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index 91a9e67e4c..5bec45e666 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -2,10 +2,10 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="570"
+ height="593"
  layout="topleft"
  min_height="271"
- min_width="290"
+ min_width="320"
  name="preview lsl text"
  help_topic="preview_lsl_text"
  save_rect="true"
@@ -21,7 +21,7 @@
      layout="topleft"
      left="10"
      name="script panel"
-     top="42"
+     top="65"
      width="497" />
     <icon
      follows="top|right"
@@ -33,6 +33,21 @@
      name="lock"
      top="4"
      width="18" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     width="490"
+     use_ellipses="true"
+     font="SansSerif"
+     height="19"
+     layout="topleft"
+     left="13"
+     name="path_txt"
+     text_color="white"
+     top="21">
+        File path
+    </text>
     <text
      type="string"
      length="1"
@@ -42,7 +57,7 @@
      layout="topleft"
      left="13"
      name="desc txt"
-     top="19"
+     top_pad="5"
      width="80">
         Description:
     </text>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index d88c267a95..3c3eb6b66f 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -170,4 +170,12 @@
 	     comment="Size of small font (points, or 1/72 of an inch)"
 	     size="7.6"
 	     />
+  <font_size name="SmallLSL"
+         comment="Size of small font for LSL editor (points, or 1/72 of an inch)"
+         size="7"
+         />
+  <font_size name="HugeLSL"
+         comment="Size of huge font for LSL editor (points, or 1/72 of an inch)"
+         size="12"
+         />
 </fonts>
diff --git a/indra/newview/skins/default/xui/en/menu_lsl_font_size.xml b/indra/newview/skins/default/xui/en/menu_lsl_font_size.xml
new file mode 100644
index 0000000000..39a2bc511c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_lsl_font_size.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_font_size"
+ visible="false">
+  <menu_item_check
+   label="Small"
+   layout="topleft"
+   name="font_small">
+    <on_click
+     function="FontSize.Set"
+     parameter="SmallLSL" />
+    <on_check
+     function="FontSize.Check"
+     parameter="SmallLSL" />
+  </menu_item_check>
+  <menu_item_check
+   label="Default"
+   layout="topleft"
+   name="font_monospace">
+    <on_click
+     function="FontSize.Set"
+     parameter="Monospace" />
+    <on_check
+     function="FontSize.Check"
+     parameter="Monospace" />
+    </menu_item_check>
+  <menu_item_check
+   label="Medium"
+   layout="topleft"
+   name="font_medium">
+    <on_click
+     function="FontSize.Set"
+     parameter="Medium" />
+    <on_check
+     function="FontSize.Check"
+     parameter="Medium" />
+  </menu_item_check>
+  <menu_item_check
+   label="Large"
+   layout="topleft"
+   name="font_large">
+    <on_click
+     function="FontSize.Set"
+     parameter="Large" />
+    <on_check
+     function="FontSize.Check"
+     parameter="Large" />
+  </menu_item_check>
+  <menu_item_check
+   label="Huge"
+   layout="topleft"
+   name="font_huge">
+    <on_click
+     function="FontSize.Set"
+     parameter="HugeLSL" />
+    <on_check
+     function="FontSize.Check"
+     parameter="HugeLSL" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 545c01935b..be20cfd880 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -48,6 +48,7 @@
       width="138">
       <menu_item_call
         label="Save"
+        shortcut="control|S"
         layout="topleft"
         name="Save" />
       <menu_item_separator
@@ -66,16 +67,6 @@
         label="Save to file..."
         layout="topleft"
         name="SaveToFile" />
-          <menu_item_separator
-           layout="topleft" />
-          <menu_item_call
-           label="Colors..."
-           layout="topleft"
-           name="Colors">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="script_colors"/>
-          </menu_item_call>
     </menu>
     <menu
       top="0"
@@ -117,6 +108,7 @@
         name="separator2" />
       <menu_item_call
         label="Select All"
+        shortcut="control|A"
         layout="topleft"
         name="Select All" />
       <menu_item_call
@@ -150,12 +142,34 @@
         name="Keyword Help..." />
     </menu>
   </menu_bar>
+  <menu_button
+   follows="right|top"
+   height="24"
+   image_overlay="Icon_Font_Size"
+   layout="topleft"
+   top_delta="-2"
+   right="453"
+   name="font_btn"
+   width="32" />
+  <button
+   follows="right|top"
+   height="24"
+   image_overlay="Icon_Color_Palette"
+   layout="topleft"
+   top_delta="0"
+   right="487"
+   name="color_btn"
+   width="32">
+    <button.commit_callback
+      function="Floater.Toggle"
+      parameter="script_colors"/>
+  </button>
     <script_editor
     left="0"
     type="string"
     length="1"
     follows="left|top|right|bottom"
-    font="Monospace"
+
      height="376"
     ignore_tab="false"
     layout="topleft"
-- 
cgit v1.2.3


From 2aecd42d1ffc2ee056b60a66d5c39f09312e1fbe Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 1 Aug 2023 15:51:18 -0700
Subject: First commit of code to investigate how we might do bulk uploads of
 inventory item thumbnails - both from a code and a UI perspective

---
 indra/newview/CMakeLists.txt                       |  2 +
 indra/newview/llfloaterbulkythumbs.cpp             | 63 ++++++++++++++++++++++
 indra/newview/llfloaterbulkythumbs.h               | 49 +++++++++++++++++
 indra/newview/llviewerfloaterreg.cpp               |  2 +
 .../skins/default/xui/en/floater_bulky_thumbs.xml  | 42 +++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  8 +++
 6 files changed, 166 insertions(+)
 create mode 100644 indra/newview/llfloaterbulkythumbs.cpp
 create mode 100644 indra/newview/llfloaterbulkythumbs.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c37d03221c..4c6e37f82f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -185,6 +185,7 @@ set(viewer_SOURCE_FILES
     llfloaterbigpreview.cpp
     llfloaterbuildoptions.cpp
     llfloaterbulkpermission.cpp
+    llfloaterbulkythumbs.cpp
     llfloaterbump.cpp
     llfloaterbuy.cpp
     llfloaterbuycontents.cpp
@@ -831,6 +832,7 @@ set(viewer_HEADER_FILES
     llfloaterbigpreview.h
     llfloaterbuildoptions.h
     llfloaterbulkpermission.h
+    llfloaterbulkythumbs.h
     llfloaterbump.h
     llfloaterbuy.h
     llfloaterbuycontents.h
diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
new file mode 100644
index 0000000000..14ecc32c40
--- /dev/null
+++ b/indra/newview/llfloaterbulkythumbs.cpp
@@ -0,0 +1,63 @@
+/** 
+ * @file llfloaterbulkythumbs.cpp
+ * @author Callum Prentice
+ * @brief LLFloaterBulkyThumbs class implementation
+ *
+ * $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$
+ */
+
+/**
+ * Floater that appears when buying an object, giving a preview
+ * of its contents and their permissions.
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterbulkythumbs.h"
+#include "lluictrlfactory.h"
+
+
+LLFloaterBulkyThumbs::LLFloaterBulkyThumbs(const LLSD &key)
+	:	LLFloater("floater_bulky_thumbs")
+{
+}
+
+LLFloaterBulkyThumbs::~LLFloaterBulkyThumbs() {}
+
+BOOL LLFloaterBulkyThumbs::postBuild()
+{
+    mPasteFromInventoryBtn = getChild<LLUICtrl>("paste_from_inventory");
+    mPasteFromInventoryBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteFromInventory, this));
+
+    mProcessBulkyThumbsBtn = getChild<LLUICtrl>("process_bulky_thumbs");
+    mProcessBulkyThumbsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onProcessBulkyThumbs, this));
+    mProcessBulkyThumbsBtn->setEnabled(false);
+
+    return true;
+}
+
+
+void LLFloaterBulkyThumbs::onPasteFromInventory()
+{ std::cout << "onPasteFromInventory" << std::endl; }
+
+void LLFloaterBulkyThumbs::onProcessBulkyThumbs()
+{ std::cout << "onProcessBulkyThumbs" << std::endl; }
diff --git a/indra/newview/llfloaterbulkythumbs.h b/indra/newview/llfloaterbulkythumbs.h
new file mode 100644
index 0000000000..9c951211d7
--- /dev/null
+++ b/indra/newview/llfloaterbulkythumbs.h
@@ -0,0 +1,49 @@
+/** 
+ * @file llfloaterbulkythumbs.h
+ * @author Callum Prentice
+ * @brief Helper floater for bulk processing of inventory thumbnails
+ *
+ * $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_LLFLOATERBULKYTHUMBS_H
+#define LL_LLFLOATERBULKYTHUMBS_H
+
+#include "llfloater.h"
+
+class LLFloaterBulkyThumbs:
+	public LLFloater
+{
+	friend class LLFloaterReg;
+private:
+    LLFloaterBulkyThumbs(const LLSD &key);
+     BOOL postBuild() override;
+	~LLFloaterBulkyThumbs();
+
+	LLUICtrl *mPasteFromInventoryBtn;
+    void onPasteFromInventory();
+
+    LLUICtrl *mProcessBulkyThumbsBtn;
+    void onProcessBulkyThumbs();
+};
+
+#endif // LL_LLFLOATERBULKYTHUMBS_H
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 060bdb6995..459101317b 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -47,6 +47,7 @@
 #include "llfloaterbeacons.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbulkpermission.h"
+#include "llfloaterbulkythumbs.h"
 #include "llfloaterbump.h"
 #include "llfloaterbuy.h"
 #include "llfloaterbuycontents.h"
@@ -328,6 +329,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("build", "floater_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTools>);
 	LLFloaterReg::add("build_options", "floater_build_options.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBuildOptions>);
 	LLFloaterReg::add("bumps", "floater_bumps.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBump>);
+    LLFloaterReg::add("bulky_thumbs", "floater_bulky_thumbs.xml", (LLFloaterBuildFunc) &LLFloaterReg::build<LLFloaterBulkyThumbs>);
 
 	LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
 	LLFloaterReg::add("camera_presets", "floater_camera_presets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCameraPresets>);
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
new file mode 100644
index 0000000000..867c8fdc20
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="600"
+ layout="topleft"
+ min_height="175"
+ min_width="250"
+ name="contents"
+ help_topic="contents"
+ title="BULKY THUMBS"
+ width="500">
+	<button follows="left|top"
+		height="20"
+		label="Paste from Inventory copy"
+		layout="topleft"
+		left="10"
+		name="paste_from_inventory"
+		top="26	"
+		width="200" />
+
+	<text_editor
+   height="510"
+   follows="top|left|right|bottom"
+   left_delta="0"
+   name="inv_items"
+   top_pad="10"
+   width="480">
+Entry 1
+Entry 2
+Entry 3
+Entry 4
+	</text_editor>
+	<button follows="left|bottom"
+		height="20"
+		label="Process!"
+		layout="bottomleft"
+		left="10"
+		name="process_bulky_thumbs"
+		bottom="8"
+		width="200" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f72d1f0bf9..ebfe1405c9 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3485,6 +3485,14 @@ function="World.EnvPreset"
              function="Advanced.WebContentTest"
              parameter="http://duckduckgo.com"/>
           </menu_item_call>
+			<menu_item_call
+             label="Bulky Thumbs"
+             name="Bulky Thumbs"
+				shortcut="control|alt|shift|Y">
+				<menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="bulky_thumbs" />
+			</menu_item_call>
           <menu_item_call
            label="FB Connect Test"
            name="FB Connect Test">
-- 
cgit v1.2.3


From 4ce14631678195d7256e11a02f646396e3bc2dd8 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 1 Aug 2023 16:56:06 -0700
Subject: SL-20109: write the name of each copied inventory item to the text
 editor

---
 indra/newview/llfloaterbulkythumbs.cpp             | 65 ++++++++++++++++++----
 indra/newview/llfloaterbulkythumbs.h               | 34 ++++++-----
 .../skins/default/xui/en/floater_bulky_thumbs.xml  |  2 +-
 3 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
index 14ecc32c40..4392d1a906 100644
--- a/indra/newview/llfloaterbulkythumbs.cpp
+++ b/indra/newview/llfloaterbulkythumbs.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterbulkythumbs.cpp
  * @author Callum Prentice
  * @brief LLFloaterBulkyThumbs class implementation
@@ -6,21 +6,21 @@
  * $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$
  */
@@ -34,10 +34,12 @@
 
 #include "llfloaterbulkythumbs.h"
 #include "lluictrlfactory.h"
+#include "llclipboard.h"
+#include "llinventorymodel.h"
+#include "lltexteditor.h"
 
-
-LLFloaterBulkyThumbs::LLFloaterBulkyThumbs(const LLSD &key)
-	:	LLFloater("floater_bulky_thumbs")
+LLFloaterBulkyThumbs::LLFloaterBulkyThumbs(const LLSD& key)
+    :   LLFloater("floater_bulky_thumbs")
 {
 }
 
@@ -48,6 +50,10 @@ BOOL LLFloaterBulkyThumbs::postBuild()
     mPasteFromInventoryBtn = getChild<LLUICtrl>("paste_from_inventory");
     mPasteFromInventoryBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteFromInventory, this));
 
+    mInventoryItems = getChild<LLTextEditor>("inventory_items");
+    mInventoryItems->setMaxTextLength(0x8000);
+    mInventoryItems->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onCommitInventoryItems, this));
+
     mProcessBulkyThumbsBtn = getChild<LLUICtrl>("process_bulky_thumbs");
     mProcessBulkyThumbsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onProcessBulkyThumbs, this));
     mProcessBulkyThumbsBtn->setEnabled(false);
@@ -57,7 +63,46 @@ BOOL LLFloaterBulkyThumbs::postBuild()
 
 
 void LLFloaterBulkyThumbs::onPasteFromInventory()
-{ std::cout << "onPasteFromInventory" << std::endl; }
+{
+    std::cout << "onPasteFromInventory" << std::endl;
+
+    if (!LLClipboard::instance().hasContents())
+    {
+        return;
+    }
+
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+    size_t count = objects.size();
+
+    if (count > 0)
+    {
+        mInventoryItems->clear();
+
+        for (size_t i = 0; i < count; i++)
+        {
+            const LLUUID& item_id = objects.at(i);
+
+            const LLInventoryItem* item = gInventory.getItem(item_id);
+            if (item)
+            {
+                if (item->getType() == LLAssetType::AT_OBJECT)
+                {
+                    mInventoryItems->appendText(item->getName(), "\n");
+                }
+            }
+        }
+
+        mProcessBulkyThumbsBtn->setEnabled(true);
+    }
+}
 
 void LLFloaterBulkyThumbs::onProcessBulkyThumbs()
-{ std::cout << "onProcessBulkyThumbs" << std::endl; }
+{
+    std::cout << "onProcessBulkyThumbs" << std::endl;
+}
+
+void LLFloaterBulkyThumbs::onCommitInventoryItems()
+{
+    std::cout << "onCommitInventoryItems" << std::endl;
+}
diff --git a/indra/newview/llfloaterbulkythumbs.h b/indra/newview/llfloaterbulkythumbs.h
index 9c951211d7..6d43ff9bc6 100644
--- a/indra/newview/llfloaterbulkythumbs.h
+++ b/indra/newview/llfloaterbulkythumbs.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterbulkythumbs.h
  * @author Callum Prentice
  * @brief Helper floater for bulk processing of inventory thumbnails
@@ -6,21 +6,21 @@
  * $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$
  */
@@ -29,21 +29,25 @@
 #define LL_LLFLOATERBULKYTHUMBS_H
 
 #include "llfloater.h"
+class LLTextEditor;
 
 class LLFloaterBulkyThumbs:
-	public LLFloater
+    public LLFloater
 {
-	friend class LLFloaterReg;
-private:
-    LLFloaterBulkyThumbs(const LLSD &key);
-     BOOL postBuild() override;
-	~LLFloaterBulkyThumbs();
+        friend class LLFloaterReg;
+    private:
+        LLFloaterBulkyThumbs(const LLSD& key);
+        BOOL postBuild() override;
+        ~LLFloaterBulkyThumbs();
+
+        LLUICtrl* mPasteFromInventoryBtn;
+        void onPasteFromInventory();
 
-	LLUICtrl *mPasteFromInventoryBtn;
-    void onPasteFromInventory();
+        LLTextEditor* mInventoryItems;
+        void onCommitInventoryItems();
 
-    LLUICtrl *mProcessBulkyThumbsBtn;
-    void onProcessBulkyThumbs();
+        LLUICtrl* mProcessBulkyThumbsBtn;
+        void onProcessBulkyThumbs();
 };
 
 #endif // LL_LLFLOATERBULKYTHUMBS_H
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index 867c8fdc20..ecb07db8fa 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -23,7 +23,7 @@
    height="510"
    follows="top|left|right|bottom"
    left_delta="0"
-   name="inv_items"
+   name="inventory_items"
    top_pad="10"
    width="480">
 Entry 1
-- 
cgit v1.2.3


From c71da80dc220920d47ba0c820b37475c5c4ffa07 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 1 Aug 2023 00:53:23 +0200
Subject: SL-19528 Remove PERMISSION_DEBIT warning from experience that is Grid
 and Privileged

---
 indra/newview/llviewermessage.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e7456f77bb..ce29238667 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5815,6 +5815,22 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 		args["OBJECTNAME"] = object_name;
 		args["NAME"] = clean_owner_name;
 		S32 known_questions = 0;
+
+		// SL-19346, SL-19528 - No DEBIT warning for GRID & PRIVILEGED
+		if (experienceid.notNull())
+		{
+			const LLSD& experience = LLExperienceCache::instance().get(experienceid);
+			if (!experience.isUndefined())
+			{
+				S32 properties = experience[LLExperienceCache::PROPERTIES].asInteger();
+				if ((properties | LLExperienceCache::PROPERTY_GRID) &&
+					(properties | LLExperienceCache::PROPERTY_PRIVILEGED))
+				{
+					questions ^= SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
+				}
+			}
+		}
+
 		bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
 		// check the received permission flags against each permission
 		BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)
-- 
cgit v1.2.3


From feb40d1a1b53de09ef619d0d681bf03e0ceaa2eb Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 1 Aug 2023 17:38:15 -0700
Subject: SL-20109: display the inventory item asset ID and associated
 thumbnail ID (broken - all null UUID - for tomorrow)

---
 indra/newview/llfloaterbulkythumbs.cpp | 7 ++++++-
 indra/newview/llfloaterbulkythumbs.h   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
index 4392d1a906..64661c6b40 100644
--- a/indra/newview/llfloaterbulkythumbs.cpp
+++ b/indra/newview/llfloaterbulkythumbs.cpp
@@ -37,6 +37,7 @@
 #include "llclipboard.h"
 #include "llinventorymodel.h"
 #include "lltexteditor.h"
+#include "lluuid.h"
 
 LLFloaterBulkyThumbs::LLFloaterBulkyThumbs(const LLSD& key)
     :   LLFloater("floater_bulky_thumbs")
@@ -88,7 +89,11 @@ void LLFloaterBulkyThumbs::onPasteFromInventory()
             {
                 if (item->getType() == LLAssetType::AT_OBJECT)
                 {
-                    mInventoryItems->appendText(item->getName(), "\n");
+                    const std::string name = item->getName();
+                    const std::string item_asset_uuid_str = item->getAssetUUID().asString();
+                    const std::string thumb_uuid_str = item->getThumbnailUUID().asString();
+                    const std::string output_line = name + "|" + item_asset_uuid_str + "|" + thumb_uuid_str;
+                    mInventoryItems->appendText(output_line, "\n");
                 }
             }
         }
diff --git a/indra/newview/llfloaterbulkythumbs.h b/indra/newview/llfloaterbulkythumbs.h
index 6d43ff9bc6..fbfc95f11b 100644
--- a/indra/newview/llfloaterbulkythumbs.h
+++ b/indra/newview/llfloaterbulkythumbs.h
@@ -30,6 +30,7 @@
 
 #include "llfloater.h"
 class LLTextEditor;
+class LLUUID;
 
 class LLFloaterBulkyThumbs:
     public LLFloater
-- 
cgit v1.2.3


From 97d5063cb1e5474d2d5aa65872c9a608a1207905 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 2 Aug 2023 14:27:25 +0300
Subject: SL-19982 Update font for menu items; show object's name in lsl editor

---
 indra/llui/llkeywords.cpp                          |  4 +-
 indra/llui/llmenugl.cpp                            |  4 +-
 indra/llui/llmenugl.h                              |  7 ++-
 indra/newview/llpanelobjectinventory.cpp           |  6 +++
 indra/newview/llpreviewscript.cpp                  | 51 +++++++++++++++++++++-
 indra/newview/llpreviewscript.h                    | 12 +++++
 .../default/xui/en/floater_live_lsleditor.xml      | 19 +++++++-
 .../default/xui/en/floater_script_preview.xml      |  2 +-
 .../skins/default/xui/en/panel_script_ed.xml       |  3 ++
 .../newview/skins/default/xui/en/widgets/menu.xml  |  1 +
 10 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 56e0c4f0f8..341ddb83f3 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -501,7 +501,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW
 		{
 			if( *cur == '\n' )
 			{
-				LLTextSegmentPtr text_segment = new LLLineBreakTextSegment(cur-base);
+				LLTextSegmentPtr text_segment = new LLLineBreakTextSegment(style, cur-base);
 				text_segment->setToken( 0 );
 				insertSegment( *seg_list, text_segment, text_len, style, editor);
 				cur++;
@@ -712,7 +712,7 @@ void LLKeywords::insertSegments(const LLWString& wtext, std::vector<LLTextSegmen
 			insertSegment( seg_list, text_segment, text_len, style, editor);
 		}
 
-		LLTextSegmentPtr text_segment = new LLLineBreakTextSegment(pos);
+		LLTextSegmentPtr text_segment = new LLLineBreakTextSegment(style, pos);
 		text_segment->setToken( cur_token );
 		insertSegment( seg_list, text_segment, text_len, style, editor);
 
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 33c4b6ec73..99dbdcf775 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1777,7 +1777,8 @@ LLMenuGL::LLMenuGL(const LLMenuGL::Params& p)
 	mNeedsArrange(FALSE),
 	mAlwaysShowMenu(FALSE),
 	mResetScrollPositionOnShow(true),
-	mShortcutPad(p.shortcut_pad)
+	mShortcutPad(p.shortcut_pad),
+    mFont(p.font)
 {
 	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
 	boost::char_separator<char> sep("_");
@@ -3636,6 +3637,7 @@ BOOL LLMenuBarGL::appendMenu( LLMenuGL* menu )
 	p.disabled_color=LLUIColorTable::instance().getColor("MenuItemDisabledColor");
 	p.highlight_bg_color=LLUIColorTable::instance().getColor("MenuItemHighlightBgColor");
 	p.highlight_fg_color=LLUIColorTable::instance().getColor("MenuItemHighlightFgColor");
+    p.font = menu->getFont();
 
 	LLMenuItemBranchDownGL* branch = LLUICtrlFactory::create<LLMenuItemBranchDownGL>(p);
 	success &= branch->addToAcceleratorList(&mAccelerators);
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 9d3be8d94f..8194501f79 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -555,7 +555,9 @@ public:
 	// add a context menu branch
 	BOOL appendContextSubMenu(LLMenuGL *menu);
 
-protected:
+    const LLFontGL *getFont() const { return mFont; }
+
+  protected:
 	void createSpilloverBranch();
 	void cleanupSpilloverBranch();
 	// Add the menu item to this menu.
@@ -587,6 +589,9 @@ protected:
 	BOOL			mKeepFixedSize;
 	BOOL			mNeedsArrange;
 
+    // Font for top menu items only
+    const LLFontGL* mFont;
+
 private:
 
 
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 6a82a3b35d..d935c01eb8 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -960,9 +960,15 @@ void LLTaskLSLBridge::openItem()
 		LLSD floater_key;
 		floater_key["taskid"] = mPanel->getTaskUUID();
 		floater_key["itemid"] = mUUID;
+
 		LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key, TAKE_FOCUS_YES);
 		if (preview)
 		{
+            LLSelectNode *node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, TRUE);
+            if (node && node->mValid)
+            {
+                preview->setObjectName(node->mName);
+            }
 			preview->setObjectID(mPanel->getTaskUUID());
 		}
 	}
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 2add126b2d..62281d58f8 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -324,6 +324,38 @@ void LLFloaterScriptSearch::onSearchBoxCommit()
 	}
 }
 
+/// ---------------------------------------------------------------------------
+
+class LLScriptMovedObserver : public LLInventoryObserver
+{
+  public:
+    LLScriptMovedObserver(LLPreviewLSL *floater) : mPreview(floater) { gInventory.addObserver(this); }
+    virtual ~LLScriptMovedObserver() { gInventory.removeObserver(this); }
+    virtual void changed(U32 mask);
+
+  private:
+    LLPreviewLSL *mPreview;
+};
+
+void LLScriptMovedObserver::changed(U32 mask)
+{
+    const std::set<LLUUID> &mChangedItemIDs = gInventory.getChangedIDs();
+    std::set<LLUUID>::const_iterator it;
+
+    const LLUUID &item_id = mPreview->getScriptID();
+
+    for (it = mChangedItemIDs.begin(); it != mChangedItemIDs.end(); it++)
+    {
+        if (*it == item_id)
+        {
+            if ((mask & (LLInventoryObserver::STRUCTURE)) != 0)
+            {
+                mPreview->setDirty();
+            }
+        }
+    }
+}
+
 /// ---------------------------------------------------------------------------
 /// LLScriptEdCore
 /// ---------------------------------------------------------------------------
@@ -1554,6 +1586,14 @@ LLPreviewLSL::LLPreviewLSL(const LLSD& key )
 	mPendingUploads(0)
 {
 	mFactoryMap["script panel"] = LLCallbackMap(LLPreviewLSL::createScriptEdPanel, this);
+
+    mItemObserver = new LLScriptMovedObserver(this);
+}
+
+LLPreviewLSL::~LLPreviewLSL() 
+{ 
+    delete mItemObserver;
+    mItemObserver = NULL;
 }
 
 // virtual
@@ -1584,7 +1624,12 @@ void LLPreviewLSL::draw()
 		setTitle(LLTrans::getString("ScriptWasDeleted"));
 		mScriptEd->setItemRemoved(TRUE);
 	}
-
+    if (mDirty) 
+    {
+        std::string item_path = get_category_path(item->getParentUUID());
+        getChild<LLUICtrl>("path_txt")->setValue(item_path);
+        getChild<LLUICtrl>("path_txt")->setToolTip(item_path);
+    }
 	LLPreview::draw();
 }
 // virtual
@@ -1870,7 +1915,8 @@ LLLiveLSLEditor::LLLiveLSLEditor(const LLSD& key) :
 	mPendingUploads(0),
 	mIsModifiable(FALSE),
 	mIsNew(false),
-	mIsSaving(FALSE)
+	mIsSaving(FALSE),
+    mObjectName("")
 {
 	mFactoryMap["script ed panel"] = LLCallbackMap(LLLiveLSLEditor::createScriptEdPanel, this);
 }
@@ -2007,6 +2053,7 @@ void LLLiveLSLEditor::loadAsset()
 			}
 
 			refreshFromItem();
+            getChild<LLUICtrl>("obj_name")->setValue(mObjectName);
 			// This is commented out, because we don't completely
 			// handle script exports yet.
 			/*
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 2e5b8ad9bb..36e5253fb6 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -53,6 +53,7 @@ class LLViewerInventoryItem;
 class LLScriptEdContainer;
 class LLFloaterGotoLine;
 class LLFloaterExperienceProfile;
+class LLScriptMovedObserver;
 
 class LLLiveLSLFile : public LLLiveFile
 {
@@ -227,6 +228,12 @@ class LLPreviewLSL : public LLScriptEdContainer
 {
 public:
 	LLPreviewLSL(const LLSD& key );
+    ~LLPreviewLSL();
+
+    LLUUID getScriptID() { return mItemUUID; }
+
+    void setDirty() { mDirty = true; }
+
 	virtual void callbackLSLCompileSucceeded();
 	virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
 
@@ -257,6 +264,8 @@ protected:
 	// Can safely close only after both text and bytecode are uploaded
 	S32 mPendingUploads;
 
+    LLScriptMovedObserver* mItemObserver;
+
 };
 
 
@@ -289,6 +298,8 @@ public:
 	void requestExperiences();
 	void experienceChanged();
 	void addAssociatedExperience(const LLSD& experience);
+
+    void setObjectName(std::string name) { mObjectName = name; }
 	
 private:
 	virtual BOOL canClose();
@@ -347,6 +358,7 @@ private:
 	LLSD			mExperienceIds;
 
 	LLHandle<LLFloater> mExperienceProfile;
+    std::string mObjectName;
 };
 
 #endif  // LL_LLPREVIEWSCRIPT_H
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index e8826034f6..88173e68fa 100644
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -4,7 +4,7 @@
   bevel_style="none"
   border_style="line"
   can_resize="true"
-  height="582"
+  height="607"
   layout="topleft"
   min_height="271"
   min_width="328"
@@ -45,6 +45,21 @@
     name="loading">
     Loading...
   </floater.string>
+  <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   width="490"
+   use_ellipses="true"
+   font="SansSerif"
+   height="18"
+   layout="topleft"
+   left="13"
+   name="obj_name"
+   text_color="white"
+   top="21">
+    Object name
+  </text>
   <panel
     bevel_style="none"
      
@@ -54,7 +69,7 @@
     layout="topleft"
     left="10"
     name="script ed panel"
-    top="16"
+    top_pad="2"
     width="501" />
   <button
     follows="left|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index 5bec45e666..91c18035db 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -40,7 +40,7 @@
      width="490"
      use_ellipses="true"
      font="SansSerif"
-     height="19"
+     height="18"
      layout="topleft"
      left="13"
      name="path_txt"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index be20cfd880..4ea4a4f38d 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -44,6 +44,7 @@
       layout="topleft"
       left="0"
       mouse_opaque="false"
+      font="SansSerif"
       name="File"
       width="138">
       <menu_item_call
@@ -74,6 +75,7 @@
       label="Edit"
       layout="topleft"
       mouse_opaque="false"
+      font="SansSerif"
       name="Edit"
       width="139">
       <menu_item_call
@@ -134,6 +136,7 @@
       label="Help"
       layout="topleft"
       mouse_opaque="false"
+      font="SansSerif"
       name="Help"
       width="112">
       <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml
index 13ac84beb2..0e2b478aa5 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu.xml
@@ -4,5 +4,6 @@
       bg_visible="true"
       drop_shadow="true"
       tear_off="false"
+      font="SansSerifSmall" 
       shortcut_pad="15">
 </menu>
-- 
cgit v1.2.3


From ce0274937f8f5446b38525bdc314259c16f13f3c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 2 Aug 2023 14:43:41 +0300
Subject: SL-19982 update default help topic

---
 indra/newview/llpreviewscript.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 62281d58f8..1666bfebd4 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -829,7 +829,7 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
 
 	LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
 
-	url_string.setArg("[LSL_STRING]", help_string);
+	url_string.setArg("[LSL_STRING]", help_string.empty() ? HELP_LSL_PORTAL_TOPIC : help_string);
 
 	addHelpItemToHistory(help_string);
 
-- 
cgit v1.2.3


From 03ca9468036fc65e1a75d323bfb6d90b410a304b Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 2 Aug 2023 17:34:56 -0700
Subject: SL-20109: now lets user copy a list of items or list of folder of
 items, copy a list of texture of list of folders of textures, then combine
 them and find matches by name - saving each match with the name, item ID and
 thumbnail texture ID - next is actually writing the thumbnails

---
 indra/newview/llfloaterbulkythumbs.cpp             | 249 +++++++++++++++++++--
 indra/newview/llfloaterbulkythumbs.h               |  20 +-
 .../skins/default/xui/en/floater_bulky_thumbs.xml  |  32 ++-
 3 files changed, 271 insertions(+), 30 deletions(-)

diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
index 64661c6b40..4a6953d96c 100644
--- a/indra/newview/llfloaterbulkythumbs.cpp
+++ b/indra/newview/llfloaterbulkythumbs.cpp
@@ -36,6 +36,7 @@
 #include "lluictrlfactory.h"
 #include "llclipboard.h"
 #include "llinventorymodel.h"
+#include "llinventoryfunctions.h"
 #include "lltexteditor.h"
 #include "lluuid.h"
 
@@ -44,29 +45,80 @@ LLFloaterBulkyThumbs::LLFloaterBulkyThumbs(const LLSD& key)
 {
 }
 
-LLFloaterBulkyThumbs::~LLFloaterBulkyThumbs() {}
+LLFloaterBulkyThumbs::~LLFloaterBulkyThumbs()
+{
+}
 
 BOOL LLFloaterBulkyThumbs::postBuild()
 {
-    mPasteFromInventoryBtn = getChild<LLUICtrl>("paste_from_inventory");
-    mPasteFromInventoryBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteFromInventory, this));
+    mPasteItemsBtn = getChild<LLUICtrl>("paste_items_btn");
+    mPasteItemsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteItems, this));
+
+    mPasteTexturesBtn = getChild<LLUICtrl>("paste_textures_btn");
+    mPasteTexturesBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteTextures, this));
 
     mInventoryItems = getChild<LLTextEditor>("inventory_items");
-    mInventoryItems->setMaxTextLength(0x8000);
-    mInventoryItems->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onCommitInventoryItems, this));
+    mInventoryItems->setMaxTextLength(0xffff * 0x10);
 
     mProcessBulkyThumbsBtn = getChild<LLUICtrl>("process_bulky_thumbs");
     mProcessBulkyThumbsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onProcessBulkyThumbs, this));
     mProcessBulkyThumbsBtn->setEnabled(false);
 
+    mWriteBulkyThumbsBtn = getChild<LLUICtrl>("write_bulky_thumbs");
+    mWriteBulkyThumbsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onWriteBulkyThumbs, this));
+    mWriteBulkyThumbsBtn->setEnabled(false);
+
     return true;
 }
 
+void LLFloaterBulkyThumbs::recordInventoryItemEntry(LLViewerInventoryItem* item)
+{
+    const std::string name = item->getName();
+
+    std::map<std::string, LLUUID>::iterator iter = mItemNamesIDs.find(name);
+    if (iter == mItemNamesIDs.end())
+    {
+        LLUUID id = item->getUUID();
+        mItemNamesIDs.insert({name, id});
+
+        std::string output_line = "ITEM: ";
+        output_line += name;
+        output_line += "|";
+        output_line += id.asString();
+        output_line +=  "\n";
+        mInventoryItems->appendText(output_line, false);
+    }
+    else
+    {
+        // dupe - do not save
+    }
+}
 
-void LLFloaterBulkyThumbs::onPasteFromInventory()
+void LLFloaterBulkyThumbs::recordTextureItemEntry(LLViewerInventoryItem* item)
 {
-    std::cout << "onPasteFromInventory" << std::endl;
+    const std::string name = item->getName();
 
+    std::map<std::string, LLUUID>::iterator iter = mTextureNamesIDs.find(name);
+    if (iter == mTextureNamesIDs.end())
+    {
+        LLUUID id = item->getUUID();
+        mTextureNamesIDs.insert({name, id});
+
+        std::string output_line = "TEXR: ";
+        output_line += name;
+        output_line += "|";
+        output_line += id.asString();
+        output_line +=  "\n";
+        mInventoryItems->appendText(output_line, false);
+    }
+    else
+    {
+        // dupe - do not save
+    }
+}
+
+void LLFloaterBulkyThumbs::onPasteItems()
+{
     if (!LLClipboard::instance().hasContents())
     {
         return;
@@ -78,36 +130,197 @@ void LLFloaterBulkyThumbs::onPasteFromInventory()
 
     if (count > 0)
     {
-        mInventoryItems->clear();
-
         for (size_t i = 0; i < count; i++)
         {
             const LLUUID& item_id = objects.at(i);
 
-            const LLInventoryItem* item = gInventory.getItem(item_id);
+            const LLInventoryCategory* cat = gInventory.getCategory(item_id);
+            if (cat)
+            {
+                LLInventoryModel::cat_array_t cat_array;
+                LLInventoryModel::item_array_t item_array;
+                LLIsType is_object(LLAssetType::AT_OBJECT);
+                gInventory.collectDescendentsIf(cat->getUUID(),
+                                                cat_array,
+                                                item_array,
+                                                LLInventoryModel::EXCLUDE_TRASH,
+                                                is_object);
+
+
+                for (size_t i = 0; i < item_array.size(); i++)
+                {
+                    LLViewerInventoryItem* item = item_array.at(i);
+                    recordInventoryItemEntry(item);
+                }
+            }
+
+            LLViewerInventoryItem* item = gInventory.getItem(item_id);
             if (item)
             {
                 if (item->getType() == LLAssetType::AT_OBJECT)
                 {
-                    const std::string name = item->getName();
-                    const std::string item_asset_uuid_str = item->getAssetUUID().asString();
-                    const std::string thumb_uuid_str = item->getThumbnailUUID().asString();
-                    const std::string output_line = name + "|" + item_asset_uuid_str + "|" + thumb_uuid_str;
-                    mInventoryItems->appendText(output_line, "\n");
+                    recordInventoryItemEntry(item);
                 }
             }
         }
 
+        mInventoryItems->setCursorAndScrollToEnd();
+
+        mProcessBulkyThumbsBtn->setEnabled(true);
+    }
+}
+
+void LLFloaterBulkyThumbs::onPasteTextures()
+{
+    if (!LLClipboard::instance().hasContents())
+    {
+        return;
+    }
+
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+    size_t count = objects.size();
+
+    if (count > 0)
+    {
+        for (size_t i = 0; i < count; i++)
+        {
+            const LLUUID& item_id = objects.at(i);
+
+            const LLInventoryCategory* cat = gInventory.getCategory(item_id);
+            if (cat)
+            {
+                LLInventoryModel::cat_array_t cat_array;
+                LLInventoryModel::item_array_t item_array;
+                LLIsType is_texture(LLAssetType::AT_TEXTURE);
+                gInventory.collectDescendentsIf(cat->getUUID(),
+                                                cat_array,
+                                                item_array,
+                                                LLInventoryModel::EXCLUDE_TRASH,
+                                                is_texture);
+
+                std::cout << "CAT: found " << cat_array.size() << " additional categories" << std::endl;
+                std::cout << "ITEM: found " << item_array.size() << " items" << std::endl;
+                for (size_t i = 0; i < item_array.size(); i++)
+                {
+                    LLViewerInventoryItem* item = item_array.at(i);
+                    recordTextureItemEntry(item);
+                }
+            }
+
+            LLViewerInventoryItem* item = gInventory.getItem(item_id);
+            if (item)
+            {
+                if (item->getType() == LLAssetType::AT_TEXTURE)
+                {
+                    recordTextureItemEntry(item);
+                }
+            }
+        }
+
+        mInventoryItems->setCursorAndScrollToEnd();
+
         mProcessBulkyThumbsBtn->setEnabled(true);
     }
 }
 
 void LLFloaterBulkyThumbs::onProcessBulkyThumbs()
 {
-    std::cout << "onProcessBulkyThumbs" << std::endl;
+    std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
+    while (item_iter != mItemNamesIDs.end())
+    {
+        std::string output_line = "PROCESSING: ";
+        std::string item_name = (*item_iter).first;
+        output_line += item_name;
+        output_line +=  "\n";
+        mInventoryItems->appendText(output_line, false);
+
+        bool found = false;
+        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.begin();
+        while (texture_iter != mTextureNamesIDs.end())
+        {
+            std::string output_line = "    COMPARING WITH: ";
+            std::string texture_name = (*texture_iter).first;
+            output_line += texture_name;
+
+            if (item_name == texture_name)
+            {
+                output_line += " MATCH";
+                found = true;
+                output_line +=  "\n";
+                mInventoryItems->appendText(output_line, false);
+                break;
+            }
+            else
+            {
+                output_line += " NO MATCH";
+            }
+            output_line +=  "\n";
+            mInventoryItems->appendText(output_line, false);
+            mInventoryItems->setCursorAndScrollToEnd();
+
+
+            ++texture_iter;
+        }
+
+        if (found == true)
+        {
+            mNameItemIDTextureId.insert({item_name, {(*item_iter).second, (*texture_iter).second}});
+        }
+        else
+        {
+            std::string output_line = "WARNING: ";
+            output_line += "No texture found for ";
+            output_line += item_name;
+            output_line +=  "\n";
+            mInventoryItems->appendText(output_line, false);
+            mInventoryItems->setCursorAndScrollToEnd();
+
+        }
+
+        ++item_iter;
+    }
+
+    mInventoryItems->appendText("Finished - final list is", true);
+    std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
+    while (iter != mNameItemIDTextureId.end())
+    {
+        std::string output_line = (*iter).first;
+        output_line += "\n";
+        output_line += "item ID: ";
+        output_line += ((*iter).second).first.asString();
+        output_line += "\n";
+        output_line += "thumbnail texture ID: ";
+        output_line += ((*iter).second).second.asString();
+        output_line +=  "\n";
+        mInventoryItems->appendText(output_line, true);
+
+        ++iter;
+    }
+    mInventoryItems->setCursorAndScrollToEnd();
+
+    mWriteBulkyThumbsBtn->setEnabled(true);
 }
 
-void LLFloaterBulkyThumbs::onCommitInventoryItems()
+void LLFloaterBulkyThumbs::onWriteBulkyThumbs()
 {
-    std::cout << "onCommitInventoryItems" << std::endl;
+	// look at  LLFloaterChangeItemThumbnail::onOpen(const LLSD& key)
+
+    mInventoryItems->appendText("Writing thumbnails", true);
+    std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
+    while (iter != mNameItemIDTextureId.end())
+    {
+        std::string output_line = (*iter).first;
+        output_line += "\n";
+        output_line += "item ID: ";
+        output_line += ((*iter).second).first.asString();
+        output_line += "\n";
+        output_line += "thumbnail texture ID: ";
+        output_line += ((*iter).second).second.asString();
+        output_line +=  "\n";
+        mInventoryItems->appendText(output_line, true);
+
+        ++iter;
+    }
+    mInventoryItems->setCursorAndScrollToEnd();
 }
diff --git a/indra/newview/llfloaterbulkythumbs.h b/indra/newview/llfloaterbulkythumbs.h
index fbfc95f11b..f5390a3791 100644
--- a/indra/newview/llfloaterbulkythumbs.h
+++ b/indra/newview/llfloaterbulkythumbs.h
@@ -30,6 +30,7 @@
 
 #include "llfloater.h"
 class LLTextEditor;
+class LLViewerInventoryItem;
 class LLUUID;
 
 class LLFloaterBulkyThumbs:
@@ -41,14 +42,27 @@ class LLFloaterBulkyThumbs:
         BOOL postBuild() override;
         ~LLFloaterBulkyThumbs();
 
-        LLUICtrl* mPasteFromInventoryBtn;
-        void onPasteFromInventory();
+        LLUICtrl* mPasteItemsBtn;
+        void onPasteItems();
+
+        LLUICtrl* mPasteTexturesBtn;
+        void onPasteTextures();
 
         LLTextEditor* mInventoryItems;
-        void onCommitInventoryItems();
 
         LLUICtrl* mProcessBulkyThumbsBtn;
         void onProcessBulkyThumbs();
+
+        LLUICtrl* mWriteBulkyThumbsBtn;
+        void onWriteBulkyThumbs();
+
+        void recordInventoryItemEntry(LLViewerInventoryItem* item);
+        void recordTextureItemEntry(LLViewerInventoryItem* item);
+
+        std::map<std::string, LLUUID> mItemNamesIDs;
+        std::map<std::string, LLUUID> mTextureNamesIDs;
+
+        std::map<std::string, std::pair< LLUUID, LLUUID>> mNameItemIDTextureId;
 };
 
 #endif // LL_LLFLOATERBULKYTHUMBS_H
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index ecb07db8fa..ab34e35dac 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -5,38 +5,52 @@
  height="600"
  layout="topleft"
  min_height="175"
- min_width="250"
+ min_width="500"
  name="contents"
  help_topic="contents"
  title="BULKY THUMBS"
  width="500">
 	<button follows="left|top"
 		height="20"
-		label="Paste from Inventory copy"
+		label="Paste item info from Inventory"
 		layout="topleft"
 		left="10"
-		name="paste_from_inventory"
+		name="paste_items_btn"
 		top="26	"
 		width="200" />
 
+	<button follows="left|top"
+	height="20"
+	label="Paste texture info from Inventory"
+	layout="topleft"
+	left="250"
+	name="paste_textures_btn"
+	top="26	"
+	width="200" />
+	
 	<text_editor
    height="510"
    follows="top|left|right|bottom"
-   left_delta="0"
+   left="10"
    name="inventory_items"
    top_pad="10"
    width="480">
-Entry 1
-Entry 2
-Entry 3
-Entry 4
 	</text_editor>
 	<button follows="left|bottom"
 		height="20"
-		label="Process!"
+		label="Merge items and textures"
 		layout="bottomleft"
 		left="10"
 		name="process_bulky_thumbs"
 		bottom="8"
 		width="200" />
+
+	<button follows="left|bottom"
+	height="20"
+	label="Write Thumbnails"
+	layout="bottomleft"
+	left="250"
+	name="write_bulky_thumbs"
+	bottom="8"
+	width="200" />
 </floater>
-- 
cgit v1.2.3


From c92d6e3f154ca11206a868a29afea0a0ffcc0327 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 2 Aug 2023 18:13:14 -0700
Subject: SL-20109: Hacked in some code to write thumbnails now - had to change
 the ID i saved for the texture from the object ID to the asset ID and then it
 worked for 3 test items.  Next up, tidy up the code, remove hacks and do a
 run on a local copy of the main SENRA inventory

---
 indra/newview/llfloaterbulkythumbs.cpp | 60 +++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
index 4a6953d96c..f7ee538033 100644
--- a/indra/newview/llfloaterbulkythumbs.cpp
+++ b/indra/newview/llfloaterbulkythumbs.cpp
@@ -39,6 +39,7 @@
 #include "llinventoryfunctions.h"
 #include "lltexteditor.h"
 #include "lluuid.h"
+#include "llaisapi.h"
 
 LLFloaterBulkyThumbs::LLFloaterBulkyThumbs(const LLSD& key)
     :   LLFloater("floater_bulky_thumbs")
@@ -101,7 +102,8 @@ void LLFloaterBulkyThumbs::recordTextureItemEntry(LLViewerInventoryItem* item)
     std::map<std::string, LLUUID>::iterator iter = mTextureNamesIDs.find(name);
     if (iter == mTextureNamesIDs.end())
     {
-        LLUUID id = item->getUUID();
+        //LLUUID id = item->getUUID();
+        LLUUID id = item->getAssetUUID();
         mTextureNamesIDs.insert({name, id});
 
         std::string output_line = "TEXR: ";
@@ -199,8 +201,6 @@ void LLFloaterBulkyThumbs::onPasteTextures()
                                                 LLInventoryModel::EXCLUDE_TRASH,
                                                 is_texture);
 
-                std::cout << "CAT: found " << cat_array.size() << " additional categories" << std::endl;
-                std::cout << "ITEM: found " << item_array.size() << " items" << std::endl;
                 for (size_t i = 0; i < item_array.size(); i++)
                 {
                     LLViewerInventoryItem* item = item_array.at(i);
@@ -302,9 +302,55 @@ void LLFloaterBulkyThumbs::onProcessBulkyThumbs()
     mWriteBulkyThumbsBtn->setEnabled(true);
 }
 
+#if 1
+// *TODO$: LLInventoryCallback should be deprecated to conform to the new boost::bind/coroutine model.
+// temp code in transition
+void bulkyInventoryCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
+{
+    if (cb.notNull())
+    {
+        cb->fire(id);
+    }
+}
+#endif
+
+bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
+{
+    if (AISAPI::isAvailable())
+    {
+
+        LLSD updates;
+        updates["thumbnail"] = LLSD().with("asset_id", thumbnail_asset_id.asString());
+
+        LLPointer<LLInventoryCallback> cb;
+
+        AISAPI::completion_t cr = boost::bind(&bulkyInventoryCb, cb, _1);
+        AISAPI::UpdateItem(item_id, updates, cr);
+
+        return true;
+    }
+    else
+    {
+        LL_WARNS() << "Unable to write inventory thumbnail because AIS API is not available" << LL_ENDL;
+        return false;
+    }
+}
+
 void LLFloaterBulkyThumbs::onWriteBulkyThumbs()
 {
-	// look at  LLFloaterChangeItemThumbnail::onOpen(const LLSD& key)
+    // look at void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id, LLInventoryObject* obj)
+
+    /**
+    * Results I get - compare with what the manual image update code gives us
+        Senra Blake - bottom - sweatpants - green
+        item ID: 1daf6aab-e42f-42aa-5a85-4d73458a355d
+        thumbnail texture ID: cba71b7c-2335-e15c-7646-ead0f9e817fb
+
+			Correct values (from mnala path) are:
+			Updating thumbnail forSenra Blake - bottom - sweatpants - green: 
+			ID: 1daf6aab-e42f-42aa-5a85-4d73458a355d 
+			THUMB_ID: 8f5db9e7-8d09-c8be-0efd-0a5e4f3c925d
+    */
 
     mInventoryItems->appendText("Writing thumbnails", true);
     std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
@@ -320,6 +366,12 @@ void LLFloaterBulkyThumbs::onWriteBulkyThumbs()
         output_line +=  "\n";
         mInventoryItems->appendText(output_line, true);
 
+
+        LLUUID item_id = ((*iter).second).first;
+        LLUUID thumbnail_asset_id = ((*iter).second).second;
+
+        writeThumbnailID(item_id, thumbnail_asset_id);
+
         ++iter;
     }
     mInventoryItems->setCursorAndScrollToEnd();
-- 
cgit v1.2.3


From 2a87b64d26fba502e6b8514084d91b1f79965fd1 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 3 Aug 2023 16:01:45 +0200
Subject: SL-19887 Water cuts avatar's name bubble

---
 indra/newview/llhudnametag.cpp |  9 +++++++++
 indra/newview/llhudnametag.h   |  5 +++--
 indra/newview/llvoavatar.cpp   | 20 +++++++++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llhudnametag.cpp b/indra/newview/llhudnametag.cpp
index ab6a64157c..a45246eedc 100644
--- a/indra/newview/llhudnametag.cpp
+++ b/indra/newview/llhudnametag.cpp
@@ -898,6 +898,15 @@ void LLHUDNameTag::shift(const LLVector3& offset)
 	mPositionAgent += offset;
 }
 
+F32 LLHUDNameTag::getWorldHeight() const
+{
+	const LLViewerCamera* camera = LLViewerCamera::getInstance();
+	F32 height_meters = mLastDistance * (F32)tan(camera->getView() / 2.f);
+	F32 height_pixels = camera->getViewHeightInPixels() / 2.f;
+	F32 meters_per_pixel = height_meters / height_pixels;
+	return mHeight * meters_per_pixel * gViewerWindow->getDisplayScale().mV[VY];
+}
+
 //static 
 void LLHUDNameTag::addPickable(std::set<LLViewerObject*> &pick_list)
 {
diff --git a/indra/newview/llhudnametag.h b/indra/newview/llhudnametag.h
index 361e4d4f4b..592ab5518f 100644
--- a/indra/newview/llhudnametag.h
+++ b/indra/newview/llhudnametag.h
@@ -127,11 +127,12 @@ public:
 	/*virtual*/ void markDead();
 	friend class LLHUDObject;
 	/*virtual*/ F32 getDistance() const { return mLastDistance; }
-	S32  getLOD() { return mLOD; }
-	BOOL getVisible() { return mVisible; }
+	S32  getLOD() const { return mLOD; }
+	BOOL getVisible() const { return mVisible; }
 	BOOL getHidden() const { return mHidden; }
 	void setHidden( BOOL hide ) { mHidden = hide; }
 	void shift(const LLVector3& offset);
+	F32 getWorldHeight() const;
 
 	BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a& intersection, BOOL debug_render = FALSE);
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 305c489cc8..250366dbea 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3612,7 +3612,6 @@ void LLVOAvatar::idleUpdateNameTagPosition(const LLVector3& root_pos_last)
 	local_camera_up.normalize();
 	local_camera_up = local_camera_up * inv_root_rot;
 
-
 	// position is based on head position, does not require mAvatarOffset here. - Nyx
 	LLVector3 avatar_ellipsoid(mBodySize.mV[VX] * 0.4f,
 								mBodySize.mV[VY] * 0.4f,
@@ -3634,6 +3633,25 @@ void LLVOAvatar::idleUpdateNameTagPosition(const LLVector3& root_pos_last)
 	name_position += (local_camera_up * root_rot) - (projected_vec(local_camera_at * root_rot, camera_to_av));	
 	name_position += pixel_up_vec * NAMETAG_VERTICAL_SCREEN_OFFSET;
 
+	const F32 water_height = getRegion()->getWaterHeight();
+	static const F32 WATER_HEIGHT_DELTA = 0.25f;
+	if (name_position[VZ] < water_height + WATER_HEIGHT_DELTA)
+	{
+		if (LLViewerCamera::getInstance()->getOrigin()[VZ] >= water_height)
+		{
+			name_position[VZ] = water_height;
+		}
+		else // both camera and HUD are below watermark
+		{
+			F32 name_world_height = mNameText->getWorldHeight();
+			F32 max_z_position = water_height - name_world_height;
+			if (name_position[VZ] > max_z_position)
+			{
+				name_position[VZ] = max_z_position;
+			}
+		}
+	}
+
 	mNameText->setPositionAgent(name_position);				
 }
 
-- 
cgit v1.2.3


From a26573fefe2a3599c1c920722dec519c9481dc64 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 3 Aug 2023 20:40:40 +0300
Subject: SL-18049 Part 1; Allow voice to be enabled in second instance

---
 indra/newview/llappviewer.cpp                      |  9 ++--
 indra/newview/llpanelvolumepulldown.cpp            | 31 +++++++----
 indra/newview/llpanelvolumepulldown.h              |  2 +-
 indra/newview/llvoiceclient.cpp                    | 10 ++++
 indra/newview/llvoiceclient.h                      |  2 +
 indra/newview/llvoicevivox.cpp                     | 62 +++++++++++++++-------
 indra/newview/llvoicevivox.h                       |  3 ++
 .../skins/default/xui/en/panel_volume_pulldown.xml | 13 +++--
 8 files changed, 93 insertions(+), 39 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e70fcb6e86..e9ba0550b0 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2945,13 +2945,14 @@ bool LLAppViewer::initConfiguration()
 
 	if (mSecondInstance)
 	{
-		// This is the second instance of SL. Turn off voice support,
+		// This is the second instance of SL. Mute voice,
 		// but make sure the setting is *not* persisted.
-		LLControlVariable* disable_voice = gSavedSettings.getControl("CmdLineDisableVoice");
-		if(disable_voice)
+		// Also see LLVivoxVoiceClient::voiceEnabled()
+		LLControlVariable* enable_voice = gSavedSettings.getControl("EnableVoiceChat");
+		if(enable_voice)
 		{
 			const BOOL DO_NOT_PERSIST = FALSE;
-			disable_voice->setValue(LLSD(TRUE), DO_NOT_PERSIST);
+			enable_voice->setValue(LLSD(FALSE), DO_NOT_PERSIST);
 		}
 	}
 
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
index 6f11e76a72..17975a6e6d 100644
--- a/indra/newview/llpanelvolumepulldown.cpp
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -40,6 +40,7 @@
 #include "llfloaterreg.h"
 #include "llfloaterpreference.h"
 #include "llsliderctrl.h"
+#include "llvoicevivox.h"
 
 ///----------------------------------------------------------------------------
 /// Class LLPanelVolumePulldown
@@ -50,7 +51,7 @@ LLPanelVolumePulldown::LLPanelVolumePulldown()
 {
 	mCommitCallbackRegistrar.add("Vol.setControlFalse", boost::bind(&LLPanelVolumePulldown::setControlFalse, this, _2));
 	mCommitCallbackRegistrar.add("Vol.SetSounds", boost::bind(&LLPanelVolumePulldown::onClickSetSounds, this));
-	mCommitCallbackRegistrar.add("Vol.updateMediaAutoPlayCheckbox",	boost::bind(&LLPanelVolumePulldown::updateMediaAutoPlayCheckbox, this, _1));
+	mCommitCallbackRegistrar.add("Vol.updateCheckbox",	boost::bind(&LLPanelVolumePulldown::updateCheckbox, this, _1, _2));
 	mCommitCallbackRegistrar.add("Vol.GoAudioPrefs", boost::bind(&LLPanelVolumePulldown::onAdvancedButtonClick, this, _2));
 	buildFromFile( "panel_volume_pulldown.xml");
 }
@@ -90,19 +91,27 @@ void LLPanelVolumePulldown::setControlFalse(const LLSD& user_data)
 		control->set(LLSD(FALSE));
 }
 
-void LLPanelVolumePulldown::updateMediaAutoPlayCheckbox(LLUICtrl* ctrl)
+void LLPanelVolumePulldown::updateCheckbox(LLUICtrl* ctrl, const LLSD& user_data)
 {
-	std::string name = ctrl->getName();
+    std::string control_name = user_data.asString();
+    if (control_name == "MediaAutoPlay")
+    {
+        std::string name = ctrl->getName();
 
-	// Disable "Allow Media to auto play" only when both
-	// "Streaming Music" and "Media" are unchecked. STORM-513.
-	if ((name == "enable_music") || (name == "enable_media"))
-	{
-		bool music_enabled = getChild<LLCheckBoxCtrl>("enable_music")->get();
-		bool media_enabled = getChild<LLCheckBoxCtrl>("enable_media")->get();
+        // Disable "Allow Media to auto play" only when both
+        // "Streaming Music" and "Media" are unchecked. STORM-513.
+        if ((name == "enable_music") || (name == "enable_media"))
+        {
+            bool music_enabled = getChild<LLCheckBoxCtrl>("enable_music")->get();
+            bool media_enabled = getChild<LLCheckBoxCtrl>("enable_media")->get();
 
-		getChild<LLCheckBoxCtrl>("media_auto_play_combo")->setEnabled(music_enabled || media_enabled);
-	}
+            getChild<LLCheckBoxCtrl>("media_auto_play_combo")->setEnabled(music_enabled || media_enabled);
+        }
+    }
+    else if (control_name == "VoiceChat")
+    {
+        LLVivoxVoiceClient::unmuteVoiceInstance();
+    }
 }
 
 void LLPanelVolumePulldown::onClickSetSounds()
diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h
index e907bb0c78..3243d2e968 100644
--- a/indra/newview/llpanelvolumepulldown.h
+++ b/indra/newview/llpanelvolumepulldown.h
@@ -43,7 +43,7 @@ class LLPanelVolumePulldown : public LLPanelPulldown
 	void onClickSetSounds();
 	// Disables "Allow Media to auto play" check box only when both
 	// "Streaming Music" and "Media" are unchecked. Otherwise enables it.
-	void updateMediaAutoPlayCheckbox(LLUICtrl* ctrl);
+	void updateCheckbox(LLUICtrl* ctrl, const LLSD& user_data);
 	void onAdvancedButtonClick(const LLSD& user_data);
 };
 
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 150b556284..fab6ec3755 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -555,6 +555,16 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
     }
 }
 
+void LLVoiceClient::unmuteVoiceInstance()
+{
+    LLVivoxVoiceClient::unmuteVoiceInstance();
+}
+
+bool LLVoiceClient::isMutedVoiceInstance()
+{
+    return LLVivoxVoiceClient::isMutedVoiceInstance();
+}
+
 void LLVoiceClient::updateMicMuteLogic()
 {
 	// If not configured to use PTT, the mic should be open (otherwise the user will be unable to speak).
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index aa67502908..7788efb8e1 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -403,6 +403,8 @@ public:
 	void toggleUserPTTState(void);
 	void inputUserControlState(bool down);  // interpret any sort of up-down mic-open control input according to ptt-toggle prefs	
 	void setVoiceEnabled(bool enabled);
+    static void unmuteVoiceInstance();
+    static bool isMutedVoiceInstance();
 
 	void setUsePTT(bool usePTT);
 	void setPTTIsToggle(bool PTTIsToggle);
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 3725510b6a..c89fe81a85 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -277,6 +277,7 @@ static void killGateway()
 
 bool LLVivoxVoiceClient::sShuttingDown = false;
 bool LLVivoxVoiceClient::sConnected = false;
+bool LLVivoxVoiceClient::sVoiceInstanceMuted = false;
 LLPumpIO *LLVivoxVoiceClient::sPump = nullptr;
 
 LLVivoxVoiceClient::LLVivoxVoiceClient() :
@@ -354,6 +355,7 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
     sShuttingDown = false;
     sConnected = false;
     sPump = nullptr;
+    sVoiceInstanceMuted = LLAppViewer::instance()->isSecondInstance();
 
 	mSpeakerVolume = scale_speaker_volume(0);
 
@@ -951,32 +953,52 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
             // cause SLVoice's bind() call to fail with EADDRINUSE. We expect
             // that eventually the OS will time out previous ports, which is
             // why we cycle instead of incrementing indefinitely.
-            U32 portbase = gSavedSettings.getU32("VivoxVoicePort");
-            static U32 portoffset = 0;
+
+            static LLCachedControl<U32> portbase(gSavedSettings, "VivoxVoicePort");
+            static LLCachedControl<std::string> host(gSavedSettings, "VivoxVoiceHost");
+            static LLCachedControl<std::string> loglevel(gSavedSettings, "VivoxDebugLevel");
+            static LLCachedControl<std::string> log_folder(gSavedSettings, "VivoxLogDirectory");
+            static LLCachedControl<std::string> shutdown_timeout(gSavedSettings, "VivoxShutdownTimeout");
             static const U32 portrange = 100;
-            std::string host(gSavedSettings.getString("VivoxVoiceHost"));
-            U32 port = portbase + portoffset;
+            static U32 portoffset = 0;
+            U32 port = 0;
+
+            if (LLAppViewer::instance()->isSecondInstance())
+            {
+                // Ideally need to know amount of instances and
+                // to increment instance_offset on EADDRINUSE.
+                // But for now just use rand
+                static U32 instance_offset = portrange * ll_rand(20);
+                port = portbase + portoffset + portrange;
+            }
+            else
+            {
+                // leave main thread with exclusive port set
+                port = portbase + portoffset;
+            }
             portoffset = (portoffset + 1) % portrange;
             params.args.add("-i");
-            params.args.add(STRINGIZE(host << ':' << port));
+            params.args.add(STRINGIZE(host() << ':' << port));
 
-            std::string loglevel = gSavedSettings.getString("VivoxDebugLevel");
-            if (loglevel.empty())
+            params.args.add("-ll");
+            if (loglevel().empty())
             {
-                loglevel = "0";
+                params.args.add("0");
             }
-            params.args.add("-ll");
-            params.args.add(loglevel);
-
-            std::string log_folder = gSavedSettings.getString("VivoxLogDirectory");
-
-            if (log_folder.empty())
+            else
             {
-                log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+                params.args.add(loglevel);
             }
 
             params.args.add("-lf");
-            params.args.add(log_folder);
+            if (log_folder().empty())
+            {
+                params.args.add(gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ""));
+            }
+            else
+            {
+                params.args.add(log_folder);
+            }
 
             // set log file basename and .log
             params.args.add("-lp");
@@ -992,8 +1014,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
                 LLFile::rename(new_log, old_log);
             }
             
-            std::string shutdown_timeout = gSavedSettings.getString("VivoxShutdownTimeout");
-            if (!shutdown_timeout.empty())
+            if (!shutdown_timeout().empty())
             {
                 params.args.add("-st");
                 params.args.add(shutdown_timeout);
@@ -1016,7 +1037,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
 
             sGatewayPtr = LLProcess::create(params);
 
-            mDaemonHost = LLHost(host.c_str(), port);
+            mDaemonHost = LLHost(host().c_str(), port);
         }
         else
         {
@@ -5624,7 +5645,8 @@ bool LLVivoxVoiceClient::voiceEnabled()
 {
     return gSavedSettings.getBOOL("EnableVoiceChat") &&
           !gSavedSettings.getBOOL("CmdLineDisableVoice") &&
-          !gNonInteractive;
+          !gNonInteractive &&
+          !sVoiceInstanceMuted;
 }
 
 void LLVivoxVoiceClient::setLipSyncEnabled(BOOL enabled)
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index e3ab99c675..9a4023422b 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -172,6 +172,8 @@ public:
 	//@{
 	virtual bool voiceEnabled();
 	virtual void setVoiceEnabled(bool enabled);
+    static void unmuteVoiceInstance() { sVoiceInstanceMuted = false; }
+    static bool isMutedVoiceInstance() { return sVoiceInstanceMuted; }
 	virtual BOOL lipSyncEnabled();	
 	virtual void setLipSyncEnabled(BOOL enabled);
 	virtual void setMuteMic(bool muted);		// Set the mute state of the local mic.
@@ -917,6 +919,7 @@ private:
     // This variables can last longer than vivox in coroutines so we need them as static
     static bool sShuttingDown;
     static bool sConnected;
+    static bool sVoiceInstanceMuted; // Second+ instance of viewer starts muted
     static LLPumpIO* sPump;
 
     LLEventMailDrop mVivoxPump;
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index b4eb1ade94..c7be790406 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -199,7 +199,8 @@
         top_delta="2"
         width="350">
         <check_box.commit_callback
-            function="Vol.updateMediaAutoPlayCheckbox"/>
+            function="Vol.updateCheckbox"
+            parameter="MediaAutoPlay"/>
     </check_box>
     <slider
         control_name="AudioLevelMedia"
@@ -246,7 +247,8 @@
         name="enable_media"
         width="110">
         <check_box.commit_callback
-            function="Vol.updateMediaAutoPlayCheckbox"/>
+            function="Vol.updateCheckbox"
+            parameter="MediaAutoPlay"/>
     </check_box>
     <slider
         control_name="AudioLevelVoice"
@@ -292,5 +294,10 @@
         top_delta="2"
         left_pad="5"
         name="enable_voice_check"
-        width="110"/>
+        width="110"
+        >
+        <check_box.commit_callback
+            function="Vol.updateCheckbox"
+            parameter="VoiceChat"/>
+        </check_box>
 </panel>
-- 
cgit v1.2.3


From 08484cec5ac1933fdc689ddd3dcbca72229f8118 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 3 Aug 2023 22:42:37 +0300
Subject: SL-18049 Part 2; Added a button to preferences to enable sound when
 possible

---
 indra/newview/llpanelvoicedevicesettings.cpp       | 27 ++++++++++++++++++++--
 indra/newview/llpanelvoicedevicesettings.h         |  2 ++
 .../skins/default/xui/en/panel_sound_devices.xml   | 26 +++++++++++++++++++--
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index 28631e2b7b..5e1cf801b9 100644
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -70,11 +70,14 @@ BOOL LLPanelVoiceDeviceSettings::postBuild()
 
 	mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
 	mCtrlOutputDevices = getChild<LLComboBox>("voice_output_device");
+    mRetryBtn = getChild<LLButton>("retry_btn");
 
 	mCtrlInputDevices->setCommitCallback(
 		boost::bind(&LLPanelVoiceDeviceSettings::onCommitInputDevice, this));
 	mCtrlOutputDevices->setCommitCallback(
 		boost::bind(&LLPanelVoiceDeviceSettings::onCommitOutputDevice, this));
+    mRetryBtn->setCommitCallback(
+        boost::bind(&LLPanelVoiceDeviceSettings::onCommitRetry, this));
 
 	mLocalizedDeviceNames[DEFAULT_DEVICE]				= getString("default_text");
 	mLocalizedDeviceNames["No Device"]					= getString("name_no_device");
@@ -108,11 +111,25 @@ void LLPanelVoiceDeviceSettings::draw()
 
 	// let user know that volume indicator is not yet available
 	bool is_in_tuning_mode = LLVoiceClient::getInstance()->inTuningMode();
-	getChildView("wait_text")->setVisible( !is_in_tuning_mode && mUseTuningMode);
+    bool voice_enabled = LLVoiceClient::getInstance()->voiceEnabled();
+    if (voice_enabled)
+    {
+        getChildView("wait_text")->setVisible( !is_in_tuning_mode && mUseTuningMode);
+        getChildView("muted_text")->setVisible(FALSE);
+        mRetryBtn->setVisible(FALSE);
+    }
+    else
+    {
+        getChildView("wait_text")->setVisible(FALSE);
+        getChildView("muted_text")->setVisible(TRUE);
+
+        static LLCachedControl<bool> voice_enabled(gSavedSettings, "EnableVoiceChat");
+        mRetryBtn->setVisible(!voice_enabled || LLVoiceClient::isMutedVoiceInstance());
+    }
 
 	LLPanel::draw();
 
-	if (is_in_tuning_mode)
+	if (is_in_tuning_mode && voice_enabled)
 	{
 		const S32 num_bars = 5;
 		F32 voice_power = LLVoiceClient::getInstance()->tuningGetEnergy() / LLVoiceClient::OVERDRIVEN_POWER_LEVEL;
@@ -339,3 +356,9 @@ void LLPanelVoiceDeviceSettings::onInputDevicesClicked()
 {
 	LLVoiceClient::getInstance()->refreshDeviceLists(false);  // fill in the pop up menus again if needed.
 }
+
+void LLPanelVoiceDeviceSettings::onCommitRetry()
+{
+    gSavedSettings.setBOOL("EnableVoiceChat", TRUE);
+    LLVoiceClient::unmuteVoiceInstance();
+}
diff --git a/indra/newview/llpanelvoicedevicesettings.h b/indra/newview/llpanelvoicedevicesettings.h
index 355bc02b05..6b85d4e540 100644
--- a/indra/newview/llpanelvoicedevicesettings.h
+++ b/indra/newview/llpanelvoicedevicesettings.h
@@ -55,12 +55,14 @@ protected:
 	void onCommitOutputDevice();
 	void onOutputDevicesClicked();
 	void onInputDevicesClicked();
+    void onCommitRetry();
 
 	F32 mMicVolume;
 	std::string mInputDevice;
 	std::string mOutputDevice;
 	class LLComboBox		*mCtrlInputDevices;
 	class LLComboBox		*mCtrlOutputDevices;
+    class LLButton          *mRetryBtn;
 	BOOL mDevicesUpdated;
 	bool mUseTuningMode;
 	std::map<std::string, std::string> mLocalizedDeviceNames;
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
index 3dbb7fb7fc..bcb38a46cc 100644
--- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
@@ -122,7 +122,7 @@
      layout="topleft"
      left_pad="5"
      name="wait_text"
-     top_delta="-1"
+     top_delta="2"
      width="110">
         Please wait
     </text>
@@ -132,7 +132,7 @@
      layout="topleft"
      left_delta="0"
      name="bar0"
-     top_delta="-2"
+     top_delta="-5"
      width="20" />
   <locate
      follows="right|top"
@@ -166,4 +166,26 @@
      name="bar4"
      top_delta="0"
      width="20" />
+    <text
+     type="string"
+     name="muted_text"
+     text_color="EmphasisColor"
+     length="1"
+     follows="right|top"
+     height="18"
+     layout="topleft"
+     left_delta="-100"
+     top_delta="5"
+     width="70">
+        Muted
+    </text>
+    <button
+       follows="right|top"
+       height="23"
+       image_overlay="Refresh_Off"
+       layout="topleft"
+       left_pad="1"
+       name="retry_btn"
+       top_delta="-5"
+       width="23" />
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 4bef4f94c0ec89ef7b14bc267f52ba00a6dcdc2b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 4 Aug 2023 00:44:07 +0300
Subject: SL-18049 Part 3; Better indication when voice is muted

---
 indra/newview/llstatusbar.cpp                      |  24 +++++++++++++++++++++
 indra/newview/llstatusbar.h                        |   2 +-
 .../skins/default/textures/icons/VoiceMute_Off.png | Bin 0 -> 753 bytes
 indra/newview/skins/default/textures/textures.xml  |   1 +
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/icons/VoiceMute_Off.png

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 0a87b14e17..a9ec4ffbb4 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -66,6 +66,7 @@
 #include "llviewermenu.h"	// for gMenuBarView
 #include "llviewerparcelmgr.h"
 #include "llviewerthrottle.h"
+#include "llvoiceclient.h"
 #include "lluictrlfactory.h"
 
 #include "lltoolmgr.h"
@@ -190,6 +191,16 @@ BOOL LLStatusBar::postBuild()
 	LLHints::getInstance()->registerHintTarget("linden_balance", getChild<LLView>("balance_bg")->getHandle());
 
 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
+    gSavedSettings.getControl("EnableVoiceChat")->getSignal()->connect(boost::bind(&LLStatusBar::onVoiceChanged, this, _2));
+
+    if (gSavedSettings.getBOOL("EnableVoiceChat") && !LLVoiceClient::isMutedVoiceInstance())
+    {
+        mBtnVolume->setImageUnselected(LLUI::getUIImage("Audio_Off"));
+    }
+    else
+    {
+        mBtnVolume->setImageUnselected(LLUI::getUIImage("VoiceMute_Off"));
+    }
 
 	// Adding Net Stat Graph
 	S32 x = getRect().getWidth() - 2;
@@ -640,6 +651,19 @@ void LLStatusBar::onVolumeChanged(const LLSD& newvalue)
 	refresh();
 }
 
+void LLStatusBar::onVoiceChanged(const LLSD& newvalue)
+{
+    if (newvalue.asBoolean() && !LLVoiceClient::isMutedVoiceInstance())
+    {
+        mBtnVolume->setImageUnselected(LLUI::getUIImage("Audio_Off"));
+    }
+    else
+    {
+        mBtnVolume->setImageUnselected(LLUI::getUIImage("VoiceMute_Off"));
+    }
+    refresh();
+}
+
 void LLStatusBar::onUpdateFilterTerm()
 {
 	LLWString searchValue = utf8str_to_wstring( mFilterEdit->getValue() );
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 3002b91c10..3e9190652d 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -99,12 +99,12 @@ private:
 	
 	void onClickBuyCurrency();
 	void onVolumeChanged(const LLSD& newvalue);
+    void onVoiceChanged(const LLSD& newvalue);
 
 	void onMouseEnterPresetsCamera();
 	void onMouseEnterPresets();
 	void onMouseEnterVolume();
 	void onMouseEnterNearbyMedia();
-	void onClickScreen(S32 x, S32 y);
 
 	static void onClickMediaToggle(void* data);
 	static void onClickBalance(void* data);
diff --git a/indra/newview/skins/default/textures/icons/VoiceMute_Off.png b/indra/newview/skins/default/textures/icons/VoiceMute_Off.png
new file mode 100644
index 0000000000..425ba267a5
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/VoiceMute_Off.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 21335bf6c3..d237ddd518 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -63,6 +63,7 @@ with the same filename but different name
 
   <texture name="AudioMute_Off" file_name="icons/AudioMute_Off.png" preload="false" />
   <texture name="AudioMute_Over" file_name="icons/AudioMute_Over.png" preload="false" />
+  <texture name="VoiceMute_Off" file_name="icons/VoiceMute_Off.png" preload="false" />
 
   <texture name="Audio_Off" file_name="icons/Audio_Off.png" preload="false" />
   <texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" />
-- 
cgit v1.2.3


From c3a2781c70d892ce909142ad8a55da835781113f Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 4 Aug 2023 01:05:40 +0200
Subject: SL-20078 Remove Google Translation UI (just fix error processing)

---
 indra/newview/lltranslate.cpp | 44 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index c37c955e8d..9344eeb573 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -253,7 +253,7 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
 
     try
     {
-        res = this->parseResponse(httpResults, parseResult, body, translation, detected_lang, err_msg);
+        res = parseResponse(httpResults, parseResult, body, translation, detected_lang, err_msg);
     }
     catch (std::out_of_range&)
     {
@@ -293,8 +293,6 @@ void LLTranslationAPIHandler::translateMessageCoro(LanguagePair_t fromTo, std::s
         if (!failure.empty())
             failure(status, err_msg);
     }
-
-
 }
 
 //=========================================================================
@@ -353,7 +351,6 @@ private:
         std::string& translation,
         std::string& detected_lang);
     static std::string getAPIKey();
-
 };
 
 //-------------------------------------------------------------------------
@@ -391,36 +388,37 @@ bool LLGoogleTranslationHandler::checkVerificationResponse(
 
 // virtual
 bool LLGoogleTranslationHandler::parseResponse(
-    const LLSD& http_response,
+	const LLSD& http_response,
 	int& status,
 	const std::string& body,
 	std::string& translation,
 	std::string& detected_lang,
 	std::string& err_msg) const
 {
+	const std::string& text = !body.empty() ? body : http_response["error_body"].asStringRef();
+
 	Json::Value root;
 	Json::Reader reader;
 
-	if (!reader.parse(body, root))
+	if (reader.parse(text, root))
 	{
-		err_msg = reader.getFormatedErrorMessages();
-		return false;
+		if (root.isObject())
+		{
+			// Request succeeded, extract translation from the XML body.
+			if (parseTranslation(root, translation, detected_lang))
+				return true;
+
+			// Request failed. Extract error message from the XML body.
+			parseErrorResponse(root, status, err_msg);
+		}
 	}
-
-	if (!root.isObject()) // empty response? should not happen
+	else
 	{
-		return false;
-	}
-
-	if (status != HTTP_OK)
-	{
-		// Request failed. Extract error message from the response.
-		parseErrorResponse(root, status, err_msg);
-		return false;
+		// XML parsing failed. Extract error message from the XML parser.
+		err_msg = reader.getFormatedErrorMessages();
 	}
 
-	// Request succeeded, extract translation from the response.
-	return parseTranslation(root, translation, detected_lang);
+	return false;
 }
 
 // virtual
@@ -493,7 +491,7 @@ void LLGoogleTranslationHandler::verifyKey(const LLSD &key, LLTranslate::KeyVeri
 /*virtual*/
 void LLGoogleTranslationHandler::initHttpHeader(LLCore::HttpHeaders::ptr_t headers, const std::string& user_agent) const
 {
-    headers->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_TEXT_PLAIN);
+    headers->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_JSON);
     headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
 }
 
@@ -503,8 +501,7 @@ void LLGoogleTranslationHandler::initHttpHeader(
     const std::string& user_agent,
     const LLSD &key) const
 {
-    headers->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_TEXT_PLAIN);
-    headers->append(HTTP_OUT_HEADER_USER_AGENT, user_agent);
+    initHttpHeader(headers, user_agent);
 }
 
 LLSD LLGoogleTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t adapter,
@@ -1314,5 +1311,4 @@ LLTranslationAPIHandler& LLTranslate::getHandler(EService service)
     }
 
     return azure;
-
 }
-- 
cgit v1.2.3


From 263e097ef7772ddbb69f575e20b31fd801dafc8e Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 3 Aug 2023 18:54:49 -0700
Subject: SL-20109: Big clean up. Now supports arbitrary mix of folders and
 entries for both items and textures. Better logging output

---
 indra/newview/llfloaterbulkythumbs.cpp             | 374 +++++++++++----------
 indra/newview/llfloaterbulkythumbs.h               |  11 +-
 .../skins/default/xui/en/floater_bulky_thumbs.xml  | 109 +++---
 3 files changed, 254 insertions(+), 240 deletions(-)

diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
index f7ee538033..9ffb71b394 100644
--- a/indra/newview/llfloaterbulkythumbs.cpp
+++ b/indra/newview/llfloaterbulkythumbs.cpp
@@ -38,6 +38,7 @@
 #include "llinventorymodel.h"
 #include "llinventoryfunctions.h"
 #include "lltexteditor.h"
+#include "llmediactrl.h"
 #include "lluuid.h"
 #include "llaisapi.h"
 
@@ -58,16 +59,16 @@ BOOL LLFloaterBulkyThumbs::postBuild()
     mPasteTexturesBtn = getChild<LLUICtrl>("paste_textures_btn");
     mPasteTexturesBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteTextures, this));
 
-    mInventoryItems = getChild<LLTextEditor>("inventory_items");
-    mInventoryItems->setMaxTextLength(0xffff * 0x10);
+    mOutputLog = getChild<LLTextEditor>("output_log");
+    mOutputLog->setMaxTextLength(0xffff * 0x10);
 
-    mProcessBulkyThumbsBtn = getChild<LLUICtrl>("process_bulky_thumbs");
-    mProcessBulkyThumbsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onProcessBulkyThumbs, this));
-    mProcessBulkyThumbsBtn->setEnabled(false);
+    mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
+    mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onMergeItemsTextures, this));
+    mMergeItemsTexturesBtn->setEnabled(false);
 
-    mWriteBulkyThumbsBtn = getChild<LLUICtrl>("write_bulky_thumbs");
-    mWriteBulkyThumbsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onWriteBulkyThumbs, this));
-    mWriteBulkyThumbsBtn->setEnabled(false);
+    mWriteThumbnailsBtn = getChild<LLUICtrl>("write_items_thumbnails");
+    mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onWriteThumbnails, this));
+    mWriteThumbnailsBtn->setEnabled(false);
 
     return true;
 }
@@ -82,36 +83,14 @@ void LLFloaterBulkyThumbs::recordInventoryItemEntry(LLViewerInventoryItem* item)
         LLUUID id = item->getUUID();
         mItemNamesIDs.insert({name, id});
 
-        std::string output_line = "ITEM: ";
-        output_line += name;
-        output_line += "|";
-        output_line += id.asString();
-        output_line +=  "\n";
-        mInventoryItems->appendText(output_line, false);
-    }
-    else
-    {
-        // dupe - do not save
-    }
-}
-
-void LLFloaterBulkyThumbs::recordTextureItemEntry(LLViewerInventoryItem* item)
-{
-    const std::string name = item->getName();
-
-    std::map<std::string, LLUUID>::iterator iter = mTextureNamesIDs.find(name);
-    if (iter == mTextureNamesIDs.end())
-    {
-        //LLUUID id = item->getUUID();
-        LLUUID id = item->getAssetUUID();
-        mTextureNamesIDs.insert({name, id});
-
-        std::string output_line = "TEXR: ";
-        output_line += name;
-        output_line += "|";
-        output_line += id.asString();
-        output_line +=  "\n";
-        mInventoryItems->appendText(output_line, false);
+        mOutputLog->appendText(
+            STRINGIZE(
+                "ITEM " << mItemNamesIDs.size() << "> " <<
+                name <<
+                //" | " <<
+                //id.asString() <<
+                std::endl
+            ), false);
     }
     else
     {
@@ -126,49 +105,85 @@ void LLFloaterBulkyThumbs::onPasteItems()
         return;
     }
 
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Pasting items from inventory ====" <<
+            std::endl
+        ), false);
+
     std::vector<LLUUID> objects;
     LLClipboard::instance().pasteFromClipboard(objects);
     size_t count = objects.size();
 
-    if (count > 0)
+    for (size_t i = 0; i < count; i++)
     {
-        for (size_t i = 0; i < count; i++)
-        {
-            const LLUUID& item_id = objects.at(i);
+        const LLUUID& entry = objects.at(i);
 
-            const LLInventoryCategory* cat = gInventory.getCategory(item_id);
-            if (cat)
+        const LLInventoryCategory* cat = gInventory.getCategory(entry);
+        if (cat)
+        {
+            LLInventoryModel::cat_array_t cat_array;
+            LLInventoryModel::item_array_t item_array;
+
+            LLIsType is_object(LLAssetType::AT_OBJECT);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_object);
+
+            LLIsType is_bodypart(LLAssetType::AT_BODYPART);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_bodypart);
+
+            for (size_t i = 0; i < item_array.size(); i++)
             {
-                LLInventoryModel::cat_array_t cat_array;
-                LLInventoryModel::item_array_t item_array;
-                LLIsType is_object(LLAssetType::AT_OBJECT);
-                gInventory.collectDescendentsIf(cat->getUUID(),
-                                                cat_array,
-                                                item_array,
-                                                LLInventoryModel::EXCLUDE_TRASH,
-                                                is_object);
-
-
-                for (size_t i = 0; i < item_array.size(); i++)
-                {
-                    LLViewerInventoryItem* item = item_array.at(i);
-                    recordInventoryItemEntry(item);
-                }
+                LLViewerInventoryItem* item = item_array.at(i);
+                recordInventoryItemEntry(item);
             }
+        }
 
-            LLViewerInventoryItem* item = gInventory.getItem(item_id);
-            if (item)
+        LLViewerInventoryItem* item = gInventory.getItem(entry);
+        if (item)
+        {
+            const LLAssetType::EType item_type = item->getType();
+            if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_BODYPART)
             {
-                if (item->getType() == LLAssetType::AT_OBJECT)
-                {
-                    recordInventoryItemEntry(item);
-                }
+                recordInventoryItemEntry(item);
             }
         }
+    }
 
-        mInventoryItems->setCursorAndScrollToEnd();
+    mOutputLog->setCursorAndScrollToEnd();
+
+    mMergeItemsTexturesBtn->setEnabled(true);
+}
+
+void LLFloaterBulkyThumbs::recordTextureItemEntry(LLViewerInventoryItem* item)
+{
+    const std::string name = item->getName();
+
+    std::map<std::string, LLUUID>::iterator iter = mTextureNamesIDs.find(name);
+    if (iter == mTextureNamesIDs.end())
+    {
+        LLUUID id = item->getAssetUUID();
+        mTextureNamesIDs.insert({name, id});
 
-        mProcessBulkyThumbsBtn->setEnabled(true);
+        mOutputLog->appendText(
+            STRINGIZE(
+                "TEXTURE " << mTextureNamesIDs.size() << "> " <<
+                name <<
+                //" | " <<
+                //id.asString() <<
+                std::endl
+            ), false);
+    }
+    else
+    {
+        // dupe - do not save
     }
 }
 
@@ -179,127 +194,127 @@ void LLFloaterBulkyThumbs::onPasteTextures()
         return;
     }
 
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Pasting textures from inventory ====" <<
+            std::endl
+        ), false);
+
     std::vector<LLUUID> objects;
     LLClipboard::instance().pasteFromClipboard(objects);
     size_t count = objects.size();
 
-    if (count > 0)
+    for (size_t i = 0; i < count; i++)
     {
-        for (size_t i = 0; i < count; i++)
+        const LLUUID& entry = objects.at(i);
+
+        const LLInventoryCategory* cat = gInventory.getCategory(entry);
+        if (cat)
         {
-            const LLUUID& item_id = objects.at(i);
+            LLInventoryModel::cat_array_t cat_array;
+            LLInventoryModel::item_array_t item_array;
+
+            LLIsType is_object(LLAssetType::AT_TEXTURE);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_object);
 
-            const LLInventoryCategory* cat = gInventory.getCategory(item_id);
-            if (cat)
+            for (size_t i = 0; i < item_array.size(); i++)
             {
-                LLInventoryModel::cat_array_t cat_array;
-                LLInventoryModel::item_array_t item_array;
-                LLIsType is_texture(LLAssetType::AT_TEXTURE);
-                gInventory.collectDescendentsIf(cat->getUUID(),
-                                                cat_array,
-                                                item_array,
-                                                LLInventoryModel::EXCLUDE_TRASH,
-                                                is_texture);
-
-                for (size_t i = 0; i < item_array.size(); i++)
-                {
-                    LLViewerInventoryItem* item = item_array.at(i);
-                    recordTextureItemEntry(item);
-                }
+                LLViewerInventoryItem* item = item_array.at(i);
+                recordTextureItemEntry(item);
             }
+        }
 
-            LLViewerInventoryItem* item = gInventory.getItem(item_id);
-            if (item)
+        LLViewerInventoryItem* item = gInventory.getItem(entry);
+        if (item)
+        {
+            const LLAssetType::EType item_type = item->getType();
+            if (item_type == LLAssetType::AT_TEXTURE)
             {
-                if (item->getType() == LLAssetType::AT_TEXTURE)
-                {
-                    recordTextureItemEntry(item);
-                }
+                recordTextureItemEntry(item);
             }
         }
+    }
 
-        mInventoryItems->setCursorAndScrollToEnd();
+    mOutputLog->setCursorAndScrollToEnd();
 
-        mProcessBulkyThumbsBtn->setEnabled(true);
-    }
+    mMergeItemsTexturesBtn->setEnabled(true);
 }
 
-void LLFloaterBulkyThumbs::onProcessBulkyThumbs()
+void LLFloaterBulkyThumbs::onMergeItemsTextures()
 {
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Matching items and textures for " <<
+            mItemNamesIDs.size() <<
+            " entries ====" <<
+            std::endl
+        ), false);
+
     std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
+    size_t index = 1;
+
     while (item_iter != mItemNamesIDs.end())
     {
-        std::string output_line = "PROCESSING: ";
         std::string item_name = (*item_iter).first;
-        output_line += item_name;
-        output_line +=  "\n";
-        mInventoryItems->appendText(output_line, false);
 
-        bool found = false;
-        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.begin();
-        while (texture_iter != mTextureNamesIDs.end())
-        {
-            std::string output_line = "    COMPARING WITH: ";
-            std::string texture_name = (*texture_iter).first;
-            output_line += texture_name;
+        mOutputLog->appendText(
+            STRINGIZE(
+                "MATCHING ITEM (" << index++  << "/" << mItemNamesIDs.size() << ") " << item_name << "> "
+            ), false);
 
-            if (item_name == texture_name)
-            {
-                output_line += " MATCH";
-                found = true;
-                output_line +=  "\n";
-                mInventoryItems->appendText(output_line, false);
-                break;
-            }
-            else
-            {
-                output_line += " NO MATCH";
-            }
-            output_line +=  "\n";
-            mInventoryItems->appendText(output_line, false);
-            mInventoryItems->setCursorAndScrollToEnd();
-
-
-            ++texture_iter;
-        }
-
-        if (found == true)
+        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
+        if (texture_iter != mTextureNamesIDs.end())
         {
+            mOutputLog->appendText(
+                STRINGIZE(
+                    "MATCHED" <<
+                    std::endl
+                ), false);
+
             mNameItemIDTextureId.insert({item_name, {(*item_iter).second, (*texture_iter).second}});
         }
         else
         {
-            std::string output_line = "WARNING: ";
-            output_line += "No texture found for ";
-            output_line += item_name;
-            output_line +=  "\n";
-            mInventoryItems->appendText(output_line, false);
-            mInventoryItems->setCursorAndScrollToEnd();
-
+            mOutputLog->appendText(
+                STRINGIZE(
+                    "NO MATCH FOUND" <<
+                    std::endl
+                ), false);
         }
 
         ++item_iter;
     }
 
-    mInventoryItems->appendText("Finished - final list is", true);
-    std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
-    while (iter != mNameItemIDTextureId.end())
-    {
-        std::string output_line = (*iter).first;
-        output_line += "\n";
-        output_line += "item ID: ";
-        output_line += ((*iter).second).first.asString();
-        output_line += "\n";
-        output_line += "thumbnail texture ID: ";
-        output_line += ((*iter).second).second.asString();
-        output_line +=  "\n";
-        mInventoryItems->appendText(output_line, true);
-
-        ++iter;
-    }
-    mInventoryItems->setCursorAndScrollToEnd();
-
-    mWriteBulkyThumbsBtn->setEnabled(true);
+    mOutputLog->appendText(
+        STRINGIZE(
+            "==== Matched list of items and textures has " <<
+            mNameItemIDTextureId.size() <<
+            " entries ====" <<
+            std::endl
+        ), true);
+
+    //std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
+    //while (iter != mNameItemIDTextureId.end())
+    //{
+    //    std::string output_line = (*iter).first;
+    //    output_line += "\n";
+    //    output_line += "item ID: ";
+    //    output_line += ((*iter).second).first.asString();
+    //    output_line += "\n";
+    //    output_line += "thumbnail texture ID: ";
+    //    output_line += ((*iter).second).second.asString();
+    //    output_line +=  "\n";
+    //    mOutputLog->appendText(output_line, true);
+
+    //    ++iter;
+    //}
+    mOutputLog->setCursorAndScrollToEnd();
+
+    mWriteThumbnailsBtn->setEnabled(true);
 }
 
 #if 1
@@ -331,41 +346,38 @@ bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
     }
     else
     {
-        LL_WARNS() << "Unable to write inventory thumbnail because AIS API is not available" << LL_ENDL;
+        LL_WARNS() << "Unable to write inventory thumbnail because the AIS API is not available" << LL_ENDL;
         return false;
     }
 }
 
-void LLFloaterBulkyThumbs::onWriteBulkyThumbs()
+void LLFloaterBulkyThumbs::onWriteThumbnails()
 {
-    // look at void LLFloaterChangeItemThumbnail::setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id, LLInventoryObject* obj)
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Writing thumbnails for " <<
+            mNameItemIDTextureId.size() <<
+            " entries ====" <<
+            std::endl
+        ), false);
 
-    /**
-    * Results I get - compare with what the manual image update code gives us
-        Senra Blake - bottom - sweatpants - green
-        item ID: 1daf6aab-e42f-42aa-5a85-4d73458a355d
-        thumbnail texture ID: cba71b7c-2335-e15c-7646-ead0f9e817fb
-
-			Correct values (from mnala path) are:
-			Updating thumbnail forSenra Blake - bottom - sweatpants - green: 
-			ID: 1daf6aab-e42f-42aa-5a85-4d73458a355d 
-			THUMB_ID: 8f5db9e7-8d09-c8be-0efd-0a5e4f3c925d
-    */
-
-    mInventoryItems->appendText("Writing thumbnails", true);
     std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
+    size_t index = 1;
+
     while (iter != mNameItemIDTextureId.end())
     {
-        std::string output_line = (*iter).first;
-        output_line += "\n";
-        output_line += "item ID: ";
-        output_line += ((*iter).second).first.asString();
-        output_line += "\n";
-        output_line += "thumbnail texture ID: ";
-        output_line += ((*iter).second).second.asString();
-        output_line +=  "\n";
-        mInventoryItems->appendText(output_line, true);
-
+        mOutputLog->appendText(
+            STRINGIZE(
+                "WRITING THUMB (" << index++  << "/" << mNameItemIDTextureId.size() << ")> " <<
+                (*iter).first <<
+                "\n" <<
+                "item ID: " <<
+                ((*iter).second).first.asString() <<
+                "\n" <<
+                "thumbnail texture ID: " <<
+                ((*iter).second).second.asString() <<
+                "\n"
+            ), true);
 
         LLUUID item_id = ((*iter).second).first;
         LLUUID thumbnail_asset_id = ((*iter).second).second;
@@ -374,5 +386,5 @@ void LLFloaterBulkyThumbs::onWriteBulkyThumbs()
 
         ++iter;
     }
-    mInventoryItems->setCursorAndScrollToEnd();
+    mOutputLog->setCursorAndScrollToEnd();
 }
diff --git a/indra/newview/llfloaterbulkythumbs.h b/indra/newview/llfloaterbulkythumbs.h
index f5390a3791..75657002b3 100644
--- a/indra/newview/llfloaterbulkythumbs.h
+++ b/indra/newview/llfloaterbulkythumbs.h
@@ -30,6 +30,7 @@
 
 #include "llfloater.h"
 class LLTextEditor;
+class LLMediaCtrl;
 class LLViewerInventoryItem;
 class LLUUID;
 
@@ -48,13 +49,13 @@ class LLFloaterBulkyThumbs:
         LLUICtrl* mPasteTexturesBtn;
         void onPasteTextures();
 
-        LLTextEditor* mInventoryItems;
+        LLTextEditor* mOutputLog;
 
-        LLUICtrl* mProcessBulkyThumbsBtn;
-        void onProcessBulkyThumbs();
+        LLUICtrl* mMergeItemsTexturesBtn;
+        void onMergeItemsTextures();
 
-        LLUICtrl* mWriteBulkyThumbsBtn;
-        void onWriteBulkyThumbs();
+        LLUICtrl* mWriteThumbnailsBtn;
+        void onWriteThumbnails();
 
         void recordInventoryItemEntry(LLViewerInventoryItem* item);
         void recordTextureItemEntry(LLViewerInventoryItem* item);
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index ab34e35dac..e94717f947 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -1,56 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- can_resize="true"
- height="600"
- layout="topleft"
- min_height="175"
- min_width="500"
- name="contents"
- help_topic="contents"
- title="BULKY THUMBS"
- width="500">
-	<button follows="left|top"
-		height="20"
-		label="Paste item info from Inventory"
-		layout="topleft"
-		left="10"
-		name="paste_items_btn"
-		top="26	"
-		width="200" />
-
-	<button follows="left|top"
-	height="20"
-	label="Paste texture info from Inventory"
-	layout="topleft"
-	left="250"
-	name="paste_textures_btn"
-	top="26	"
-	width="200" />
-	
-	<text_editor
-   height="510"
-   follows="top|left|right|bottom"
-   left="10"
-   name="inventory_items"
-   top_pad="10"
-   width="480">
-	</text_editor>
-	<button follows="left|bottom"
-		height="20"
-		label="Merge items and textures"
-		layout="bottomleft"
-		left="10"
-		name="process_bulky_thumbs"
-		bottom="8"
-		width="200" />
-
-	<button follows="left|bottom"
-	height="20"
-	label="Write Thumbnails"
-	layout="bottomleft"
-	left="250"
-	name="write_bulky_thumbs"
-	bottom="8"
-	width="200" />
-</floater>
+  legacy_header_height="18"
+  can_resize="true"
+  height="600"
+  layout="topleft"
+  min_height="175"
+  min_width="500"
+  name="contents"
+  help_topic="contents"
+  title="BULKY THUMBS"
+  width="500">
+    <button
+      follows="left|top"
+      height="20"
+      label="Paste items from Inventory"
+      layout="topleft"
+      left="10"
+      name="paste_items_btn"
+      top="26	"
+      width="200" />
+    <button
+      follows="left|top"
+      height="20"
+      label="Paste textures from Inventory"
+      layout="topleft"
+      left="250"
+      name="paste_textures_btn"
+      top="26	"
+      width="200" />
+    <text_editor
+      height="510"
+      follows="top|left|right|bottom"
+      left="10"
+      name="output_log"
+      top_pad="10"
+      width="480">
+    </text_editor>
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Merge items and textures"
+      layout="bottomleft"
+      left="10"
+      name="merge_items_textures"
+      bottom="8"
+      width="200" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Write Thumbnails"
+      layout="bottomleft"
+      left="250"
+      name="write_items_thumbnails"
+      bottom="8"
+      width="200" />
+</floater>
\ No newline at end of file
-- 
cgit v1.2.3


From b6cd14fc47cff62f6a30874d71be86d6639c32da Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 4 Aug 2023 15:36:40 +0300
Subject: SL-19982 make sure 'item' is not null

---
 indra/newview/llpreviewscript.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 1666bfebd4..dc79abcdeb 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1624,7 +1624,7 @@ void LLPreviewLSL::draw()
 		setTitle(LLTrans::getString("ScriptWasDeleted"));
 		mScriptEd->setItemRemoved(TRUE);
 	}
-    if (mDirty) 
+    else if (mDirty) 
     {
         std::string item_path = get_category_path(item->getParentUUID());
         getChild<LLUICtrl>("path_txt")->setValue(item_path);
-- 
cgit v1.2.3


From a16babdf7d96fbbe345d9e0c5df178e48539751c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 4 Aug 2023 18:17:50 +0300
Subject: SL-18049 Part 4; Adjustments and fixes

---
 indra/newview/llpanelvoicedevicesettings.cpp       | 22 ++++++++++++----------
 indra/newview/llpanelvoicedevicesettings.h         |  4 ++--
 indra/newview/llpanelvolumepulldown.cpp            |  5 -----
 indra/newview/llstatusbar.cpp                      |  4 ++--
 indra/newview/llvoiceclient.cpp                    | 10 ----------
 indra/newview/llvoiceclient.h                      |  2 --
 indra/newview/llvoicevivox.cpp                     |  5 +----
 indra/newview/llvoicevivox.h                       |  3 ---
 .../skins/default/xui/en/panel_sound_devices.xml   | 16 ++++++++--------
 .../skins/default/xui/en/panel_volume_pulldown.xml |  6 +-----
 10 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index 5e1cf801b9..af57169f3b 100644
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -32,6 +32,7 @@
 // Viewer includes
 #include "llcombobox.h"
 #include "llsliderctrl.h"
+#include "llstartup.h"
 #include "llviewercontrol.h"
 #include "llvoiceclient.h"
 #include "llvoicechannel.h"
@@ -70,14 +71,14 @@ BOOL LLPanelVoiceDeviceSettings::postBuild()
 
 	mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
 	mCtrlOutputDevices = getChild<LLComboBox>("voice_output_device");
-    mRetryBtn = getChild<LLButton>("retry_btn");
+    mUnmuteBtn = getChild<LLButton>("unmute_btn");
 
 	mCtrlInputDevices->setCommitCallback(
 		boost::bind(&LLPanelVoiceDeviceSettings::onCommitInputDevice, this));
 	mCtrlOutputDevices->setCommitCallback(
 		boost::bind(&LLPanelVoiceDeviceSettings::onCommitOutputDevice, this));
-    mRetryBtn->setCommitCallback(
-        boost::bind(&LLPanelVoiceDeviceSettings::onCommitRetry, this));
+    mUnmuteBtn->setCommitCallback(
+        boost::bind(&LLPanelVoiceDeviceSettings::onCommitUnmute, this));
 
 	mLocalizedDeviceNames[DEFAULT_DEVICE]				= getString("default_text");
 	mLocalizedDeviceNames["No Device"]					= getString("name_no_device");
@@ -115,16 +116,18 @@ void LLPanelVoiceDeviceSettings::draw()
     if (voice_enabled)
     {
         getChildView("wait_text")->setVisible( !is_in_tuning_mode && mUseTuningMode);
-        getChildView("muted_text")->setVisible(FALSE);
-        mRetryBtn->setVisible(FALSE);
+        getChildView("disabled_text")->setVisible(FALSE);
+        mUnmuteBtn->setVisible(FALSE);
     }
     else
     {
         getChildView("wait_text")->setVisible(FALSE);
-        getChildView("muted_text")->setVisible(TRUE);
 
-        static LLCachedControl<bool> voice_enabled(gSavedSettings, "EnableVoiceChat");
-        mRetryBtn->setVisible(!voice_enabled || LLVoiceClient::isMutedVoiceInstance());
+        static LLCachedControl<bool> chat_enabled(gSavedSettings, "EnableVoiceChat");
+        // If voice isn't enabled, it is either disabled or muted
+        bool voice_disabled = chat_enabled() || LLStartUp::getStartupState() <= STATE_LOGIN_WAIT;
+        getChildView("disabled_text")->setVisible(voice_disabled);
+        mUnmuteBtn->setVisible(!voice_disabled);
     }
 
 	LLPanel::draw();
@@ -357,8 +360,7 @@ void LLPanelVoiceDeviceSettings::onInputDevicesClicked()
 	LLVoiceClient::getInstance()->refreshDeviceLists(false);  // fill in the pop up menus again if needed.
 }
 
-void LLPanelVoiceDeviceSettings::onCommitRetry()
+void LLPanelVoiceDeviceSettings::onCommitUnmute()
 {
     gSavedSettings.setBOOL("EnableVoiceChat", TRUE);
-    LLVoiceClient::unmuteVoiceInstance();
 }
diff --git a/indra/newview/llpanelvoicedevicesettings.h b/indra/newview/llpanelvoicedevicesettings.h
index 6b85d4e540..e704394d4a 100644
--- a/indra/newview/llpanelvoicedevicesettings.h
+++ b/indra/newview/llpanelvoicedevicesettings.h
@@ -55,14 +55,14 @@ protected:
 	void onCommitOutputDevice();
 	void onOutputDevicesClicked();
 	void onInputDevicesClicked();
-    void onCommitRetry();
+    void onCommitUnmute();
 
 	F32 mMicVolume;
 	std::string mInputDevice;
 	std::string mOutputDevice;
 	class LLComboBox		*mCtrlInputDevices;
 	class LLComboBox		*mCtrlOutputDevices;
-    class LLButton          *mRetryBtn;
+    class LLButton          *mUnmuteBtn;
 	BOOL mDevicesUpdated;
 	bool mUseTuningMode;
 	std::map<std::string, std::string> mLocalizedDeviceNames;
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
index 17975a6e6d..09038ac95a 100644
--- a/indra/newview/llpanelvolumepulldown.cpp
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -40,7 +40,6 @@
 #include "llfloaterreg.h"
 #include "llfloaterpreference.h"
 #include "llsliderctrl.h"
-#include "llvoicevivox.h"
 
 ///----------------------------------------------------------------------------
 /// Class LLPanelVolumePulldown
@@ -108,10 +107,6 @@ void LLPanelVolumePulldown::updateCheckbox(LLUICtrl* ctrl, const LLSD& user_data
             getChild<LLCheckBoxCtrl>("media_auto_play_combo")->setEnabled(music_enabled || media_enabled);
         }
     }
-    else if (control_name == "VoiceChat")
-    {
-        LLVivoxVoiceClient::unmuteVoiceInstance();
-    }
 }
 
 void LLPanelVolumePulldown::onClickSetSounds()
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index a9ec4ffbb4..0145380712 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -193,7 +193,7 @@ BOOL LLStatusBar::postBuild()
 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
     gSavedSettings.getControl("EnableVoiceChat")->getSignal()->connect(boost::bind(&LLStatusBar::onVoiceChanged, this, _2));
 
-    if (gSavedSettings.getBOOL("EnableVoiceChat") && !LLVoiceClient::isMutedVoiceInstance())
+    if (gSavedSettings.getBOOL("EnableVoiceChat"))
     {
         mBtnVolume->setImageUnselected(LLUI::getUIImage("Audio_Off"));
     }
@@ -653,7 +653,7 @@ void LLStatusBar::onVolumeChanged(const LLSD& newvalue)
 
 void LLStatusBar::onVoiceChanged(const LLSD& newvalue)
 {
-    if (newvalue.asBoolean() && !LLVoiceClient::isMutedVoiceInstance())
+    if (newvalue.asBoolean())
     {
         mBtnVolume->setImageUnselected(LLUI::getUIImage("Audio_Off"));
     }
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index fab6ec3755..150b556284 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -555,16 +555,6 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
     }
 }
 
-void LLVoiceClient::unmuteVoiceInstance()
-{
-    LLVivoxVoiceClient::unmuteVoiceInstance();
-}
-
-bool LLVoiceClient::isMutedVoiceInstance()
-{
-    return LLVivoxVoiceClient::isMutedVoiceInstance();
-}
-
 void LLVoiceClient::updateMicMuteLogic()
 {
 	// If not configured to use PTT, the mic should be open (otherwise the user will be unable to speak).
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 7788efb8e1..aa67502908 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -403,8 +403,6 @@ public:
 	void toggleUserPTTState(void);
 	void inputUserControlState(bool down);  // interpret any sort of up-down mic-open control input according to ptt-toggle prefs	
 	void setVoiceEnabled(bool enabled);
-    static void unmuteVoiceInstance();
-    static bool isMutedVoiceInstance();
 
 	void setUsePTT(bool usePTT);
 	void setPTTIsToggle(bool PTTIsToggle);
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index c89fe81a85..72e0412194 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -277,7 +277,6 @@ static void killGateway()
 
 bool LLVivoxVoiceClient::sShuttingDown = false;
 bool LLVivoxVoiceClient::sConnected = false;
-bool LLVivoxVoiceClient::sVoiceInstanceMuted = false;
 LLPumpIO *LLVivoxVoiceClient::sPump = nullptr;
 
 LLVivoxVoiceClient::LLVivoxVoiceClient() :
@@ -355,7 +354,6 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
     sShuttingDown = false;
     sConnected = false;
     sPump = nullptr;
-    sVoiceInstanceMuted = LLAppViewer::instance()->isSecondInstance();
 
 	mSpeakerVolume = scale_speaker_volume(0);
 
@@ -5645,8 +5643,7 @@ bool LLVivoxVoiceClient::voiceEnabled()
 {
     return gSavedSettings.getBOOL("EnableVoiceChat") &&
           !gSavedSettings.getBOOL("CmdLineDisableVoice") &&
-          !gNonInteractive &&
-          !sVoiceInstanceMuted;
+          !gNonInteractive;
 }
 
 void LLVivoxVoiceClient::setLipSyncEnabled(BOOL enabled)
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 9a4023422b..e3ab99c675 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -172,8 +172,6 @@ public:
 	//@{
 	virtual bool voiceEnabled();
 	virtual void setVoiceEnabled(bool enabled);
-    static void unmuteVoiceInstance() { sVoiceInstanceMuted = false; }
-    static bool isMutedVoiceInstance() { return sVoiceInstanceMuted; }
 	virtual BOOL lipSyncEnabled();	
 	virtual void setLipSyncEnabled(BOOL enabled);
 	virtual void setMuteMic(bool muted);		// Set the mute state of the local mic.
@@ -919,7 +917,6 @@ private:
     // This variables can last longer than vivox in coroutines so we need them as static
     static bool sShuttingDown;
     static bool sConnected;
-    static bool sVoiceInstanceMuted; // Second+ instance of viewer starts muted
     static LLPumpIO* sPump;
 
     LLEventMailDrop mVivoxPump;
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
index bcb38a46cc..a1ce99c8be 100644
--- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
@@ -168,7 +168,7 @@
      width="20" />
     <text
      type="string"
-     name="muted_text"
+     name="disabled_text"
      text_color="EmphasisColor"
      length="1"
      follows="right|top"
@@ -176,16 +176,16 @@
      layout="topleft"
      left_delta="-100"
      top_delta="5"
-     width="70">
-        Muted
+     width="110">
+        Disabled
     </text>
     <button
        follows="right|top"
        height="23"
-       image_overlay="Refresh_Off"
        layout="topleft"
-       left_pad="1"
-       name="retry_btn"
-       top_delta="-5"
-       width="23" />
+       left_delta="0"
+       name="unmute_btn"
+       label="Unmute"
+       top_delta="-6"
+       width="110" />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index c7be790406..3c466022d8 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -295,9 +295,5 @@
         left_pad="5"
         name="enable_voice_check"
         width="110"
-        >
-        <check_box.commit_callback
-            function="Vol.updateCheckbox"
-            parameter="VoiceChat"/>
-        </check_box>
+        />
 </panel>
-- 
cgit v1.2.3


From 724b6a8c64dab8bb3586b3273e51d7502ac44749 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 4 Aug 2023 19:47:22 +0300
Subject: SL-18049 Part 5; Tweak new icon visibility

---
 indra/newview/llstatusbar.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 0145380712..836a4327bf 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -66,7 +66,6 @@
 #include "llviewermenu.h"	// for gMenuBarView
 #include "llviewerparcelmgr.h"
 #include "llviewerthrottle.h"
-#include "llvoiceclient.h"
 #include "lluictrlfactory.h"
 
 #include "lltoolmgr.h"
@@ -193,12 +192,9 @@ BOOL LLStatusBar::postBuild()
 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
     gSavedSettings.getControl("EnableVoiceChat")->getSignal()->connect(boost::bind(&LLStatusBar::onVoiceChanged, this, _2));
 
-    if (gSavedSettings.getBOOL("EnableVoiceChat"))
-    {
-        mBtnVolume->setImageUnselected(LLUI::getUIImage("Audio_Off"));
-    }
-    else
+    if (!gSavedSettings.getBOOL("EnableVoiceChat") && LLAppViewer::instance()->isSecondInstance())
     {
+        // Indicate that second instance started without sound
         mBtnVolume->setImageUnselected(LLUI::getUIImage("VoiceMute_Off"));
     }
 
@@ -655,12 +651,9 @@ void LLStatusBar::onVoiceChanged(const LLSD& newvalue)
 {
     if (newvalue.asBoolean())
     {
+        // Second instance starts with "VoiceMute_Off" icon, fix it
         mBtnVolume->setImageUnselected(LLUI::getUIImage("Audio_Off"));
     }
-    else
-    {
-        mBtnVolume->setImageUnselected(LLUI::getUIImage("VoiceMute_Off"));
-    }
     refresh();
 }
 
-- 
cgit v1.2.3


From 177d7124904d84ce38102ba3255c5dccc6adb35b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 7 Aug 2023 20:17:18 +0300
Subject: =?UTF-8?q?SL-20086=20es=D1=81ape=20the=20message=20text=20before?=
 =?UTF-8?q?=20sending?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/lltranslate.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index 9344eeb573..6182c96597 100644
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -725,7 +725,7 @@ bool LLAzureTranslationHandler::parseResponse(
         return false;
     }
 
-    translation = first["text"].asString();
+    translation = LLURI::unescape(first["text"].asString());
 
     return true;
 }
@@ -825,8 +825,13 @@ LLSD LLAzureTranslationHandler::sendMessageAndSuspend(LLCoreHttpUtil::HttpCorout
 {
     LLCore::BufferArray::ptr_t rawbody(new LLCore::BufferArray);
     LLCore::BufferArrayStream outs(rawbody.get());
+
+    static const std::string allowed_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz "
+                                             "0123456789"
+                                             "-._~";
+
     outs << "[{\"text\":\"";
-    outs << msg;
+    outs << LLURI::escape(msg, allowed_chars);
     outs << "\"}]";
 
     return adapter->postRawAndSuspend(request, url, rawbody, options, headers);
-- 
cgit v1.2.3


From 0d411e2e2dc07078b3e862649916b58a81ab5b82 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 7 Aug 2023 18:44:04 +0200
Subject: SL-20090 BugSplat Crash: LLViewerFetchedTexture::updateFetch(2099)

---
 indra/newview/llviewertexture.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index c458c75a40..97ff5f58e4 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2365,7 +2365,8 @@ bool LLViewerFetchedTexture::updateFetch()
 		}
 	}
 	
-	llassert_always(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid));
+	llassert_always(mRawImage.notNull() || !mIsRawImageValid);
+	llassert_always(mRawImage.notNull() || !mNeedsCreateTexture);
 	
 	return mIsFetching ? true : false;
 }
-- 
cgit v1.2.3


From 0bb61ad3dec04a95660e0495a7f269ed448e05d0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 8 Aug 2023 00:32:25 +0200
Subject: SL-19807 BugSplat Crash: LLDispatchSetEstateExperience::getIDs()

---
 indra/newview/llfloaterregioninfo.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index a24f04ccfb..7f50a2f0cc 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -144,7 +144,7 @@ public:
 		const LLUUID& invoice,
 		const sparam_t& strings);
 
-	LLSD getIDs( sparam_t::const_iterator it, sparam_t::const_iterator end, S32 count );
+	static LLSD getIDs( sparam_t::const_iterator it, sparam_t::const_iterator end, S32 count );
 };
 
 
@@ -2450,11 +2450,12 @@ bool LLDispatchSetEstateAccess::operator()(
 	return true;
 }
 
+// static
 LLSD LLDispatchSetEstateExperience::getIDs( sparam_t::const_iterator it, sparam_t::const_iterator end, S32 count )
 {
 	LLSD idList = LLSD::emptyArray();
 	LLUUID id;
-	while(count--> 0)
+	while (count-- > 0 && it < end)
 	{
 		memcpy(id.mData, (*(it++)).data(), UUID_BYTES);
 		idList.append(id);
@@ -2468,7 +2469,7 @@ LLSD LLDispatchSetEstateExperience::getIDs( sparam_t::const_iterator it, sparam_
 // strings[2] = str(num blocked)
 // strings[3] = str(num trusted)
 // strings[4] = str(num allowed)
-// strings[8] = bin(uuid) ...
+// strings[5] = bin(uuid) ...
 // ...
 bool LLDispatchSetEstateExperience::operator()(
 	const LLDispatcher* dispatcher,
@@ -2477,23 +2478,30 @@ bool LLDispatchSetEstateExperience::operator()(
 	const sparam_t& strings)
 {
 	LLPanelRegionExperiences* panel = LLFloaterRegionInfo::getPanelExperiences();
-	if (!panel) return true;
+	if (!panel)
+		return true;
+
+	const sparam_t::size_type MIN_SIZE = 5;
+	if (strings.size() < MIN_SIZE)
+		return true;
 
+	// Skip 2 parameters
 	sparam_t::const_iterator it = strings.begin();
 	++it; // U32 estate_id = strtol((*it).c_str(), NULL, 10);
 	++it; // U32 send_to_agent_only = strtoul((*(++it)).c_str(), NULL, 10);
 
+	// Read 3 parameters
 	LLUUID id;
 	S32 num_blocked = strtol((*(it++)).c_str(), NULL, 10);
 	S32 num_trusted = strtol((*(it++)).c_str(), NULL, 10);
 	S32 num_allowed = strtol((*(it++)).c_str(), NULL, 10);
 
 	LLSD ids = LLSD::emptyMap()
-		.with("blocked", getIDs(it,								strings.end(), num_blocked))
-		.with("trusted", getIDs(it + (num_blocked),				strings.end(), num_trusted))
-		.with("allowed", getIDs(it + (num_blocked+num_trusted),	strings.end(), num_allowed));
+		.with("blocked", getIDs(it, strings.end(), num_blocked))
+		.with("trusted", getIDs(it + num_blocked, strings.end(), num_trusted))
+		.with("allowed", getIDs(it + num_blocked + num_trusted, strings.end(), num_allowed));
 
-	panel->processResponse(ids);			
+	panel->processResponse(ids);
 
 	return true;
 }
-- 
cgit v1.2.3


From ee56c507ab9fb370a754b24026e1a8b100bb447a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 8 Aug 2023 19:02:30 +0300
Subject: SL-18049 use instance_offset appropriately

---
 indra/newview/llvoicevivox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 72e0412194..1b9aef193c 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -967,7 +967,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
                 // to increment instance_offset on EADDRINUSE.
                 // But for now just use rand
                 static U32 instance_offset = portrange * ll_rand(20);
-                port = portbase + portoffset + portrange;
+                port = portbase + portoffset + instance_offset;
             }
             else
             {
-- 
cgit v1.2.3


From cf97837b79fba28623e6e8210e779a0599ba8d4b Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 9 Aug 2023 13:37:43 +0300
Subject: SL-18170 FIXED Quitting the viewer is aborted if a script error
 appears

---
 indra/newview/llfloaterimnearbychathandler.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index 4cd91c53d8..eb7bd843d3 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -522,6 +522,8 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
 	// errors in separate window.
 	if (chat_msg.mChatType == CHAT_TYPE_DEBUG_MSG)
 	{
+        if (LLFloater::isQuitRequested()) return;
+
 		if(gSavedSettings.getBOOL("ShowScriptErrors") == FALSE)
 			return;
 
-- 
cgit v1.2.3


From 858cde02f7edd4eea9162fe1e824e84ca3097621 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 11 Aug 2023 22:03:32 +0300
Subject: SL-19744 Small cleanup

---
 indra/llcommon/llapp.cpp | 8 +-------
 indra/llcommon/llapp.h   | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index b99166991f..90d0c28eb1 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -104,7 +104,6 @@ BOOL LLApp::sLogInSignal = FALSE;
 // Keeps track of application status
 LLScalarCond<LLApp::EAppStatus> LLApp::sStatus{LLApp::APP_STATUS_STOPPED};
 LLAppErrorHandler LLApp::sErrorHandler = NULL;
-BOOL LLApp::sErrorThreadRunning = FALSE;
 
 
 LLApp::LLApp()
@@ -787,13 +786,8 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
 				return;
 			}		
 			
-			// Flag status to ERROR, so thread_error does its work.
+			// Flag status to ERROR
 			LLApp::setError();
-			// Block in the signal handler until somebody says that we're done.
-			while (LLApp::sErrorThreadRunning && !LLApp::isStopped())
-			{
-				ms_sleep(10);
-			}
 			
 			if (LLApp::sLogInSignal)
 			{
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index c832c8b142..a892bfeb1e 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -291,7 +291,6 @@ protected:
 
 	static void setStatus(EAppStatus status);		// Use this to change the application status.
 	static LLScalarCond<EAppStatus> sStatus; // Reflects current application status
-	static BOOL sErrorThreadRunning; // Set while the error thread is running
 	static BOOL sDisableCrashlogger; // Let the OS handle crashes for us.
 	std::wstring mCrashReportPipeStr;  //Name of pipe to use for crash reporting.
 
-- 
cgit v1.2.3


From edf0874e0656c6f512df50ee52236209531ca329 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 11 Aug 2023 23:36:37 +0300
Subject: SL-18721 Viewer shutdown order changes

Same thing as commit cf692c40b0b9f8d0d04cd10a02a84e3f697a2e99
which was removed due to shutdown freezes.
Error thread is no longer there so doesn't cause any race sonditions,
was not able to repro any issues so will ask QA to test shutdown
---
 indra/llcommon/threadpool.cpp    | 12 ++++++++++--
 indra/llcommon/threadpool.h      |  3 ++-
 indra/llwindow/llwindowwin32.cpp |  3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index d5adf11264..22bbff4478 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -21,11 +21,12 @@
 #include "llevents.h"
 #include "stringize.h"
 
-LL::ThreadPool::ThreadPool(const std::string& name, size_t threads, size_t capacity):
+LL::ThreadPool::ThreadPool(const std::string& name, size_t threads, size_t capacity, bool auto_shutdown):
     super(name),
     mQueue(name, capacity),
     mName("ThreadPool:" + name),
-    mThreadCount(threads)
+    mThreadCount(threads),
+    mAutomaticShutdown(auto_shutdown)
 {}
 
 void LL::ThreadPool::start()
@@ -39,6 +40,13 @@ void LL::ThreadPool::start()
                 run(tname);
             });
     }
+
+    // Some threads might need to run longer than LLEventPumps
+    if (!mAutomaticShutdown)
+    {
+        return;
+    }
+
     // Listen on "LLApp", and when the app is shutting down, close the queue
     // and join the workers.
     LLEventPumps::instance().obtain("LLApp").listen(
diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index f8eec3b457..22c875edb9 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -31,7 +31,7 @@ namespace LL
          * Pass ThreadPool a string name. This can be used to look up the
          * relevant WorkQueue.
          */
-        ThreadPool(const std::string& name, size_t threads=1, size_t capacity=1024);
+        ThreadPool(const std::string& name, size_t threads=1, size_t capacity=1024, bool auto_shutdown = true);
         virtual ~ThreadPool();
 
         /**
@@ -66,6 +66,7 @@ namespace LL
         std::string mName;
         size_t mThreadCount;
         std::vector<std::pair<std::string, std::thread>> mThreads;
+        bool mAutomaticShutdown;
     };
 
 } // namespace LL
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 2e560ddb0a..01e38fcc9d 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -828,6 +828,7 @@ void LLWindowWin32::close()
 	// Is window is already closed?
 	if (!mWindowHandle)
 	{
+        mWindowThread->close();
 		return;
 	}
 
@@ -4590,7 +4591,7 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList()
 #endif // LL_WINDOWS
 
 inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
-    : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE)
+    : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, false)
 {
     ThreadPool::start();
 }
-- 
cgit v1.2.3


From 2d39f05cc1403da307be05edc972d2ebcec6cfc7 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 11 Aug 2023 18:07:13 -0700
Subject:  SL-20109: Now that it seems that the tool might be useful, make a
 new version with a proper name and start worknig on it.  Prototype bulky
 thumbs one will be removed after new version is working

---
 indra/newview/CMakeLists.txt                       |   2 +
 .../newview/llfloaterinventorythumbnailshelper.cpp | 390 +++++++++++++++++++++
 indra/newview/llfloaterinventorythumbnailshelper.h |  69 ++++
 indra/newview/llviewerfloaterreg.cpp               |   2 +
 .../xui/en/floater_inventory_thumbnails_helper.xml |  78 +++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  10 +-
 6 files changed, 550 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/llfloaterinventorythumbnailshelper.cpp
 create mode 100644 indra/newview/llfloaterinventorythumbnailshelper.h
 create mode 100644 indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4c6e37f82f..79fa3ec5b5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -232,6 +232,7 @@ set(viewer_SOURCE_FILES
     llfloaterimcontainer.cpp
     llfloaterinspect.cpp
     llfloaterinventorysettings.cpp
+    llfloaterinventorythumbnailshelper.cpp
     llfloaterjoystick.cpp
     llfloaterlagmeter.cpp
     llfloaterland.cpp
@@ -882,6 +883,7 @@ set(viewer_HEADER_FILES
     llfloaterimcontainer.h
     llfloaterinspect.h
     llfloaterinventorysettings.h
+    llfloaterinventorythumbnailshelper.h
     llfloaterjoystick.h
     llfloaterlagmeter.h
     llfloaterland.h
diff --git a/indra/newview/llfloaterinventorythumbnailshelper.cpp b/indra/newview/llfloaterinventorythumbnailshelper.cpp
new file mode 100644
index 0000000000..31ec144615
--- /dev/null
+++ b/indra/newview/llfloaterinventorythumbnailshelper.cpp
@@ -0,0 +1,390 @@
+/**
+ * @file llfloaterinventorythumbnailshelper.cpp
+ * @author Callum Prentice
+ * @brief LLFloaterInventoryThumbnailsHelper class implementation
+ *
+ * $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$
+ */
+
+/**
+ * Floater that appears when buying an object, giving a preview
+ * of its contents and their permissions.
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterinventorythumbnailshelper.h"
+#include "lluictrlfactory.h"
+#include "llclipboard.h"
+#include "llinventorymodel.h"
+#include "llinventoryfunctions.h"
+#include "lltexteditor.h"
+#include "llmediactrl.h"
+#include "lluuid.h"
+#include "llaisapi.h"
+
+LLFloaterInventoryThumbnailsHelper::LLFloaterInventoryThumbnailsHelper(const LLSD& key)
+    :   LLFloater("floater_inventory_thumbnails_helper")
+{
+}
+
+LLFloaterInventoryThumbnailsHelper::~LLFloaterInventoryThumbnailsHelper()
+{
+}
+
+BOOL LLFloaterInventoryThumbnailsHelper::postBuild()
+{
+    mPasteItemsBtn = getChild<LLUICtrl>("paste_items_btn");
+    mPasteItemsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onPasteItems, this));
+
+    mPasteTexturesBtn = getChild<LLUICtrl>("paste_textures_btn");
+    mPasteTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onPasteTextures, this));
+
+    mOutputLog = getChild<LLTextEditor>("output_log");
+    mOutputLog->setMaxTextLength(0xffff * 0x10);
+
+    mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
+    mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this));
+    mMergeItemsTexturesBtn->setEnabled(false);
+
+    mWriteThumbnailsBtn = getChild<LLUICtrl>("write_items_thumbnails");
+    mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onWriteThumbnails, this));
+    mWriteThumbnailsBtn->setEnabled(false);
+
+    return true;
+}
+
+void LLFloaterInventoryThumbnailsHelper::recordInventoryItemEntry(LLViewerInventoryItem* item)
+{
+    const std::string name = item->getName();
+
+    std::map<std::string, LLUUID>::iterator iter = mItemNamesIDs.find(name);
+    if (iter == mItemNamesIDs.end())
+    {
+        LLUUID id = item->getUUID();
+        mItemNamesIDs.insert({name, id});
+
+        mOutputLog->appendText(
+            STRINGIZE(
+                "ITEM " << mItemNamesIDs.size() << "> " <<
+                name <<
+                //" | " <<
+                //id.asString() <<
+                std::endl
+            ), false);
+    }
+    else
+    {
+        // dupe - do not save
+    }
+}
+
+void LLFloaterInventoryThumbnailsHelper::onPasteItems()
+{
+    if (!LLClipboard::instance().hasContents())
+    {
+        return;
+    }
+
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Pasting items from inventory ====" <<
+            std::endl
+        ), false);
+
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+    size_t count = objects.size();
+
+    for (size_t i = 0; i < count; i++)
+    {
+        const LLUUID& entry = objects.at(i);
+
+        const LLInventoryCategory* cat = gInventory.getCategory(entry);
+        if (cat)
+        {
+            LLInventoryModel::cat_array_t cat_array;
+            LLInventoryModel::item_array_t item_array;
+
+            LLIsType is_object(LLAssetType::AT_OBJECT);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_object);
+
+            LLIsType is_bodypart(LLAssetType::AT_BODYPART);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_bodypart);
+
+            for (size_t i = 0; i < item_array.size(); i++)
+            {
+                LLViewerInventoryItem* item = item_array.at(i);
+                recordInventoryItemEntry(item);
+            }
+        }
+
+        LLViewerInventoryItem* item = gInventory.getItem(entry);
+        if (item)
+        {
+            const LLAssetType::EType item_type = item->getType();
+            if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_BODYPART)
+            {
+                recordInventoryItemEntry(item);
+            }
+        }
+    }
+
+    mOutputLog->setCursorAndScrollToEnd();
+
+    mMergeItemsTexturesBtn->setEnabled(true);
+}
+
+void LLFloaterInventoryThumbnailsHelper::recordTextureItemEntry(LLViewerInventoryItem* item)
+{
+    const std::string name = item->getName();
+
+    std::map<std::string, LLUUID>::iterator iter = mTextureNamesIDs.find(name);
+    if (iter == mTextureNamesIDs.end())
+    {
+        LLUUID id = item->getAssetUUID();
+        mTextureNamesIDs.insert({name, id});
+
+        mOutputLog->appendText(
+            STRINGIZE(
+                "TEXTURE " << mTextureNamesIDs.size() << "> " <<
+                name <<
+                //" | " <<
+                //id.asString() <<
+                std::endl
+            ), false);
+    }
+    else
+    {
+        // dupe - do not save
+    }
+}
+
+void LLFloaterInventoryThumbnailsHelper::onPasteTextures()
+{
+    if (!LLClipboard::instance().hasContents())
+    {
+        return;
+    }
+
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Pasting textures from inventory ====" <<
+            std::endl
+        ), false);
+
+    std::vector<LLUUID> objects;
+    LLClipboard::instance().pasteFromClipboard(objects);
+    size_t count = objects.size();
+
+    for (size_t i = 0; i < count; i++)
+    {
+        const LLUUID& entry = objects.at(i);
+
+        const LLInventoryCategory* cat = gInventory.getCategory(entry);
+        if (cat)
+        {
+            LLInventoryModel::cat_array_t cat_array;
+            LLInventoryModel::item_array_t item_array;
+
+            LLIsType is_object(LLAssetType::AT_TEXTURE);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_object);
+
+            for (size_t i = 0; i < item_array.size(); i++)
+            {
+                LLViewerInventoryItem* item = item_array.at(i);
+                recordTextureItemEntry(item);
+            }
+        }
+
+        LLViewerInventoryItem* item = gInventory.getItem(entry);
+        if (item)
+        {
+            const LLAssetType::EType item_type = item->getType();
+            if (item_type == LLAssetType::AT_TEXTURE)
+            {
+                recordTextureItemEntry(item);
+            }
+        }
+    }
+
+    mOutputLog->setCursorAndScrollToEnd();
+
+    mMergeItemsTexturesBtn->setEnabled(true);
+}
+
+void LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures()
+{
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Matching items and textures for " <<
+            mItemNamesIDs.size() <<
+            " entries ====" <<
+            std::endl
+        ), false);
+
+    std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
+    size_t index = 1;
+
+    while (item_iter != mItemNamesIDs.end())
+    {
+        std::string item_name = (*item_iter).first;
+
+        mOutputLog->appendText(
+            STRINGIZE(
+                "MATCHING ITEM (" << index++  << "/" << mItemNamesIDs.size() << ") " << item_name << "> "
+            ), false);
+
+        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
+        if (texture_iter != mTextureNamesIDs.end())
+        {
+            mOutputLog->appendText(
+                STRINGIZE(
+                    "MATCHED" <<
+                    std::endl
+                ), false);
+
+            mNameItemIDTextureId.insert({item_name, {(*item_iter).second, (*texture_iter).second}});
+        }
+        else
+        {
+            mOutputLog->appendText(
+                STRINGIZE(
+                    "NO MATCH FOUND" <<
+                    std::endl
+                ), false);
+        }
+
+        ++item_iter;
+    }
+
+    mOutputLog->appendText(
+        STRINGIZE(
+            "==== Matched list of items and textures has " <<
+            mNameItemIDTextureId.size() <<
+            " entries ====" <<
+            std::endl
+        ), true);
+
+    //std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
+    //while (iter != mNameItemIDTextureId.end())
+    //{
+    //    std::string output_line = (*iter).first;
+    //    output_line += "\n";
+    //    output_line += "item ID: ";
+    //    output_line += ((*iter).second).first.asString();
+    //    output_line += "\n";
+    //    output_line += "thumbnail texture ID: ";
+    //    output_line += ((*iter).second).second.asString();
+    //    output_line +=  "\n";
+    //    mOutputLog->appendText(output_line, true);
+
+    //    ++iter;
+    //}
+    mOutputLog->setCursorAndScrollToEnd();
+
+    mWriteThumbnailsBtn->setEnabled(true);
+}
+
+#if 1
+// *TODO$: LLInventoryCallback should be deprecated to conform to the new boost::bind/coroutine model.
+// temp code in transition
+void bulkyInventoryCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
+{
+    if (cb.notNull())
+    {
+        cb->fire(id);
+    }
+}
+#endif
+
+bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
+{
+    if (AISAPI::isAvailable())
+    {
+
+        LLSD updates;
+        updates["thumbnail"] = LLSD().with("asset_id", thumbnail_asset_id.asString());
+
+        LLPointer<LLInventoryCallback> cb;
+
+        AISAPI::completion_t cr = boost::bind(&bulkyInventoryCb, cb, _1);
+        AISAPI::UpdateItem(item_id, updates, cr);
+
+        return true;
+    }
+    else
+    {
+        LL_WARNS() << "Unable to write inventory thumbnail because the AIS API is not available" << LL_ENDL;
+        return false;
+    }
+}
+
+void LLFloaterInventoryThumbnailsHelper::onWriteThumbnails()
+{
+    mOutputLog->appendText(
+        STRINGIZE(
+            "\n==== Writing thumbnails for " <<
+            mNameItemIDTextureId.size() <<
+            " entries ====" <<
+            std::endl
+        ), false);
+
+    std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
+    size_t index = 1;
+
+    while (iter != mNameItemIDTextureId.end())
+    {
+        mOutputLog->appendText(
+            STRINGIZE(
+                "WRITING THUMB (" << index++  << "/" << mNameItemIDTextureId.size() << ")> " <<
+                (*iter).first <<
+                "\n" <<
+                "item ID: " <<
+                ((*iter).second).first.asString() <<
+                "\n" <<
+                "thumbnail texture ID: " <<
+                ((*iter).second).second.asString() <<
+                "\n"
+            ), true);
+
+        LLUUID item_id = ((*iter).second).first;
+        LLUUID thumbnail_asset_id = ((*iter).second).second;
+
+        writeThumbnailID(item_id, thumbnail_asset_id);
+
+        ++iter;
+    }
+    mOutputLog->setCursorAndScrollToEnd();
+}
diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h
new file mode 100644
index 0000000000..69ce3e1fec
--- /dev/null
+++ b/indra/newview/llfloaterinventorythumbnailshelper.h
@@ -0,0 +1,69 @@
+/**
+ * @file llfloaterinventorythumbnailshelper.h
+ * @author Callum Prentice
+ * @brief Helper floater for bulk processing of inventory thumbnails
+ *
+ * $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_LLFLOATERINVENTORYTHUMBNAILSHELPER_H
+#define LL_LLFLOATERINVENTORYTHUMBNAILSHELPER_H
+
+#include "llfloater.h"
+class LLTextEditor;
+class LLMediaCtrl;
+class LLViewerInventoryItem;
+class LLUUID;
+
+class LLFloaterInventoryThumbnailsHelper:
+    public LLFloater
+{
+        friend class LLFloaterReg;
+    private:
+        LLFloaterInventoryThumbnailsHelper(const LLSD& key);
+        BOOL postBuild() override;
+        ~LLFloaterInventoryThumbnailsHelper();
+
+        LLUICtrl* mPasteItemsBtn;
+        void onPasteItems();
+
+        LLUICtrl* mPasteTexturesBtn;
+        void onPasteTextures();
+
+        LLTextEditor* mOutputLog;
+
+        LLUICtrl* mMergeItemsTexturesBtn;
+        void onMergeItemsTextures();
+
+        LLUICtrl* mWriteThumbnailsBtn;
+        void onWriteThumbnails();
+
+        void recordInventoryItemEntry(LLViewerInventoryItem* item);
+        void recordTextureItemEntry(LLViewerInventoryItem* item);
+
+        std::map<std::string, LLUUID> mItemNamesIDs;
+        std::map<std::string, LLUUID> mTextureNamesIDs;
+
+        std::map<std::string, std::pair< LLUUID, LLUUID>> mNameItemIDTextureId;
+};
+
+#endif // LL_LLFLOATERINVENTORYTHUMBNAILSHELPER_H
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 459101317b..093fc0d7b3 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -87,6 +87,7 @@
 #include "llfloaterimsession.h"
 #include "llfloaterinspect.h"
 #include "llfloaterinventorysettings.h"
+#include "llfloaterinventorythumbnailshelper.h"
 #include "llfloaterjoystick.h"
 #include "llfloaterlagmeter.h"
 #include "llfloaterland.h"
@@ -377,6 +378,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("incoming_call", "floater_incoming_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLIncomingCallDialog>);
 	LLFloaterReg::add("inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
 	LLFloaterReg::add("inspect", "floater_inspect.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInspect>);
+    LLFloaterReg::add("inventory_thumbnails_helper", "floater_inventory_thumbnails_helper.xml", (LLFloaterBuildFunc) &LLFloaterReg::build<LLFloaterInventoryThumbnailsHelper>);
 	LLFloaterReg::add("item_properties", "floater_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterItemProperties>);
     LLFloaterReg::add("task_properties", "floater_task_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterItemProperties>);
     LLFloaterReg::add("inventory_settings", "floater_inventory_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterInventorySettings>);
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
new file mode 100644
index 0000000000..79e0ef2b9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  legacy_header_height="18"
+  can_resize="false"
+  height="600"
+  layout="topleft"
+  min_height="175"
+  min_width="500"
+  name="contents"
+  help_topic="contents"
+  title="Inventory Thumbnails Helper"
+  width="500">
+    <scroll_list
+       top="20"
+       height="350"
+       draw_heading="true"
+       follows="all"
+       layout="topleft"
+       left="8"
+       multi_select="true"
+       name="inventory_thumbnails_textures_list"
+       right="-8"
+       tool_tip="Paste items from your inventory">
+        <scroll_list.columns
+             label="Inventory Item"
+             name="name"
+             relative_width="0.40" />
+        <scroll_list.columns
+             dynamic_width="true"
+             label="Texture Name"
+             name="expires"
+             relative_width="0.6" />
+    </scroll_list>
+    <text_editor
+      top="375"
+      height="140"
+      follows="all"
+      left="8"
+      right="-8"
+      name="output_log"
+      width="480"></text_editor>
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Paste items from Inventory"
+      layout="topleft"
+      left="10"
+      name="paste_items_btn"
+      bottom="-60"
+      width="235" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Paste textures from Inventory"
+      layout="topleft"
+      left_delta="0"
+      name="paste_textures_btn"
+      top_delta="26	"
+      width="235" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Write Thumbnails"
+      layout="topleft"
+      left_delta="0"
+      name="write_items_thumbnails_btn"
+      top_delta="26	"
+      width="235" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="List items with no thumb"
+      layout="bottomleft"
+      right="-10"
+      name="list_items_no_thumb_btn"
+      bottom="60"
+      width="235" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ebfe1405c9..1fe26cee2c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3493,7 +3493,15 @@ function="World.EnvPreset"
                  function="Floater.Show"
                  parameter="bulky_thumbs" />
 			</menu_item_call>
-          <menu_item_call
+            <menu_item_call
+             label="Inventory Thumbnails Helper"
+             name="Inventory Thumbnails Helper"
+				shortcut="control|alt|shift|X">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="inventory_thumbnails_helper" />
+            </menu_item_call>
+            <menu_item_call
            label="FB Connect Test"
            name="FB Connect Test">
             <menu_item_call.on_click
-- 
cgit v1.2.3


From abb8d0402c8498dc5ce8dfec1438f2fedbaecce9 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Fri, 11 Aug 2023 18:31:21 -0700
Subject: SL-20109: Some small UI tweaks before moving onto the meat of the
 functionality

---
 .../newview/llfloaterinventorythumbnailshelper.cpp | 22 +++++++++-------------
 indra/newview/llfloaterinventorythumbnailshelper.h |  3 +--
 .../xui/en/floater_inventory_thumbnails_helper.xml |  7 +++++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llfloaterinventorythumbnailshelper.cpp b/indra/newview/llfloaterinventorythumbnailshelper.cpp
index 31ec144615..abd5e01e5d 100644
--- a/indra/newview/llfloaterinventorythumbnailshelper.cpp
+++ b/indra/newview/llfloaterinventorythumbnailshelper.cpp
@@ -62,11 +62,11 @@ BOOL LLFloaterInventoryThumbnailsHelper::postBuild()
     mOutputLog = getChild<LLTextEditor>("output_log");
     mOutputLog->setMaxTextLength(0xffff * 0x10);
 
-    mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
-    mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this));
-    mMergeItemsTexturesBtn->setEnabled(false);
+    //mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
+    //mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this));
+    //mMergeItemsTexturesBtn->setEnabled(false);
 
-    mWriteThumbnailsBtn = getChild<LLUICtrl>("write_items_thumbnails");
+    mWriteThumbnailsBtn = getChild<LLUICtrl>("write_thumbnails_btn");
     mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onWriteThumbnails, this));
     mWriteThumbnailsBtn->setEnabled(false);
 
@@ -158,8 +158,6 @@ void LLFloaterInventoryThumbnailsHelper::onPasteItems()
     }
 
     mOutputLog->setCursorAndScrollToEnd();
-
-    mMergeItemsTexturesBtn->setEnabled(true);
 }
 
 void LLFloaterInventoryThumbnailsHelper::recordTextureItemEntry(LLViewerInventoryItem* item)
@@ -240,11 +238,9 @@ void LLFloaterInventoryThumbnailsHelper::onPasteTextures()
     }
 
     mOutputLog->setCursorAndScrollToEnd();
-
-    mMergeItemsTexturesBtn->setEnabled(true);
 }
 
-void LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures()
+void LLFloaterInventoryThumbnailsHelper::mergeItemsTextures()
 {
     mOutputLog->appendText(
         STRINGIZE(
@@ -320,7 +316,7 @@ void LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures()
 #if 1
 // *TODO$: LLInventoryCallback should be deprecated to conform to the new boost::bind/coroutine model.
 // temp code in transition
-void bulkyInventoryCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
+void inventoryThumbnailsHelperCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
 {
     if (cb.notNull())
     {
@@ -329,7 +325,7 @@ void bulkyInventoryCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
 }
 #endif
 
-bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
+bool writeInventoryThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
 {
     if (AISAPI::isAvailable())
     {
@@ -339,7 +335,7 @@ bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
 
         LLPointer<LLInventoryCallback> cb;
 
-        AISAPI::completion_t cr = boost::bind(&bulkyInventoryCb, cb, _1);
+        AISAPI::completion_t cr = boost::bind(&inventoryThumbnailsHelperCb, cb, _1);
         AISAPI::UpdateItem(item_id, updates, cr);
 
         return true;
@@ -382,7 +378,7 @@ void LLFloaterInventoryThumbnailsHelper::onWriteThumbnails()
         LLUUID item_id = ((*iter).second).first;
         LLUUID thumbnail_asset_id = ((*iter).second).second;
 
-        writeThumbnailID(item_id, thumbnail_asset_id);
+        writeInventoryThumbnailID(item_id, thumbnail_asset_id);
 
         ++iter;
     }
diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h
index 69ce3e1fec..3942214fe1 100644
--- a/indra/newview/llfloaterinventorythumbnailshelper.h
+++ b/indra/newview/llfloaterinventorythumbnailshelper.h
@@ -51,8 +51,7 @@ class LLFloaterInventoryThumbnailsHelper:
 
         LLTextEditor* mOutputLog;
 
-        LLUICtrl* mMergeItemsTexturesBtn;
-        void onMergeItemsTextures();
+        void mergeItemsTextures();
 
         LLUICtrl* mWriteThumbnailsBtn;
         void onWriteThumbnails();
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
index 79e0ef2b9f..62d0417f9e 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -38,7 +38,10 @@
       left="8"
       right="-8"
       name="output_log"
-      width="480"></text_editor>
+      font="Monospace"
+      text_color="0.1 0.5 0.1 1.0"
+      width="480">
+    </text_editor>
     <button
       follows="left|bottom"
       height="20"
@@ -63,7 +66,7 @@
       label="Write Thumbnails"
       layout="topleft"
       left_delta="0"
-      name="write_items_thumbnails_btn"
+      name="write_thumbnails_btn"
       top_delta="26	"
       width="235" />
     <button
-- 
cgit v1.2.3


From 7ea406355c4e3efc25303cb1f51637ac3e0f326d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 14 Aug 2023 18:05:26 +0300
Subject: SL-20144 remove the code related to non-existent button; remove
 inappropriate param

---
 indra/newview/llpanelprofilepicks.cpp              | 29 ----------------------
 indra/newview/llpanelprofilepicks.h                |  6 -----
 .../default/xui/en/panel_group_list_item_short.xml |  1 -
 3 files changed, 36 deletions(-)

diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index db3a3c6de5..c2a0c16df4 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -559,7 +559,6 @@ void LLPanelProfilePick::setAvatarId(const LLUUID& avatar_id)
     {
         mPickName->setEnabled(TRUE);
         mPickDescription->setEnabled(TRUE);
-        mSetCurrentLocationButton->setVisible(TRUE);
     }
     else
     {
@@ -574,7 +573,6 @@ BOOL LLPanelProfilePick::postBuild()
     mSaveButton = getChild<LLButton>("save_changes_btn");
     mCreateButton = getChild<LLButton>("create_changes_btn");
     mCancelButton = getChild<LLButton>("cancel_changes_btn");
-    mSetCurrentLocationButton = getChild<LLButton>("set_to_curr_location_btn");
 
     mSnapshotCtrl = getChild<LLTextureCtrl>("pick_snapshot");
     mSnapshotCtrl->setCommitCallback(boost::bind(&LLPanelProfilePick::onSnapshotChanged, this));
@@ -585,7 +583,6 @@ BOOL LLPanelProfilePick::postBuild()
     mSaveButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickSave, this));
     mCreateButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickSave, this));
     mCancelButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickCancel, this));
-    mSetCurrentLocationButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickSetLocation, this));
 
     mPickName->setKeystrokeCallback(boost::bind(&LLPanelProfilePick::onPickChanged, this, _1), NULL);
     mPickName->setEnabled(FALSE);
@@ -747,32 +744,6 @@ BOOL LLPanelProfilePick::isDirty() const
     return FALSE;
 }
 
-void LLPanelProfilePick::onClickSetLocation()
-{
-    // Save location for later use.
-    setPosGlobal(gAgent.getPositionGlobal());
-
-    std::string parcel_name, region_name;
-
-    LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-    if (parcel)
-    {
-        mParcelId = parcel->getID();
-        parcel_name = parcel->getName();
-    }
-
-    LLViewerRegion* region = gAgent.getRegion();
-    if (region)
-    {
-        region_name = region->getName();
-    }
-
-    setPickLocation(createLocationText(getLocationNotice(), parcel_name, region_name, getPosGlobal()));
-
-    mLocationChanged = true;
-    enableSaveButton(TRUE);
-}
-
 void LLPanelProfilePick::onClickSave()
 {
     sendUpdate();
diff --git a/indra/newview/llpanelprofilepicks.h b/indra/newview/llpanelprofilepicks.h
index f84463cc9b..228dfd5958 100644
--- a/indra/newview/llpanelprofilepicks.h
+++ b/indra/newview/llpanelprofilepicks.h
@@ -201,11 +201,6 @@ protected:
      */
     void resetDirty() override;
 
-    /**
-     * Callback for "Set Location" button click
-     */
-    void onClickSetLocation();
-
     /**
      * Callback for "Save" and "Create" button click
      */
@@ -228,7 +223,6 @@ protected:
     LLTextureCtrl*      mSnapshotCtrl;
     LLLineEditor*       mPickName;
     LLTextEditor*       mPickDescription;
-    LLButton*           mSetCurrentLocationButton;
     LLButton*           mSaveButton;
     LLButton*           mCreateButton;
     LLButton*           mCancelButton;
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index b72af7221e..8e2a241661 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
@@ -71,7 +71,6 @@
      name="visibility_show_btn"
      tool_tip="Show group on my profile"
      top_delta="0"
-     right_delta="0"
      height="20"
      width="20"
      follows="right"
-- 
cgit v1.2.3


From 600ea64eb5e24b655965ff3b45cd56b649de2848 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 14 Aug 2023 23:25:40 +0200
Subject: SL-19528 Remove PERMISSION_DEBIT warning (revert recent change)

---
 indra/newview/llviewermessage.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ce29238667..e7456f77bb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5815,22 +5815,6 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 		args["OBJECTNAME"] = object_name;
 		args["NAME"] = clean_owner_name;
 		S32 known_questions = 0;
-
-		// SL-19346, SL-19528 - No DEBIT warning for GRID & PRIVILEGED
-		if (experienceid.notNull())
-		{
-			const LLSD& experience = LLExperienceCache::instance().get(experienceid);
-			if (!experience.isUndefined())
-			{
-				S32 properties = experience[LLExperienceCache::PROPERTIES].asInteger();
-				if ((properties | LLExperienceCache::PROPERTY_GRID) &&
-					(properties | LLExperienceCache::PROPERTY_PRIVILEGED))
-				{
-					questions ^= SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
-				}
-			}
-		}
-
 		bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
 		// check the received permission flags against each permission
 		BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)
-- 
cgit v1.2.3


From cf60c97f6f232f97666884ef692779403fb449f8 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 14 Aug 2023 17:37:10 -0700
Subject:  SL-20109: New, helper version coming together slowly modulo XUI pain

---
 .../newview/llfloaterinventorythumbnailshelper.cpp | 48 ++++++++++++++++++++++
 indra/newview/llfloaterinventorythumbnailshelper.h |  4 ++
 .../xui/en/floater_inventory_thumbnails_helper.xml |  5 ++-
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloaterinventorythumbnailshelper.cpp b/indra/newview/llfloaterinventorythumbnailshelper.cpp
index abd5e01e5d..9697fc3d51 100644
--- a/indra/newview/llfloaterinventorythumbnailshelper.cpp
+++ b/indra/newview/llfloaterinventorythumbnailshelper.cpp
@@ -38,6 +38,7 @@
 #include "llinventorymodel.h"
 #include "llinventoryfunctions.h"
 #include "lltexteditor.h"
+#include "llscrolllistctrl.h"
 #include "llmediactrl.h"
 #include "lluuid.h"
 #include "llaisapi.h"
@@ -66,6 +67,10 @@ BOOL LLFloaterInventoryThumbnailsHelper::postBuild()
     //mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this));
     //mMergeItemsTexturesBtn->setEnabled(false);
 
+    mInventoryThumbnailsList = getChild<LLScrollListCtrl>("inventory_thumbnails_list");
+    mInventoryThumbnailsList->setAllowMultipleSelection(true);
+    mInventoryThumbnailsList->deleteAllItems();
+
     mWriteThumbnailsBtn = getChild<LLUICtrl>("write_thumbnails_btn");
     mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onWriteThumbnails, this));
     mWriteThumbnailsBtn->setEnabled(false);
@@ -91,6 +96,24 @@ void LLFloaterInventoryThumbnailsHelper::recordInventoryItemEntry(LLViewerInvent
                 //id.asString() <<
                 std::endl
             ), false);
+
+        // TODO: use this ID to get name of texture and display that
+        const LLUUID current_thumbnail_id = item->getThumbnailUUID();
+
+        std::string texture_display = std::string("Not Present");
+        if (!current_thumbnail_id.isNull())
+        {
+            texture_display = current_thumbnail_id.asString();
+        }
+
+        LLSD row;
+        row["columns"][0]["column"] = "name";
+        row["columns"][0]["type"] = "text";
+        row["columns"][0]["value"] = name;
+        row["columns"][1]["column"] = "texture";
+        row["columns"][1]["type"] = "text";
+        row["columns"][1]["value"] = texture_display;
+        mInventoryThumbnailsList->addElement(row);
     }
     else
     {
@@ -238,6 +261,31 @@ void LLFloaterInventoryThumbnailsHelper::onPasteTextures()
     }
 
     mOutputLog->setCursorAndScrollToEnd();
+
+    populateThumbnailNames();
+}
+
+
+void LLFloaterInventoryThumbnailsHelper::populateThumbnailNames()
+{
+    std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
+
+    while (item_iter != mItemNamesIDs.end())
+    {
+        std::string item_name = (*item_iter).first;
+
+        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
+        if (texture_iter != mTextureNamesIDs.end())
+        {
+            const bool case_sensitive = true;
+            LLScrollListItem* entry = mInventoryThumbnailsList->getItemByLabel(item_name, case_sensitive);
+
+            const std::string texture_name = (*texture_iter).first;
+            entry->getColumn(1)->setValue(LLSD(texture_name));
+        }
+
+        ++item_iter;
+    }
 }
 
 void LLFloaterInventoryThumbnailsHelper::mergeItemsTextures()
diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h
index 3942214fe1..ec83d5b7e0 100644
--- a/indra/newview/llfloaterinventorythumbnailshelper.h
+++ b/indra/newview/llfloaterinventorythumbnailshelper.h
@@ -30,6 +30,7 @@
 
 #include "llfloater.h"
 class LLTextEditor;
+class LLScrollListCtrl;
 class LLMediaCtrl;
 class LLViewerInventoryItem;
 class LLUUID;
@@ -43,6 +44,8 @@ class LLFloaterInventoryThumbnailsHelper:
         BOOL postBuild() override;
         ~LLFloaterInventoryThumbnailsHelper();
 
+        LLScrollListCtrl* mInventoryThumbnailsList;
+
         LLUICtrl* mPasteItemsBtn;
         void onPasteItems();
 
@@ -58,6 +61,7 @@ class LLFloaterInventoryThumbnailsHelper:
 
         void recordInventoryItemEntry(LLViewerInventoryItem* item);
         void recordTextureItemEntry(LLViewerInventoryItem* item);
+        void populateThumbnailNames();
 
         std::map<std::string, LLUUID> mItemNamesIDs;
         std::map<std::string, LLUUID> mTextureNamesIDs;
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
index 62d0417f9e..512bce2475 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -13,12 +13,13 @@
     <scroll_list
        top="20"
        height="350"
+       draw_stripes="true"
        draw_heading="true"
        follows="all"
        layout="topleft"
        left="8"
        multi_select="true"
-       name="inventory_thumbnails_textures_list"
+       name="inventory_thumbnails_list"
        right="-8"
        tool_tip="Paste items from your inventory">
         <scroll_list.columns
@@ -28,7 +29,7 @@
         <scroll_list.columns
              dynamic_width="true"
              label="Texture Name"
-             name="expires"
+             name="texture"
              relative_width="0.6" />
     </scroll_list>
     <text_editor
-- 
cgit v1.2.3


From 12f18ff4614225093f753b16cfd278880eca0387 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 15 Aug 2023 16:46:35 +0200
Subject: SL-20146 Statistic bar collapsed/expanded accordions not saving

---
 indra/llui/llcontainerview.cpp                     |  2 +-
 indra/llui/llcontainerview.h                       |  2 +-
 indra/llui/llstatview.cpp                          |  3 -
 indra/llui/llstatview.h                            |  4 +-
 indra/newview/app_settings/settings.xml            | 46 +++++++---
 .../newview/skins/default/xui/en/floater_stats.xml | 98 ++++++++++++----------
 6 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp
index 727fbe850e..1c33088e8d 100644
--- a/indra/llui/llcontainerview.cpp
+++ b/indra/llui/llcontainerview.cpp
@@ -288,7 +288,7 @@ void LLContainerView::setLabel(const std::string& label)
 	mLabel = label;
 }
 
-void LLContainerView::setDisplayChildren(const BOOL displayChildren)
+void LLContainerView::setDisplayChildren(BOOL displayChildren)
 {
 	mDisplayChildren = displayChildren;
 	for (child_list_const_iter_t child_iter = getChildList()->begin();
diff --git a/indra/llui/llcontainerview.h b/indra/llui/llcontainerview.h
index 99267d978a..8e75aaef6e 100644
--- a/indra/llui/llcontainerview.h
+++ b/indra/llui/llcontainerview.h
@@ -78,7 +78,7 @@ public:
 
 	void setLabel(const std::string& label);
 	void showLabel(BOOL show) { mShowLabel = show; }
-	void setDisplayChildren(const BOOL displayChildren);
+	void setDisplayChildren(BOOL displayChildren);
 	BOOL getDisplayChildren() { return mDisplayChildren; }
 	void setScrollContainer(LLScrollContainer* scroll) {mScrollContainer = scroll;}
 
diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp
index bb4969c81f..03f2fb7cc0 100644
--- a/indra/llui/llstatview.cpp
+++ b/indra/llui/llstatview.cpp
@@ -58,10 +58,7 @@ LLStatView::~LLStatView()
 	}
 }
 
-
 static StatViewRegistry::Register<LLStatBar> r1("stat_bar");
 static StatViewRegistry::Register<LLStatView> r2("stat_view");
 // stat_view can be a child of panels/etc.
 static LLDefaultChildRegistry::Register<LLStatView> r3("stat_view");
-
-
diff --git a/indra/llui/llstatview.h b/indra/llui/llstatview.h
index af4db7d7ea..044f0a8679 100644
--- a/indra/llui/llstatview.h
+++ b/indra/llui/llstatview.h
@@ -63,7 +63,7 @@ protected:
 	friend class LLUICtrlFactory;
 
 protected:
-	std::string mSetting;
-
+	const std::string mSetting;
 };
+
 #endif // LL_STATVIEW_
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c700302221..23e97ebad1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7485,10 +7485,21 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>OpenDebugStatBasic</key>
+    <map>
+      <key>Comment</key>
+      <string>Expand Basic performance stats display</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>OpenDebugStatAdvanced</key>
     <map>
       <key>Comment</key>
-      <string>Expand advanced performance stats display</string>
+      <string>Expand Advanced performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7496,10 +7507,10 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>OpenDebugStatBasic</key>
+    <key>OpenDebugStatRender</key>
     <map>
       <key>Comment</key>
-      <string>Expand basic performance stats display</string>
+      <string>Expand Render performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7507,10 +7518,21 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OpenDebugStatNet</key>
+    <key>OpenDebugStatTexture</key>
+    <map>
+      <key>Comment</key>
+      <string>Expand Texture performance stats display</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>OpenDebugStatMemory</key>
     <map>
       <key>Comment</key>
-      <string>Expand network stats display</string>
+      <string>Expand Memory Usage stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7518,10 +7540,10 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OpenDebugStatRender</key>
+    <key>OpenDebugStatNet</key>
     <map>
       <key>Comment</key>
-      <string>Expand render stats display</string>
+      <string>Expand Network performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7532,7 +7554,7 @@
     <key>OpenDebugStatSim</key>
     <map>
       <key>Comment</key>
-      <string>Expand simulator performance stats display</string>
+      <string>Expand Simulator performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7540,10 +7562,10 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OpenDebugStatTexture</key>
+    <key>OpenDebugStatPhysicsDetails</key>
     <map>
       <key>Comment</key>
-      <string>Expand Texture performance stats display</string>
+      <string>Expand Physics Details performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7551,10 +7573,10 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>OpenDebugStatPhysicsDetails</key>
+    <key>OpenDebugStatPathfinding</key>
     <map>
       <key>Comment</key>
-      <string>Expand Physics Details performance stats display</string>
+      <string>Expand Pathfinding performance stats display</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index b9ca0108b6..0fde6a329a 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -25,7 +25,7 @@
                     name="statistics_view"
                     top="20"
                     width="250" >
-     <stat_view name="basic"
+      <stat_view name="basic"
                  label="Basic"
                  setting="OpenDebugStatBasic">
         <stat_bar name="fps"
@@ -54,7 +54,7 @@
                   label="jitter"
                   decimal_digits="1"
                   stat="frametimejitter"/>
-       <stat_bar name="bandwidth"
+        <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   stat="activemessagedatareceived"
                   decimal_digits="0"
@@ -68,7 +68,7 @@
                   stat="simpingstat"/>
       </stat_view>
 
-     <stat_view name="advanced"
+      <stat_view name="advanced"
                  label="Advanced"
                  setting="OpenDebugStatAdvanced">
         <stat_view name="render"
@@ -84,28 +84,29 @@
           <stat_bar name="totalobjs"
                     label="Total Objects"
                     stat="numobjectsstat"/>
-					<stat_bar name="cachedobjs"
+          <stat_bar name="cachedobjs"
                     label="Cached Objects"
                     stat="numactivecachedobjects"/>
-					<stat_bar name="newobjs"
+          <stat_bar name="newobjs"
                     label="New Objects"
                     stat="numnewobjectsstat"/>
           <stat_bar name="object_cache_hits"
                     label="Object Cache Hit Rate"
                     stat="object_cache_hits"
                     show_history="true"/>
-					<stat_bar name="occlusion_queries"
-										label="Occlusion Queries Performed"
-										stat="occlusion_queries"/>
-					<stat_bar name="occluded"
-										label="Objects Occluded"
-										stat="occluded_objects"/>
-					<stat_bar name="unoccluded"
-										label="Object Unoccluded"
-										stat="unoccluded_objects"/>
-				</stat_view>
+          <stat_bar name="occlusion_queries"
+                    label="Occlusion Queries Performed"
+                    stat="occlusion_queries"/>
+          <stat_bar name="occluded"
+                    label="Objects Occluded"
+                    stat="occluded_objects"/>
+          <stat_bar name="unoccluded"
+                    label="Object Unoccluded"
+                    stat="unoccluded_objects"/>
+        </stat_view>
         <stat_view name="texture"
-                   label="Texture">
+                   label="Texture"
+                   setting="OpenDebugStatTexture">
           <stat_bar name="texture_cache_hits"
                     label="Cache Hit Rate"
                     stat="texture_cache_hits"
@@ -133,54 +134,55 @@
                     label="Bound Mem"
                     stat="glboundmemstat"/>
         </stat_view>
-			 <stat_view name="memory"
-									label="Memory Usage">
-				 <stat_bar name="LLTrace"
+        <stat_view name="memory"
+                   label="Memory Usage"
+                   setting="OpenDebugStatMemory">
+          <stat_bar name="LLTrace"
                     label="LLTrace"
                     stat="LLTrace"/>
-				 <stat_bar name="LLView"
+          <stat_bar name="LLView"
                     label="UI"
                     stat="LLView"/>
-				 <stat_bar name="LLFontFreetype"
+          <stat_bar name="LLFontFreetype"
                     label="Fonts"
                     stat="LLFontFreetype"/>
-				 <stat_bar name="LLInventoryObject"
+          <stat_bar name="LLInventoryObject"
                     label="Inventory"
                     stat="LLInventoryObject"/>
-				 <stat_bar name="LLViewerObject"
+          <stat_bar name="LLViewerObject"
                     label="Viewer Objects"
                     stat="LLViewerObject"/>
-				 <stat_bar name="LLViewerOctreeGroup"
-									 label="Octree Group Data"
-									 stat="LLViewerOctreeGroup"/>
-				 <stat_bar name="LLViewerOctreeEntry"
-									 label="Octree Data"
-									 stat="LLViewerOctreeEntry"/>
-				 <stat_bar name="LLVOCacheEntry"
+          <stat_bar name="LLViewerOctreeGroup"
+                    label="Octree Group Data"
+                    stat="LLViewerOctreeGroup"/>
+          <stat_bar name="LLViewerOctreeEntry"
+                    label="Octree Data"
+                    stat="LLViewerOctreeEntry"/>
+          <stat_bar name="LLVOCacheEntry"
                     label="Viewer Object Cache"
                     stat="LLVOCacheEntry"/>
-				 <stat_bar name="LLDrawable"
+          <stat_bar name="LLDrawable"
                     label="Drawables"
                     stat="LLDrawable"/>
-         <stat_bar name="LLFace"
-                     label="Face Data"
-                     stat="LLFace"/>
+          <stat_bar name="LLFace"
+                    label="Face Data"
+                    stat="LLFace"/>
           <stat_bar name="LLDrawInfo"
-                     label="Draw Info"
-                     stat="LLDrawInfo"/>
+                    label="Draw Info"
+                    stat="LLDrawInfo"/>
           <stat_bar name="LLTexture"
-                     label="Texture Data"
-                     stat="LLTexture"/>
-				 <stat_bar name="LLImage"
+                    label="Texture Data"
+                    stat="LLTexture"/>
+          <stat_bar name="LLImage"
                     label="Image Data"
                     stat="LLImage"/>
-				 <stat_bar name="LLImageGL"
+          <stat_bar name="LLImageGL"
                     label="GL Image Data"
                     stat="LLImageGL"/>
-				 <stat_bar name="LLVertexBuffer"
+          <stat_bar name="LLVertexBuffer"
                     label="Vertex Buffers"
                     stat="LLVertexBuffer"/>
-			 </stat_view>
+        </stat_view>
         <stat_view name="network"
                    label="Network"
                    setting="OpenDebugStatNet">
@@ -237,7 +239,8 @@
                   decimal_digits="1"
                   bar_max="45" />
         <stat_view name="physicsdetail"
-                   label="Physics Details">
+                   label="Physics Details"
+                   setting="OpenDebugStatPhysicsDetails">
           <stat_bar name="physicspinnedtasks"
                     label="Pinned Objects"
                     stat="physicspinnedtasks"/>
@@ -276,7 +279,8 @@
                   stat="simscripteps"
                   unit_label="eps"/>
         <stat_view name="simpathfinding"
-                   label="Pathfinding">
+                   label="Pathfinding"
+                   setting="OpenDebugStatPathfinding">
           <stat_bar name="simsimaistepmsec"
                     label="AI Step Time"
                     stat="simsimaistepmsec"/>
@@ -309,7 +313,8 @@
                   stat="simtotalunackedbytes"
                   decimal_digits="1"/>
         <stat_view name="simperf"
-                   label="Time">
+                   label="Time"
+                   setting="OpenDebugStatSimTime">
           <stat_bar name="simframemsec"
                     label="Total Frame Time"
                     stat="simframemsec"/>
@@ -335,7 +340,8 @@
                     label="Spare Time"
                     stat="simsparemsec"/>
           <stat_view name="timedetails"
-                     label="Time Details">
+                     label="Time Details"
+                     setting="OpenDebugStatSimTimeDetails">
             <stat_bar name="simsimphysicsstepmsec"
                       label="Physics Step"
                       stat="simsimphysicsstepmsec"/>
-- 
cgit v1.2.3


From 5430efbb31cfc0f57eac7fd130bb43aafa85143a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 15 Aug 2023 20:38:02 +0300
Subject: SL-20139 pressing the Tab key should paste tooltip only when hovering
 functions in LSL editor

---
 indra/llui/lltextbase.cpp   |  2 +-
 indra/llui/lltexteditor.cpp |  3 ++-
 indra/llui/lltooltip.cpp    | 20 ++++++++++++++++----
 indra/llui/lltooltip.h      |  8 +++++++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 8732a7ce45..26a38bd541 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -3431,7 +3431,7 @@ BOOL LLNormalTextSegment::handleToolTip(S32 x, S32 y, MASK mask)
 	if (mToken && !mToken->getToolTip().empty())
 	{
 		const LLWString& wmsg = mToken->getToolTip();
-		LLToolTipMgr::instance().show(wstring_to_utf8str(wmsg));
+        LLToolTipMgr::instance().show(wstring_to_utf8str(wmsg), (mToken->getType() == LLKeywordToken::TT_FUNCTION));
 		return TRUE;
 	}
 	// or do we have an explicitly set tooltip (e.g., for Urls)
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3d2a426913..c83ed4c3e1 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1779,7 +1779,8 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask )
 	else 
 	{
 		if (mEnableTooltipPaste &&
-			LLToolTipMgr::instance().toolTipVisible() && 
+			LLToolTipMgr::instance().toolTipVisible() &&
+            LLToolTipMgr::instance().isTooltipPastable() &&
 			KEY_TAB == key)
 		{	// Paste the first line of a tooltip into the editor
 			std::string message;
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 2f56a8b1d0..c4b132317f 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -154,7 +154,8 @@ LLToolTip::Params::Params()
 	text_color("text_color"),
 	time_based_media("time_based_media", false),
 	web_based_media("web_based_media", false),
-	media_playing("media_playing", false)
+	media_playing("media_playing", false),
+    allow_paste_tooltip("allow_paste_tooltip", false)
 {
 	changeDefault(chrome, true);
 }
@@ -166,7 +167,8 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
 	mTextBox(NULL),
 	mInfoButton(NULL),
 	mPlayMediaButton(NULL),
-	mHomePageButton(NULL)
+	mHomePageButton(NULL),
+    mIsTooltipPastable(p.allow_paste_tooltip)
 {
 	LLTextBox::Params params;
 	params.name = params.initial_value().asString();
@@ -308,6 +310,8 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p)
 	mTextBox->reshape(mTextBox->getRect().getWidth(), llmax(mTextBox->getRect().getHeight(), tooltip_rect.getHeight() - 2 * mPadding));
 
 	setShape(tooltip_rect);
+
+    mIsTooltipPastable = p.allow_paste_tooltip;
 }
 
 void LLToolTip::setVisible(BOOL visible)
@@ -469,9 +473,9 @@ void LLToolTipMgr::createToolTip(const LLToolTip::Params& params)
 }
 
 
-void LLToolTipMgr::show(const std::string& msg)
+void LLToolTipMgr::show(const std::string& msg, bool allow_paste_tooltip)
 {
-	show(LLToolTip::Params().message(msg));
+    show(LLToolTip::Params().message(msg).allow_paste_tooltip(allow_paste_tooltip));
 }
 
 void LLToolTipMgr::show(const LLToolTip::Params& params)
@@ -612,5 +616,13 @@ void LLToolTipMgr::getToolTipMessage(std::string & message)
 	}
 }
 
+bool LLToolTipMgr::isTooltipPastable()
+{
+    if (toolTipVisible())
+    {
+        return mToolTip->isTooltipPastable();
+    }
+    return false;
+ }
 
 // EOF
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index 0b1fbe5367..6ff7c0671a 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -91,6 +91,8 @@ public:
 									padding;
 		Optional<bool>				wrap;
 
+        Optional<bool> allow_paste_tooltip;
+
 		Params();
 	};
 	/*virtual*/ void draw();
@@ -106,6 +108,7 @@ public:
 	void initFromParams(const LLToolTip::Params& params);
 
 	void getToolTipMessage(std::string & message);
+    bool isTooltipPastable() { return mIsTooltipPastable; }
 
 private:
 	class LLTextBox*	mTextBox;
@@ -117,6 +120,8 @@ private:
 	LLFrameTimer	mVisibleTimer;
 	bool			mHasClickCallback;
 	S32				mPadding;	// pixels
+
+    bool mIsTooltipPastable;
 };
 
 // used for the inspector tooltips which need different background images etc.
@@ -134,7 +139,7 @@ class LLToolTipMgr : public LLSingleton<LLToolTipMgr>
 
 public:
 	void show(const LLToolTip::Params& params);
-	void show(const std::string& message);
+	void show(const std::string& message, bool allow_paste_tooltip = false);
 
 	void unblockToolTips();
 	void blockToolTips();
@@ -146,6 +151,7 @@ public:
 	void updateToolTipVisibility();
 
 	void getToolTipMessage(std::string & message);
+    bool isTooltipPastable();
 
 private:
 	void createToolTip(const LLToolTip::Params& params);
-- 
cgit v1.2.3


From e06cdc329a83b4c1e52eaf39b4b030763b7d8568 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 17 Aug 2023 19:37:24 +0300
Subject: SL-20158 FIXED Ctrl+H shortcut acts erratically when Nearby Chat
 floater is undocked

---
 indra/newview/llviewermenu.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 84396c2c68..814237ecdd 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6141,8 +6141,9 @@ class LLCommunicateNearbyChat : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLFloaterIMContainer* im_box = LLFloaterIMContainer::getInstance();
-		bool nearby_visible	= LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->isInVisibleChain();
-		if(nearby_visible && im_box->getSelectedSession() == LLUUID() && im_box->getConversationListItemSize() > 1)
+        LLFloaterIMNearbyChat* floater_nearby = LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
+        if (floater_nearby->isInVisibleChain() && !floater_nearby->isTornOff() 
+            && im_box->getSelectedSession() == LLUUID() && im_box->getConversationListItemSize() > 1)
 		{
 			im_box->selectNextorPreviousConversation(false);
 		}
-- 
cgit v1.2.3


From d3ed94885bcce5b7216ee23dc729de5409b73e53 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 17 Aug 2023 21:57:54 +0200
Subject: SL-20140 Optimization LLDictionary::addEntry() - avoid of double
 search

---
 indra/llcommon/lldictionary.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h
index 5800ec5e5d..3e86767d7e 100644
--- a/indra/llcommon/lldictionary.h
+++ b/indra/llcommon/lldictionary.h
@@ -87,11 +87,10 @@ protected:
 	}
 	void addEntry(Index index, Entry *entry)
 	{
-		if (lookup(index))
+		if (!insert(value_type(index, entry)).second)
 		{
 			LL_ERRS() << "Dictionary entry already added (attempted to add duplicate entry)" << LL_ENDL;
 		}
-		(*this)[index] = entry;
 	}
 };
 
-- 
cgit v1.2.3


From 10276ee967a5ad860fbf8750ce1012db3c5ae78a Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 17 Aug 2023 15:49:50 -0700
Subject: Small updates to bulky thumbs but mainly, this is about the first
 version of the Inventory Thumbnail Helper tool - see source file for a link
 to Confluence page listing how to use it

---
 indra/newview/llfloaterbulkythumbs.cpp             |  55 ++-
 indra/newview/llfloaterbulkythumbs.h               |   3 +
 .../newview/llfloaterinventorythumbnailshelper.cpp | 416 +++++++++++++--------
 indra/newview/llfloaterinventorythumbnailshelper.h |  28 +-
 .../skins/default/xui/en/floater_bulky_thumbs.xml  |  15 +-
 .../xui/en/floater_inventory_thumbnails_helper.xml |  33 +-
 .../newview/skins/default/xui/en/notifications.xml |  14 +
 7 files changed, 383 insertions(+), 181 deletions(-)

diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
index 9ffb71b394..02adf90acf 100644
--- a/indra/newview/llfloaterbulkythumbs.cpp
+++ b/indra/newview/llfloaterbulkythumbs.cpp
@@ -70,6 +70,10 @@ BOOL LLFloaterBulkyThumbs::postBuild()
     mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onWriteThumbnails, this));
     mWriteThumbnailsBtn->setEnabled(false);
 
+    mDisplayThumbnaillessItemsBtn = getChild<LLUICtrl>("display_thumbless_items");
+    mDisplayThumbnaillessItemsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onDisplayThumbnaillessItems, this));
+    mDisplayThumbnaillessItemsBtn->setEnabled(true);
+
     return true;
 }
 
@@ -96,6 +100,18 @@ void LLFloaterBulkyThumbs::recordInventoryItemEntry(LLViewerInventoryItem* item)
     {
         // dupe - do not save
     }
+
+    if (item->getThumbnailUUID() == LLUUID::null)
+    {
+        mOutputLog->appendText(
+            STRINGIZE(
+                "ITEM " << mItemNamesIDs.size() << "> " <<
+                name <<
+                " has no thumbnail" <<
+                //id.asString() <<
+                std::endl
+            ), false);
+    }
 }
 
 void LLFloaterBulkyThumbs::onPasteItems()
@@ -139,6 +155,13 @@ void LLFloaterBulkyThumbs::onPasteItems()
                                             LLInventoryModel::EXCLUDE_TRASH,
                                             is_bodypart);
 
+            LLIsType is_clothing(LLAssetType::AT_CLOTHING);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_clothing);
+
             for (size_t i = 0; i < item_array.size(); i++)
             {
                 LLViewerInventoryItem* item = item_array.at(i);
@@ -150,7 +173,7 @@ void LLFloaterBulkyThumbs::onPasteItems()
         if (item)
         {
             const LLAssetType::EType item_type = item->getType();
-            if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_BODYPART)
+            if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_BODYPART || item_type == LLAssetType::AT_CLOTHING)
             {
                 recordInventoryItemEntry(item);
             }
@@ -388,3 +411,33 @@ void LLFloaterBulkyThumbs::onWriteThumbnails()
     }
     mOutputLog->setCursorAndScrollToEnd();
 }
+
+void LLFloaterBulkyThumbs::onDisplayThumbnaillessItems()
+{
+    //std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
+    //size_t index = 1;
+
+    //mOutputLog->appendText("======= Items with no thumbnail =======", false);
+
+    //while (item_iter != mItemNamesIDs.end())
+    //{
+    //    std::string item_name = (*item_iter).first;
+
+    //    //mOutputLog->appendText(
+    //    //    STRINGIZE(
+    //    //        "MATCHING ITEM (" << index++  << "/" << mItemNamesIDs.size() << ") " << item_name << "> "
+    //    //    ), false);
+
+    //    std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
+    //    if (texture_iter == mTextureNamesIDs.end())
+    //    {
+    //        mOutputLog->appendText(
+    //            STRINGIZE(
+    //                "MISSING:" <<
+
+    //                std::endl
+    //            ), false);
+
+    //    }
+    //}
+}
diff --git a/indra/newview/llfloaterbulkythumbs.h b/indra/newview/llfloaterbulkythumbs.h
index 75657002b3..10133553a6 100644
--- a/indra/newview/llfloaterbulkythumbs.h
+++ b/indra/newview/llfloaterbulkythumbs.h
@@ -57,6 +57,9 @@ class LLFloaterBulkyThumbs:
         LLUICtrl* mWriteThumbnailsBtn;
         void onWriteThumbnails();
 
+        LLUICtrl* mDisplayThumbnaillessItemsBtn;
+        void onDisplayThumbnaillessItems();
+
         void recordInventoryItemEntry(LLViewerInventoryItem* item);
         void recordTextureItemEntry(LLViewerInventoryItem* item);
 
diff --git a/indra/newview/llfloaterinventorythumbnailshelper.cpp b/indra/newview/llfloaterinventorythumbnailshelper.cpp
index 9697fc3d51..15e1c88572 100644
--- a/indra/newview/llfloaterinventorythumbnailshelper.cpp
+++ b/indra/newview/llfloaterinventorythumbnailshelper.cpp
@@ -3,6 +3,9 @@
  * @author Callum Prentice
  * @brief LLFloaterInventoryThumbnailsHelper class implementation
  *
+ * Usage instructions and some brief notes can be found in Confluence here:
+ * https://lindenlab.atlassian.net/wiki/spaces/~174746736/pages/2928672843/Inventory+Thumbnail+Helper+Tool
+ * 
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
@@ -25,23 +28,20 @@
  * $/LicenseInfo$
  */
 
-/**
- * Floater that appears when buying an object, giving a preview
- * of its contents and their permissions.
- */
-
 #include "llviewerprecompiledheaders.h"
 
-#include "llfloaterinventorythumbnailshelper.h"
-#include "lluictrlfactory.h"
+#include "llaisapi.h"
 #include "llclipboard.h"
-#include "llinventorymodel.h"
 #include "llinventoryfunctions.h"
-#include "lltexteditor.h"
+#include "llinventorymodel.h"
+#include "llnotifications.h"
+#include "llnotificationsutil.h"
 #include "llscrolllistctrl.h"
-#include "llmediactrl.h"
+#include "lltexteditor.h"
+#include "lluictrlfactory.h"
 #include "lluuid.h"
-#include "llaisapi.h"
+
+#include "llfloaterinventorythumbnailshelper.h"
 
 LLFloaterInventoryThumbnailsHelper::LLFloaterInventoryThumbnailsHelper(const LLSD& key)
     :   LLFloater("floater_inventory_thumbnails_helper")
@@ -54,66 +54,53 @@ LLFloaterInventoryThumbnailsHelper::~LLFloaterInventoryThumbnailsHelper()
 
 BOOL LLFloaterInventoryThumbnailsHelper::postBuild()
 {
-    mPasteItemsBtn = getChild<LLUICtrl>("paste_items_btn");
-    mPasteItemsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onPasteItems, this));
-
-    mPasteTexturesBtn = getChild<LLUICtrl>("paste_textures_btn");
-    mPasteTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onPasteTextures, this));
+    mInventoryThumbnailsList = getChild<LLScrollListCtrl>("inventory_thumbnails_list");
+    mInventoryThumbnailsList->setAllowMultipleSelection(true);
 
     mOutputLog = getChild<LLTextEditor>("output_log");
     mOutputLog->setMaxTextLength(0xffff * 0x10);
 
-    //mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
-    //mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onMergeItemsTextures, this));
-    //mMergeItemsTexturesBtn->setEnabled(false);
+    mPasteItemsBtn = getChild<LLUICtrl>("paste_items_btn");
+    mPasteItemsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onPasteItems, this));
+    mPasteItemsBtn->setEnabled(true);
 
-    mInventoryThumbnailsList = getChild<LLScrollListCtrl>("inventory_thumbnails_list");
-    mInventoryThumbnailsList->setAllowMultipleSelection(true);
-    mInventoryThumbnailsList->deleteAllItems();
+    mPasteTexturesBtn = getChild<LLUICtrl>("paste_textures_btn");
+    mPasteTexturesBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onPasteTextures, this));
+    mPasteTexturesBtn->setEnabled(true);
 
     mWriteThumbnailsBtn = getChild<LLUICtrl>("write_thumbnails_btn");
     mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onWriteThumbnails, this));
     mWriteThumbnailsBtn->setEnabled(false);
 
+    mLogMissingThumbnailsBtn = getChild<LLUICtrl>("log_missing_thumbnails_btn");
+    mLogMissingThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onLogMissingThumbnails, this));
+    mLogMissingThumbnailsBtn->setEnabled(false);
+
+    mClearThumbnailsBtn = getChild<LLUICtrl>("clear_thumbnails_btn");
+    mClearThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterInventoryThumbnailsHelper::onClearThumbnails, this));
+    mClearThumbnailsBtn->setEnabled(false);
+
     return true;
 }
 
+// Records an entry in the pasted items - saves it to a map and writes it to the log
+// window for later confirmation/validation - since it uses a map, duplicates (based on
+// the name) are discarded
 void LLFloaterInventoryThumbnailsHelper::recordInventoryItemEntry(LLViewerInventoryItem* item)
 {
     const std::string name = item->getName();
 
-    std::map<std::string, LLUUID>::iterator iter = mItemNamesIDs.find(name);
-    if (iter == mItemNamesIDs.end())
+    std::map<std::string, LLViewerInventoryItem*>::iterator iter = mItemNamesItems.find(name);
+    if (iter == mItemNamesItems.end())
     {
-        LLUUID id = item->getUUID();
-        mItemNamesIDs.insert({name, id});
+        mItemNamesItems.insert({name, item});
 
-        mOutputLog->appendText(
+        writeToLog(
             STRINGIZE(
-                "ITEM " << mItemNamesIDs.size() << "> " <<
+                "ITEM " << mItemNamesItems.size() << "> " <<
                 name <<
-                //" | " <<
-                //id.asString() <<
                 std::endl
             ), false);
-
-        // TODO: use this ID to get name of texture and display that
-        const LLUUID current_thumbnail_id = item->getThumbnailUUID();
-
-        std::string texture_display = std::string("Not Present");
-        if (!current_thumbnail_id.isNull())
-        {
-            texture_display = current_thumbnail_id.asString();
-        }
-
-        LLSD row;
-        row["columns"][0]["column"] = "name";
-        row["columns"][0]["type"] = "text";
-        row["columns"][0]["value"] = name;
-        row["columns"][1]["column"] = "texture";
-        row["columns"][1]["type"] = "text";
-        row["columns"][1]["value"] = texture_display;
-        mInventoryThumbnailsList->addElement(row);
     }
     else
     {
@@ -121,6 +108,10 @@ void LLFloaterInventoryThumbnailsHelper::recordInventoryItemEntry(LLViewerInvent
     }
 }
 
+// Called when the user has copied items from their inventory and selects the Paste Items button
+// in the UI - iterates over items and folders and saves details of each one.
+// The first use of this tool is for updating NUX items and as such, only looks for OBJECTS,
+// CLOTHING and BODYPARTS - later versions of this tool should make that selection editable.
 void LLFloaterInventoryThumbnailsHelper::onPasteItems()
 {
     if (!LLClipboard::instance().hasContents())
@@ -128,7 +119,7 @@ void LLFloaterInventoryThumbnailsHelper::onPasteItems()
         return;
     }
 
-    mOutputLog->appendText(
+    writeToLog(
         STRINGIZE(
             "\n==== Pasting items from inventory ====" <<
             std::endl
@@ -142,6 +133,7 @@ void LLFloaterInventoryThumbnailsHelper::onPasteItems()
     {
         const LLUUID& entry = objects.at(i);
 
+        // Check for a folder
         const LLInventoryCategory* cat = gInventory.getCategory(entry);
         if (cat)
         {
@@ -162,6 +154,13 @@ void LLFloaterInventoryThumbnailsHelper::onPasteItems()
                                             LLInventoryModel::EXCLUDE_TRASH,
                                             is_bodypart);
 
+            LLIsType is_clothing(LLAssetType::AT_CLOTHING);
+            gInventory.collectDescendentsIf(cat->getUUID(),
+                                            cat_array,
+                                            item_array,
+                                            LLInventoryModel::EXCLUDE_TRASH,
+                                            is_clothing);
+
             for (size_t i = 0; i < item_array.size(); i++)
             {
                 LLViewerInventoryItem* item = item_array.at(i);
@@ -169,20 +168,28 @@ void LLFloaterInventoryThumbnailsHelper::onPasteItems()
             }
         }
 
+        // Check for an item
         LLViewerInventoryItem* item = gInventory.getItem(entry);
         if (item)
         {
             const LLAssetType::EType item_type = item->getType();
-            if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_BODYPART)
+            if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_BODYPART || item_type == LLAssetType::AT_CLOTHING)
             {
                 recordInventoryItemEntry(item);
             }
         }
     }
 
-    mOutputLog->setCursorAndScrollToEnd();
+    // update the main list view based on what we found
+    updateDisplayList();
+
+    // update the buttons enabled state based on what we found/saved
+    updateButtonStates();
 }
 
+// Records a entry in the pasted textures - saves it to a map and writes it to the log
+// window for later confirmation/validation - since it uses a map, duplicates (based on
+// the name) are discarded
 void LLFloaterInventoryThumbnailsHelper::recordTextureItemEntry(LLViewerInventoryItem* item)
 {
     const std::string name = item->getName();
@@ -193,7 +200,7 @@ void LLFloaterInventoryThumbnailsHelper::recordTextureItemEntry(LLViewerInventor
         LLUUID id = item->getAssetUUID();
         mTextureNamesIDs.insert({name, id});
 
-        mOutputLog->appendText(
+        writeToLog(
             STRINGIZE(
                 "TEXTURE " << mTextureNamesIDs.size() << "> " <<
                 name <<
@@ -208,6 +215,8 @@ void LLFloaterInventoryThumbnailsHelper::recordTextureItemEntry(LLViewerInventor
     }
 }
 
+// Called when the user has copied textures from their inventory and selects the Paste Textures
+// button in the UI - iterates over textures and folders and saves details of each one.
 void LLFloaterInventoryThumbnailsHelper::onPasteTextures()
 {
     if (!LLClipboard::instance().hasContents())
@@ -215,7 +224,7 @@ void LLFloaterInventoryThumbnailsHelper::onPasteTextures()
         return;
     }
 
-    mOutputLog->appendText(
+    writeToLog(
         STRINGIZE(
             "\n==== Pasting textures from inventory ====" <<
             std::endl
@@ -260,105 +269,65 @@ void LLFloaterInventoryThumbnailsHelper::onPasteTextures()
         }
     }
 
-    mOutputLog->setCursorAndScrollToEnd();
+    // update the main list view based on what we found
+    updateDisplayList();
 
-    populateThumbnailNames();
+    // update the buttons enabled state based on what we found/saved
+    updateButtonStates();
 }
 
-
-void LLFloaterInventoryThumbnailsHelper::populateThumbnailNames()
+// Updates the main list of entries in the UI based on what is in the maps/storage
+void LLFloaterInventoryThumbnailsHelper::updateDisplayList()
 {
-    std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
+    mInventoryThumbnailsList->deleteAllItems();
 
-    while (item_iter != mItemNamesIDs.end())
+    std::map<std::string, LLViewerInventoryItem*>::iterator item_iter = mItemNamesItems.begin();
+    while (item_iter != mItemNamesItems.end())
     {
         std::string item_name = (*item_iter).first;
 
-        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
-        if (texture_iter != mTextureNamesIDs.end())
+        std::string existing_texture_name = std::string();
+        LLUUID existing_thumbnail_id = (*item_iter).second->getThumbnailUUID();
+        if (existing_thumbnail_id != LLUUID::null)
         {
-            const bool case_sensitive = true;
-            LLScrollListItem* entry = mInventoryThumbnailsList->getItemByLabel(item_name, case_sensitive);
-
-            const std::string texture_name = (*texture_iter).first;
-            entry->getColumn(1)->setValue(LLSD(texture_name));
+            existing_texture_name = existing_thumbnail_id.asString();
+        }
+        else
+        {
+            existing_texture_name = "none";
         }
 
-        ++item_iter;
-    }
-}
-
-void LLFloaterInventoryThumbnailsHelper::mergeItemsTextures()
-{
-    mOutputLog->appendText(
-        STRINGIZE(
-            "\n==== Matching items and textures for " <<
-            mItemNamesIDs.size() <<
-            " entries ====" <<
-            std::endl
-        ), false);
-
-    std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
-    size_t index = 1;
-
-    while (item_iter != mItemNamesIDs.end())
-    {
-        std::string item_name = (*item_iter).first;
-
-        mOutputLog->appendText(
-            STRINGIZE(
-                "MATCHING ITEM (" << index++  << "/" << mItemNamesIDs.size() << ") " << item_name << "> "
-            ), false);
-
+        std::string new_texture_name = std::string();
         std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
         if (texture_iter != mTextureNamesIDs.end())
         {
-            mOutputLog->appendText(
-                STRINGIZE(
-                    "MATCHED" <<
-                    std::endl
-                ), false);
-
-            mNameItemIDTextureId.insert({item_name, {(*item_iter).second, (*texture_iter).second}});
+            new_texture_name = (*texture_iter).first;
         }
         else
         {
-            mOutputLog->appendText(
-                STRINGIZE(
-                    "NO MATCH FOUND" <<
-                    std::endl
-                ), false);
+            new_texture_name = "missing";
         }
 
-        ++item_iter;
-    }
+        LLSD row;
+        row["columns"][EListColumnNum::NAME]["column"] = "item_name";
+        row["columns"][EListColumnNum::NAME]["type"] = "text";
+        row["columns"][EListColumnNum::NAME]["value"] = item_name;
+        row["columns"][EListColumnNum::NAME]["font"]["name"] = "Monospace";
 
-    mOutputLog->appendText(
-        STRINGIZE(
-            "==== Matched list of items and textures has " <<
-            mNameItemIDTextureId.size() <<
-            " entries ====" <<
-            std::endl
-        ), true);
-
-    //std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
-    //while (iter != mNameItemIDTextureId.end())
-    //{
-    //    std::string output_line = (*iter).first;
-    //    output_line += "\n";
-    //    output_line += "item ID: ";
-    //    output_line += ((*iter).second).first.asString();
-    //    output_line += "\n";
-    //    output_line += "thumbnail texture ID: ";
-    //    output_line += ((*iter).second).second.asString();
-    //    output_line +=  "\n";
-    //    mOutputLog->appendText(output_line, true);
-
-    //    ++iter;
-    //}
-    mOutputLog->setCursorAndScrollToEnd();
+        row["columns"][EListColumnNum::EXISTING_TEXTURE]["column"] = "existing_texture";
+        row["columns"][EListColumnNum::EXISTING_TEXTURE]["type"] = "text";
+        row["columns"][EListColumnNum::EXISTING_TEXTURE]["font"]["name"] = "Monospace";
+        row["columns"][EListColumnNum::EXISTING_TEXTURE]["value"] = existing_texture_name;
+
+        row["columns"][EListColumnNum::NEW_TEXTURE]["column"] = "new_texture";
+        row["columns"][EListColumnNum::NEW_TEXTURE]["type"] = "text";
+        row["columns"][EListColumnNum::NEW_TEXTURE]["font"]["name"] = "Monospace";
+        row["columns"][EListColumnNum::NEW_TEXTURE]["value"] = new_texture_name;
+
+        mInventoryThumbnailsList->addElement(row);
 
-    mWriteThumbnailsBtn->setEnabled(true);
+        ++item_iter;
+    }
 }
 
 #if 1
@@ -373,6 +342,9 @@ void inventoryThumbnailsHelperCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
 }
 #endif
 
+// Makes calls to the AIS v3 API to record the local changes made to the thumbnails.
+// If this is not called, the operations (e.g. set thumbnail or clear thumbnail)
+// appear to work but do not push the changes back to the inventory (local cache view only)
 bool writeInventoryThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
 {
     if (AISAPI::isAvailable())
@@ -395,40 +367,164 @@ bool writeInventoryThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
     }
 }
 
+// Called when the Write Thumbanils button is pushed. Iterates over the name/item and
+// name/.texture maps and where it finds a common name, extracts what is needed and
+// writes the thumbnail accordingly.
 void LLFloaterInventoryThumbnailsHelper::onWriteThumbnails()
 {
-    mOutputLog->appendText(
-        STRINGIZE(
-            "\n==== Writing thumbnails for " <<
-            mNameItemIDTextureId.size() <<
-            " entries ====" <<
-            std::endl
-        ), false);
+    std::map<std::string, LLViewerInventoryItem*>::iterator item_iter = mItemNamesItems.begin();
+    while (item_iter != mItemNamesItems.end())
+    {
+        std::string item_name = (*item_iter).first;
+
+        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
+        if (texture_iter != mTextureNamesIDs.end())
+        {
+            LLUUID item_id = (*item_iter).second->getUUID();
+
+            LLUUID thumbnail_asset_id = (*texture_iter).second;
 
-    std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
-    size_t index = 1;
+            writeToLog(
+                STRINGIZE(
+                    "WRITING THUMB " <<
+                    (*item_iter).first <<
+                    "\n" <<
+                    "item ID: " <<
+                    item_id <<
+                    "\n" <<
+                    "thumbnail texture ID: " <<
+                    thumbnail_asset_id <<
+                    "\n"
+                ), true);
+
+
+            (*item_iter).second->setThumbnailUUID(thumbnail_asset_id);
+
+            // This additional step (notifying AIS API) is required
+            // to make the changes persist outside of the local cache
+            writeInventoryThumbnailID(item_id, thumbnail_asset_id);
+        }
 
-    while (iter != mNameItemIDTextureId.end())
+        ++item_iter;
+    }
+
+    updateDisplayList();
+}
+
+// Called when the Log Items with Missing Thumbnails is selected. This merely writes
+// a list of all the items for which the thumbnail ID is Null. Typical use case is to
+// copy from the log window, pasted to Slack to illustrate which items are missing
+// a thumbnail
+void LLFloaterInventoryThumbnailsHelper::onLogMissingThumbnails()
+{
+    std::map<std::string, LLViewerInventoryItem*>::iterator item_iter = mItemNamesItems.begin();
+    while (item_iter != mItemNamesItems.end())
     {
-        mOutputLog->appendText(
-            STRINGIZE(
-                "WRITING THUMB (" << index++  << "/" << mNameItemIDTextureId.size() << ")> " <<
-                (*iter).first <<
-                "\n" <<
-                "item ID: " <<
-                ((*iter).second).first.asString() <<
-                "\n" <<
-                "thumbnail texture ID: " <<
-                ((*iter).second).second.asString() <<
-                "\n"
-            ), true);
-
-        LLUUID item_id = ((*iter).second).first;
-        LLUUID thumbnail_asset_id = ((*iter).second).second;
-
-        writeInventoryThumbnailID(item_id, thumbnail_asset_id);
-
-        ++iter;
+        LLUUID thumbnail_id = (*item_iter).second->getThumbnailUUID();
+
+        if (thumbnail_id == LLUUID::null)
+        {
+            writeToLog(
+                STRINGIZE(
+                    "Missing thumbnail: " <<
+                    (*item_iter).first <<
+                    std::endl
+                ), true);
+        }
+
+        ++item_iter;
+    }
+}
+
+// Called when the Clear Thumbnail button is selected.  Code to perform the clear (really
+// just writing a NULL UUID into the thumbnail field) is behind an "Are you Sure?" dialog
+// since it cannot be undone and potentinally, you could remove the thumbnails from your
+// whole inventory this way.
+void LLFloaterInventoryThumbnailsHelper::onClearThumbnails()
+{
+    // create and show confirmation (Yes/No) textbox since this is a destructive operation
+    LLNotificationsUtil::add("ClearInventoryThumbnailsWarning", LLSD(), LLSD(),
+                             [&](const LLSD & notif, const LLSD & resp)
+    {
+        S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp);
+        if (opt == 0)
+        {
+            std::map<std::string, LLViewerInventoryItem*>::iterator item_iter = mItemNamesItems.begin();
+            while (item_iter != mItemNamesItems.end())
+            {
+                (*item_iter).second->setThumbnailUUID(LLUUID::null);
+
+                // This additional step (notifying AIS API) is required
+                // to make the changes persist outside of the local cache
+                const LLUUID item_id = (*item_iter).second->getUUID();
+                writeInventoryThumbnailID(item_id, LLUUID::null);
+
+                ++item_iter;
+            }
+
+            updateDisplayList();
+        }
+        else
+        {
+            LL_INFOS() << "Clearing on thumbnails was canceled" << LL_ENDL;
+        }
+    });
+}
+
+// Update the endabled state of some of the UI buttons based on what has
+// been recorded so far.  For example, if there are no valid item/texture pairs,
+// then the Write Thumbnails button is not enabled.
+void LLFloaterInventoryThumbnailsHelper::updateButtonStates()
+{
+    size_t found_count = 0;
+
+    std::map<std::string, LLViewerInventoryItem*>::iterator item_iter = mItemNamesItems.begin();
+    while (item_iter != mItemNamesItems.end())
+    {
+        std::string item_name = (*item_iter).first;
+
+        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
+        if (texture_iter != mTextureNamesIDs.end())
+        {
+            found_count++;
+        }
+
+        ++item_iter;
+    }
+
+    // the "Write Thumbnails" button is only enabled when there is at least one
+    // item with a matching texture ready to be written to the thumbnail field
+    if (found_count > 0)
+    {
+        mWriteThumbnailsBtn->setEnabled(true);
     }
+    else
+    {
+        mWriteThumbnailsBtn->setEnabled(false);
+    }
+
+    // The "Log Missing Items" and "Clear Thumbnails" buttons are only enabled
+    // when there is at least 1 item that was pasted from inventory (doesn't need
+    // to have a matching texture for these operations)
+    if (mItemNamesItems.size() > 0)
+    {
+        mLogMissingThumbnailsBtn->setEnabled(true);
+        mClearThumbnailsBtn->setEnabled(true);
+    }
+    else
+    {
+        mLogMissingThumbnailsBtn->setEnabled(false);
+        mClearThumbnailsBtn->setEnabled(false);
+    }
+}
+
+// Helper function for writing a line to the log window. Currently the only additional
+// feature is that it scrolls to the bottom each time a line is written but it
+// is envisaged that other common actions will be added here eventually - E.G. write eavh
+// line to the Second Life log too for example.
+void LLFloaterInventoryThumbnailsHelper::writeToLog(std::string logline, bool prepend_newline)
+{
+    mOutputLog->appendText(logline, prepend_newline);
+
     mOutputLog->setCursorAndScrollToEnd();
 }
diff --git a/indra/newview/llfloaterinventorythumbnailshelper.h b/indra/newview/llfloaterinventorythumbnailshelper.h
index ec83d5b7e0..b42a85d1a5 100644
--- a/indra/newview/llfloaterinventorythumbnailshelper.h
+++ b/indra/newview/llfloaterinventorythumbnailshelper.h
@@ -1,7 +1,7 @@
 /**
  * @file llfloaterinventorythumbnailshelper.h
  * @author Callum Prentice
- * @brief Helper floater for bulk processing of inventory thumbnails
+ * @brief Helper floater for bulk processing of inventory thumbnails tool
  *
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -31,7 +31,6 @@
 #include "llfloater.h"
 class LLTextEditor;
 class LLScrollListCtrl;
-class LLMediaCtrl;
 class LLViewerInventoryItem;
 class LLUUID;
 
@@ -46,27 +45,38 @@ class LLFloaterInventoryThumbnailsHelper:
 
         LLScrollListCtrl* mInventoryThumbnailsList;
 
+        LLTextEditor* mOutputLog;
+
         LLUICtrl* mPasteItemsBtn;
         void onPasteItems();
 
         LLUICtrl* mPasteTexturesBtn;
         void onPasteTextures();
 
-        LLTextEditor* mOutputLog;
-
-        void mergeItemsTextures();
-
         LLUICtrl* mWriteThumbnailsBtn;
         void onWriteThumbnails();
 
+        LLUICtrl* mLogMissingThumbnailsBtn;
+        void onLogMissingThumbnails();
+
+        LLUICtrl* mClearThumbnailsBtn;
+        void onClearThumbnails();
+
         void recordInventoryItemEntry(LLViewerInventoryItem* item);
         void recordTextureItemEntry(LLViewerInventoryItem* item);
-        void populateThumbnailNames();
+        void updateButtonStates();
+        void updateDisplayList();
+        void writeToLog(std::string logline, bool prepend_newline);
 
-        std::map<std::string, LLUUID> mItemNamesIDs;
+        std::map<std::string, LLViewerInventoryItem*> mItemNamesItems;
         std::map<std::string, LLUUID> mTextureNamesIDs;
 
-        std::map<std::string, std::pair< LLUUID, LLUUID>> mNameItemIDTextureId;
+        enum EListColumnNum
+        {
+            NAME = 0,
+            EXISTING_TEXTURE = 1,
+            NEW_TEXTURE = 2
+        };
 };
 
 #endif // LL_LLFLOATERINVENTORYTHUMBNAILSHELPER_H
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
index e94717f947..d23fd1247f 100644
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
@@ -44,14 +44,23 @@
       left="10"
       name="merge_items_textures"
       bottom="8"
-      width="200" />
+      width="100" />
     <button
       follows="left|bottom"
       height="20"
       label="Write Thumbnails"
       layout="bottomleft"
-      left="250"
+      left="150"
       name="write_items_thumbnails"
       bottom="8"
-      width="200" />
+      width="100" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Missing Thumbnails"
+      layout="bottomleft"
+      left="250"
+      name="display_thumbless_items"
+      bottom="8"
+      width="100" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
index 512bce2475..aa3500bac2 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_thumbnails_helper.xml
@@ -9,7 +9,7 @@
   name="contents"
   help_topic="contents"
   title="Inventory Thumbnails Helper"
-  width="500">
+  width="800">
     <scroll_list
        top="20"
        height="350"
@@ -23,14 +23,20 @@
        right="-8"
        tool_tip="Paste items from your inventory">
         <scroll_list.columns
+             dynamic_width="true"
              label="Inventory Item"
-             name="name"
-             relative_width="0.40" />
+             name="item_name"
+             relative_width="0.4" />
+        <scroll_list.columns
+             dynamic_width="true"
+             label="Existing Texture"
+             name="existing_texture"
+             relative_width="0.3" />
         <scroll_list.columns
              dynamic_width="true"
-             label="Texture Name"
-             name="texture"
-             relative_width="0.6" />
+             label="New Texture"
+             name="new_texture"
+             relative_width="0.3" />
     </scroll_list>
     <text_editor
       top="375"
@@ -73,10 +79,21 @@
     <button
       follows="left|bottom"
       height="20"
-      label="List items with no thumb"
+      label="Log items with no thumbnail"
       layout="bottomleft"
       right="-10"
-      name="list_items_no_thumb_btn"
+      name="log_missing_thumbnails_btn"
       bottom="60"
       width="235" />
+    <button
+      follows="left|bottom"
+      height="20"
+      label="Clear thumbnails from pasted items"
+      layout="bottomleft"
+      right="-10"
+      name="clear_thumbnails_btn"
+      top_delta="26"
+      width="235" />
+
+
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ef720e65e3..45020163ef 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12074,4 +12074,18 @@ Would you like to save them first?
        yestext="Yes"/>
   </notification>
     
+    <notification
+  icon="alertmodal.tga"
+  name="ClearInventoryThumbnailsWarning"
+  type="alertmodal">
+        You are about to remove thumbnail images from the inventory items in the list. This change cannot be undone.
+
+        Would you like to proceed?
+        <tag>confirm</tag>
+        <usetemplate
+         name="okcancelbuttons"
+         notext="No"
+         yestext="Yes"/>
+    </notification>
+    
 </notifications>
-- 
cgit v1.2.3


From d3147517b4b0f0abc7e9f753eddb3a39343a2fa9 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Thu, 17 Aug 2023 15:55:42 -0700
Subject: Remove the original prototype tool Bulky Thumbs since it is now
 superceded by the Inventory Thumbnail Helper tool

---
 indra/newview/CMakeLists.txt                       |   2 -
 indra/newview/llfloaterbulkythumbs.cpp             | 443 ---------------------
 indra/newview/llfloaterbulkythumbs.h               |  72 ----
 indra/newview/llviewerfloaterreg.cpp               |   4 +-
 .../skins/default/xui/en/floater_bulky_thumbs.xml  |  66 ---
 indra/newview/skins/default/xui/en/menu_viewer.xml |   8 -
 6 files changed, 1 insertion(+), 594 deletions(-)
 delete mode 100644 indra/newview/llfloaterbulkythumbs.cpp
 delete mode 100644 indra/newview/llfloaterbulkythumbs.h
 delete mode 100644 indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 79fa3ec5b5..24a8e083bb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -185,7 +185,6 @@ set(viewer_SOURCE_FILES
     llfloaterbigpreview.cpp
     llfloaterbuildoptions.cpp
     llfloaterbulkpermission.cpp
-    llfloaterbulkythumbs.cpp
     llfloaterbump.cpp
     llfloaterbuy.cpp
     llfloaterbuycontents.cpp
@@ -833,7 +832,6 @@ set(viewer_HEADER_FILES
     llfloaterbigpreview.h
     llfloaterbuildoptions.h
     llfloaterbulkpermission.h
-    llfloaterbulkythumbs.h
     llfloaterbump.h
     llfloaterbuy.h
     llfloaterbuycontents.h
diff --git a/indra/newview/llfloaterbulkythumbs.cpp b/indra/newview/llfloaterbulkythumbs.cpp
deleted file mode 100644
index 02adf90acf..0000000000
--- a/indra/newview/llfloaterbulkythumbs.cpp
+++ /dev/null
@@ -1,443 +0,0 @@
-/**
- * @file llfloaterbulkythumbs.cpp
- * @author Callum Prentice
- * @brief LLFloaterBulkyThumbs class implementation
- *
- * $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$
- */
-
-/**
- * Floater that appears when buying an object, giving a preview
- * of its contents and their permissions.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterbulkythumbs.h"
-#include "lluictrlfactory.h"
-#include "llclipboard.h"
-#include "llinventorymodel.h"
-#include "llinventoryfunctions.h"
-#include "lltexteditor.h"
-#include "llmediactrl.h"
-#include "lluuid.h"
-#include "llaisapi.h"
-
-LLFloaterBulkyThumbs::LLFloaterBulkyThumbs(const LLSD& key)
-    :   LLFloater("floater_bulky_thumbs")
-{
-}
-
-LLFloaterBulkyThumbs::~LLFloaterBulkyThumbs()
-{
-}
-
-BOOL LLFloaterBulkyThumbs::postBuild()
-{
-    mPasteItemsBtn = getChild<LLUICtrl>("paste_items_btn");
-    mPasteItemsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteItems, this));
-
-    mPasteTexturesBtn = getChild<LLUICtrl>("paste_textures_btn");
-    mPasteTexturesBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onPasteTextures, this));
-
-    mOutputLog = getChild<LLTextEditor>("output_log");
-    mOutputLog->setMaxTextLength(0xffff * 0x10);
-
-    mMergeItemsTexturesBtn = getChild<LLUICtrl>("merge_items_textures");
-    mMergeItemsTexturesBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onMergeItemsTextures, this));
-    mMergeItemsTexturesBtn->setEnabled(false);
-
-    mWriteThumbnailsBtn = getChild<LLUICtrl>("write_items_thumbnails");
-    mWriteThumbnailsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onWriteThumbnails, this));
-    mWriteThumbnailsBtn->setEnabled(false);
-
-    mDisplayThumbnaillessItemsBtn = getChild<LLUICtrl>("display_thumbless_items");
-    mDisplayThumbnaillessItemsBtn->setCommitCallback(boost::bind(&LLFloaterBulkyThumbs::onDisplayThumbnaillessItems, this));
-    mDisplayThumbnaillessItemsBtn->setEnabled(true);
-
-    return true;
-}
-
-void LLFloaterBulkyThumbs::recordInventoryItemEntry(LLViewerInventoryItem* item)
-{
-    const std::string name = item->getName();
-
-    std::map<std::string, LLUUID>::iterator iter = mItemNamesIDs.find(name);
-    if (iter == mItemNamesIDs.end())
-    {
-        LLUUID id = item->getUUID();
-        mItemNamesIDs.insert({name, id});
-
-        mOutputLog->appendText(
-            STRINGIZE(
-                "ITEM " << mItemNamesIDs.size() << "> " <<
-                name <<
-                //" | " <<
-                //id.asString() <<
-                std::endl
-            ), false);
-    }
-    else
-    {
-        // dupe - do not save
-    }
-
-    if (item->getThumbnailUUID() == LLUUID::null)
-    {
-        mOutputLog->appendText(
-            STRINGIZE(
-                "ITEM " << mItemNamesIDs.size() << "> " <<
-                name <<
-                " has no thumbnail" <<
-                //id.asString() <<
-                std::endl
-            ), false);
-    }
-}
-
-void LLFloaterBulkyThumbs::onPasteItems()
-{
-    if (!LLClipboard::instance().hasContents())
-    {
-        return;
-    }
-
-    mOutputLog->appendText(
-        STRINGIZE(
-            "\n==== Pasting items from inventory ====" <<
-            std::endl
-        ), false);
-
-    std::vector<LLUUID> objects;
-    LLClipboard::instance().pasteFromClipboard(objects);
-    size_t count = objects.size();
-
-    for (size_t i = 0; i < count; i++)
-    {
-        const LLUUID& entry = objects.at(i);
-
-        const LLInventoryCategory* cat = gInventory.getCategory(entry);
-        if (cat)
-        {
-            LLInventoryModel::cat_array_t cat_array;
-            LLInventoryModel::item_array_t item_array;
-
-            LLIsType is_object(LLAssetType::AT_OBJECT);
-            gInventory.collectDescendentsIf(cat->getUUID(),
-                                            cat_array,
-                                            item_array,
-                                            LLInventoryModel::EXCLUDE_TRASH,
-                                            is_object);
-
-            LLIsType is_bodypart(LLAssetType::AT_BODYPART);
-            gInventory.collectDescendentsIf(cat->getUUID(),
-                                            cat_array,
-                                            item_array,
-                                            LLInventoryModel::EXCLUDE_TRASH,
-                                            is_bodypart);
-
-            LLIsType is_clothing(LLAssetType::AT_CLOTHING);
-            gInventory.collectDescendentsIf(cat->getUUID(),
-                                            cat_array,
-                                            item_array,
-                                            LLInventoryModel::EXCLUDE_TRASH,
-                                            is_clothing);
-
-            for (size_t i = 0; i < item_array.size(); i++)
-            {
-                LLViewerInventoryItem* item = item_array.at(i);
-                recordInventoryItemEntry(item);
-            }
-        }
-
-        LLViewerInventoryItem* item = gInventory.getItem(entry);
-        if (item)
-        {
-            const LLAssetType::EType item_type = item->getType();
-            if (item_type == LLAssetType::AT_OBJECT || item_type == LLAssetType::AT_BODYPART || item_type == LLAssetType::AT_CLOTHING)
-            {
-                recordInventoryItemEntry(item);
-            }
-        }
-    }
-
-    mOutputLog->setCursorAndScrollToEnd();
-
-    mMergeItemsTexturesBtn->setEnabled(true);
-}
-
-void LLFloaterBulkyThumbs::recordTextureItemEntry(LLViewerInventoryItem* item)
-{
-    const std::string name = item->getName();
-
-    std::map<std::string, LLUUID>::iterator iter = mTextureNamesIDs.find(name);
-    if (iter == mTextureNamesIDs.end())
-    {
-        LLUUID id = item->getAssetUUID();
-        mTextureNamesIDs.insert({name, id});
-
-        mOutputLog->appendText(
-            STRINGIZE(
-                "TEXTURE " << mTextureNamesIDs.size() << "> " <<
-                name <<
-                //" | " <<
-                //id.asString() <<
-                std::endl
-            ), false);
-    }
-    else
-    {
-        // dupe - do not save
-    }
-}
-
-void LLFloaterBulkyThumbs::onPasteTextures()
-{
-    if (!LLClipboard::instance().hasContents())
-    {
-        return;
-    }
-
-    mOutputLog->appendText(
-        STRINGIZE(
-            "\n==== Pasting textures from inventory ====" <<
-            std::endl
-        ), false);
-
-    std::vector<LLUUID> objects;
-    LLClipboard::instance().pasteFromClipboard(objects);
-    size_t count = objects.size();
-
-    for (size_t i = 0; i < count; i++)
-    {
-        const LLUUID& entry = objects.at(i);
-
-        const LLInventoryCategory* cat = gInventory.getCategory(entry);
-        if (cat)
-        {
-            LLInventoryModel::cat_array_t cat_array;
-            LLInventoryModel::item_array_t item_array;
-
-            LLIsType is_object(LLAssetType::AT_TEXTURE);
-            gInventory.collectDescendentsIf(cat->getUUID(),
-                                            cat_array,
-                                            item_array,
-                                            LLInventoryModel::EXCLUDE_TRASH,
-                                            is_object);
-
-            for (size_t i = 0; i < item_array.size(); i++)
-            {
-                LLViewerInventoryItem* item = item_array.at(i);
-                recordTextureItemEntry(item);
-            }
-        }
-
-        LLViewerInventoryItem* item = gInventory.getItem(entry);
-        if (item)
-        {
-            const LLAssetType::EType item_type = item->getType();
-            if (item_type == LLAssetType::AT_TEXTURE)
-            {
-                recordTextureItemEntry(item);
-            }
-        }
-    }
-
-    mOutputLog->setCursorAndScrollToEnd();
-
-    mMergeItemsTexturesBtn->setEnabled(true);
-}
-
-void LLFloaterBulkyThumbs::onMergeItemsTextures()
-{
-    mOutputLog->appendText(
-        STRINGIZE(
-            "\n==== Matching items and textures for " <<
-            mItemNamesIDs.size() <<
-            " entries ====" <<
-            std::endl
-        ), false);
-
-    std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
-    size_t index = 1;
-
-    while (item_iter != mItemNamesIDs.end())
-    {
-        std::string item_name = (*item_iter).first;
-
-        mOutputLog->appendText(
-            STRINGIZE(
-                "MATCHING ITEM (" << index++  << "/" << mItemNamesIDs.size() << ") " << item_name << "> "
-            ), false);
-
-        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
-        if (texture_iter != mTextureNamesIDs.end())
-        {
-            mOutputLog->appendText(
-                STRINGIZE(
-                    "MATCHED" <<
-                    std::endl
-                ), false);
-
-            mNameItemIDTextureId.insert({item_name, {(*item_iter).second, (*texture_iter).second}});
-        }
-        else
-        {
-            mOutputLog->appendText(
-                STRINGIZE(
-                    "NO MATCH FOUND" <<
-                    std::endl
-                ), false);
-        }
-
-        ++item_iter;
-    }
-
-    mOutputLog->appendText(
-        STRINGIZE(
-            "==== Matched list of items and textures has " <<
-            mNameItemIDTextureId.size() <<
-            " entries ====" <<
-            std::endl
-        ), true);
-
-    //std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
-    //while (iter != mNameItemIDTextureId.end())
-    //{
-    //    std::string output_line = (*iter).first;
-    //    output_line += "\n";
-    //    output_line += "item ID: ";
-    //    output_line += ((*iter).second).first.asString();
-    //    output_line += "\n";
-    //    output_line += "thumbnail texture ID: ";
-    //    output_line += ((*iter).second).second.asString();
-    //    output_line +=  "\n";
-    //    mOutputLog->appendText(output_line, true);
-
-    //    ++iter;
-    //}
-    mOutputLog->setCursorAndScrollToEnd();
-
-    mWriteThumbnailsBtn->setEnabled(true);
-}
-
-#if 1
-// *TODO$: LLInventoryCallback should be deprecated to conform to the new boost::bind/coroutine model.
-// temp code in transition
-void bulkyInventoryCb(LLPointer<LLInventoryCallback> cb, LLUUID id)
-{
-    if (cb.notNull())
-    {
-        cb->fire(id);
-    }
-}
-#endif
-
-bool writeThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
-{
-    if (AISAPI::isAvailable())
-    {
-
-        LLSD updates;
-        updates["thumbnail"] = LLSD().with("asset_id", thumbnail_asset_id.asString());
-
-        LLPointer<LLInventoryCallback> cb;
-
-        AISAPI::completion_t cr = boost::bind(&bulkyInventoryCb, cb, _1);
-        AISAPI::UpdateItem(item_id, updates, cr);
-
-        return true;
-    }
-    else
-    {
-        LL_WARNS() << "Unable to write inventory thumbnail because the AIS API is not available" << LL_ENDL;
-        return false;
-    }
-}
-
-void LLFloaterBulkyThumbs::onWriteThumbnails()
-{
-    mOutputLog->appendText(
-        STRINGIZE(
-            "\n==== Writing thumbnails for " <<
-            mNameItemIDTextureId.size() <<
-            " entries ====" <<
-            std::endl
-        ), false);
-
-    std::map<std::string, std::pair< LLUUID, LLUUID>>::iterator iter = mNameItemIDTextureId.begin();
-    size_t index = 1;
-
-    while (iter != mNameItemIDTextureId.end())
-    {
-        mOutputLog->appendText(
-            STRINGIZE(
-                "WRITING THUMB (" << index++  << "/" << mNameItemIDTextureId.size() << ")> " <<
-                (*iter).first <<
-                "\n" <<
-                "item ID: " <<
-                ((*iter).second).first.asString() <<
-                "\n" <<
-                "thumbnail texture ID: " <<
-                ((*iter).second).second.asString() <<
-                "\n"
-            ), true);
-
-        LLUUID item_id = ((*iter).second).first;
-        LLUUID thumbnail_asset_id = ((*iter).second).second;
-
-        writeThumbnailID(item_id, thumbnail_asset_id);
-
-        ++iter;
-    }
-    mOutputLog->setCursorAndScrollToEnd();
-}
-
-void LLFloaterBulkyThumbs::onDisplayThumbnaillessItems()
-{
-    //std::map<std::string, LLUUID>::iterator item_iter = mItemNamesIDs.begin();
-    //size_t index = 1;
-
-    //mOutputLog->appendText("======= Items with no thumbnail =======", false);
-
-    //while (item_iter != mItemNamesIDs.end())
-    //{
-    //    std::string item_name = (*item_iter).first;
-
-    //    //mOutputLog->appendText(
-    //    //    STRINGIZE(
-    //    //        "MATCHING ITEM (" << index++  << "/" << mItemNamesIDs.size() << ") " << item_name << "> "
-    //    //    ), false);
-
-    //    std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
-    //    if (texture_iter == mTextureNamesIDs.end())
-    //    {
-    //        mOutputLog->appendText(
-    //            STRINGIZE(
-    //                "MISSING:" <<
-
-    //                std::endl
-    //            ), false);
-
-    //    }
-    //}
-}
diff --git a/indra/newview/llfloaterbulkythumbs.h b/indra/newview/llfloaterbulkythumbs.h
deleted file mode 100644
index 10133553a6..0000000000
--- a/indra/newview/llfloaterbulkythumbs.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file llfloaterbulkythumbs.h
- * @author Callum Prentice
- * @brief Helper floater for bulk processing of inventory thumbnails
- *
- * $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_LLFLOATERBULKYTHUMBS_H
-#define LL_LLFLOATERBULKYTHUMBS_H
-
-#include "llfloater.h"
-class LLTextEditor;
-class LLMediaCtrl;
-class LLViewerInventoryItem;
-class LLUUID;
-
-class LLFloaterBulkyThumbs:
-    public LLFloater
-{
-        friend class LLFloaterReg;
-    private:
-        LLFloaterBulkyThumbs(const LLSD& key);
-        BOOL postBuild() override;
-        ~LLFloaterBulkyThumbs();
-
-        LLUICtrl* mPasteItemsBtn;
-        void onPasteItems();
-
-        LLUICtrl* mPasteTexturesBtn;
-        void onPasteTextures();
-
-        LLTextEditor* mOutputLog;
-
-        LLUICtrl* mMergeItemsTexturesBtn;
-        void onMergeItemsTextures();
-
-        LLUICtrl* mWriteThumbnailsBtn;
-        void onWriteThumbnails();
-
-        LLUICtrl* mDisplayThumbnaillessItemsBtn;
-        void onDisplayThumbnaillessItems();
-
-        void recordInventoryItemEntry(LLViewerInventoryItem* item);
-        void recordTextureItemEntry(LLViewerInventoryItem* item);
-
-        std::map<std::string, LLUUID> mItemNamesIDs;
-        std::map<std::string, LLUUID> mTextureNamesIDs;
-
-        std::map<std::string, std::pair< LLUUID, LLUUID>> mNameItemIDTextureId;
-};
-
-#endif // LL_LLFLOATERBULKYTHUMBS_H
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 093fc0d7b3..1721ce4b1e 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -47,7 +47,6 @@
 #include "llfloaterbeacons.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbulkpermission.h"
-#include "llfloaterbulkythumbs.h"
 #include "llfloaterbump.h"
 #include "llfloaterbuy.h"
 #include "llfloaterbuycontents.h"
@@ -330,8 +329,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("build", "floater_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTools>);
 	LLFloaterReg::add("build_options", "floater_build_options.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBuildOptions>);
 	LLFloaterReg::add("bumps", "floater_bumps.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBump>);
-    LLFloaterReg::add("bulky_thumbs", "floater_bulky_thumbs.xml", (LLFloaterBuildFunc) &LLFloaterReg::build<LLFloaterBulkyThumbs>);
-
+    
 	LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
 	LLFloaterReg::add("camera_presets", "floater_camera_presets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCameraPresets>);
 	LLFloaterReg::add("chat_voice", "floater_voice_chat_volume.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChatVoiceVolume>);
diff --git a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml b/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
deleted file mode 100644
index d23fd1247f..0000000000
--- a/indra/newview/skins/default/xui/en/floater_bulky_thumbs.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  legacy_header_height="18"
-  can_resize="true"
-  height="600"
-  layout="topleft"
-  min_height="175"
-  min_width="500"
-  name="contents"
-  help_topic="contents"
-  title="BULKY THUMBS"
-  width="500">
-    <button
-      follows="left|top"
-      height="20"
-      label="Paste items from Inventory"
-      layout="topleft"
-      left="10"
-      name="paste_items_btn"
-      top="26	"
-      width="200" />
-    <button
-      follows="left|top"
-      height="20"
-      label="Paste textures from Inventory"
-      layout="topleft"
-      left="250"
-      name="paste_textures_btn"
-      top="26	"
-      width="200" />
-    <text_editor
-      height="510"
-      follows="top|left|right|bottom"
-      left="10"
-      name="output_log"
-      top_pad="10"
-      width="480">
-    </text_editor>
-    <button
-      follows="left|bottom"
-      height="20"
-      label="Merge items and textures"
-      layout="bottomleft"
-      left="10"
-      name="merge_items_textures"
-      bottom="8"
-      width="100" />
-    <button
-      follows="left|bottom"
-      height="20"
-      label="Write Thumbnails"
-      layout="bottomleft"
-      left="150"
-      name="write_items_thumbnails"
-      bottom="8"
-      width="100" />
-    <button
-      follows="left|bottom"
-      height="20"
-      label="Missing Thumbnails"
-      layout="bottomleft"
-      left="250"
-      name="display_thumbless_items"
-      bottom="8"
-      width="100" />
-</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1fe26cee2c..ce5b2e3cd8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3485,14 +3485,6 @@ function="World.EnvPreset"
              function="Advanced.WebContentTest"
              parameter="http://duckduckgo.com"/>
           </menu_item_call>
-			<menu_item_call
-             label="Bulky Thumbs"
-             name="Bulky Thumbs"
-				shortcut="control|alt|shift|Y">
-				<menu_item_call.on_click
-                 function="Floater.Show"
-                 parameter="bulky_thumbs" />
-			</menu_item_call>
             <menu_item_call
              label="Inventory Thumbnails Helper"
              name="Inventory Thumbnails Helper"
-- 
cgit v1.2.3


From 910c6be8c10d93f171e73703982a5f5a304c55d7 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 18 Aug 2023 00:54:43 +0200
Subject: SL-20140 Fix formatting file llpaneleditwearable.cpp

---
 indra/newview/llpaneleditwearable.cpp | 548 +++++++++++++++++-----------------
 1 file changed, 274 insertions(+), 274 deletions(-)

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 0103bf628a..21a175b72e 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -97,7 +97,7 @@ enum ESubpart {
         SUBPART_SKIRT,
         SUBPART_ALPHA,
         SUBPART_TATTOO,
-		SUBPART_UNIVERSAL,
+        SUBPART_UNIVERSAL,
         SUBPART_PHYSICS_BREASTS_UPDOWN,
         SUBPART_PHYSICS_BREASTS_INOUT,
         SUBPART_PHYSICS_BREASTS_LEFTRIGHT,
@@ -120,7 +120,7 @@ class LLEditWearableDictionary : public LLSingleton<LLEditWearableDictionary>
         //--------------------------------------------------------------------
         LLSINGLETON(LLEditWearableDictionary);
         virtual ~LLEditWearableDictionary();
-        
+
         //--------------------------------------------------------------------
         // Wearable Types
         //--------------------------------------------------------------------
@@ -214,7 +214,6 @@ public:
 
 LLEditWearableDictionary::LLEditWearableDictionary()
 {
-
 }
 
 //virtual 
@@ -227,23 +226,23 @@ LLEditWearableDictionary::Wearables::Wearables()
         // note the subpart that is listed first is treated as "default", regardless of what order is in enum.
         // Please match the order presented in XUI. -Nyx
         // this will affect what camera angle is shown when first editing a wearable
-        addEntry(LLWearableType::WT_SHAPE,              new WearableEntry(LLWearableType::WT_SHAPE,"edit_shape_title","shape_desc_text", texture_vec_t(), texture_vec_t(), subpart_vec_t{SUBPART_SHAPE_WHOLE, SUBPART_SHAPE_HEAD,        SUBPART_SHAPE_EYES,     SUBPART_SHAPE_EARS,     SUBPART_SHAPE_NOSE,     SUBPART_SHAPE_MOUTH, SUBPART_SHAPE_CHIN, SUBPART_SHAPE_TORSO, SUBPART_SHAPE_LEGS}));
-        addEntry(LLWearableType::WT_SKIN,               new WearableEntry(LLWearableType::WT_SKIN,"edit_skin_title","skin_desc_text", texture_vec_t(), texture_vec_t{TEX_HEAD_BODYPAINT, TEX_UPPER_BODYPAINT, TEX_LOWER_BODYPAINT}, subpart_vec_t{SUBPART_SKIN_COLOR, SUBPART_SKIN_FACEDETAIL, SUBPART_SKIN_MAKEUP, SUBPART_SKIN_BODYDETAIL}));
-        addEntry(LLWearableType::WT_HAIR,               new WearableEntry(LLWearableType::WT_HAIR,"edit_hair_title","hair_desc_text", texture_vec_t(), texture_vec_t{TEX_HAIR}, subpart_vec_t{SUBPART_HAIR_COLOR,       SUBPART_HAIR_STYLE,     SUBPART_HAIR_EYEBROWS, SUBPART_HAIR_FACIAL}));
-        addEntry(LLWearableType::WT_EYES,               new WearableEntry(LLWearableType::WT_EYES,"edit_eyes_title","eyes_desc_text", texture_vec_t(), texture_vec_t{TEX_EYES_IRIS}, subpart_vec_t{SUBPART_EYES}));
-        addEntry(LLWearableType::WT_SHIRT,              new WearableEntry(LLWearableType::WT_SHIRT,"edit_shirt_title","shirt_desc_text", texture_vec_t{TEX_UPPER_SHIRT}, texture_vec_t{TEX_UPPER_SHIRT}, subpart_vec_t{SUBPART_SHIRT}));
-        addEntry(LLWearableType::WT_PANTS,              new WearableEntry(LLWearableType::WT_PANTS,"edit_pants_title","pants_desc_text", texture_vec_t{TEX_LOWER_PANTS}, texture_vec_t{TEX_LOWER_PANTS}, subpart_vec_t{SUBPART_PANTS}));
-        addEntry(LLWearableType::WT_SHOES,              new WearableEntry(LLWearableType::WT_SHOES,"edit_shoes_title","shoes_desc_text", texture_vec_t{TEX_LOWER_SHOES}, texture_vec_t{TEX_LOWER_SHOES}, subpart_vec_t{SUBPART_SHOES}));
-        addEntry(LLWearableType::WT_SOCKS,              new WearableEntry(LLWearableType::WT_SOCKS,"edit_socks_title","socks_desc_text", texture_vec_t{TEX_LOWER_SOCKS}, texture_vec_t{TEX_LOWER_SOCKS}, subpart_vec_t{SUBPART_SOCKS}));
+        addEntry(LLWearableType::WT_SHAPE,      new WearableEntry(LLWearableType::WT_SHAPE,"edit_shape_title","shape_desc_text", texture_vec_t(), texture_vec_t(), subpart_vec_t{SUBPART_SHAPE_WHOLE, SUBPART_SHAPE_HEAD,        SUBPART_SHAPE_EYES,     SUBPART_SHAPE_EARS,     SUBPART_SHAPE_NOSE,     SUBPART_SHAPE_MOUTH, SUBPART_SHAPE_CHIN, SUBPART_SHAPE_TORSO, SUBPART_SHAPE_LEGS}));
+        addEntry(LLWearableType::WT_SKIN,       new WearableEntry(LLWearableType::WT_SKIN,"edit_skin_title","skin_desc_text", texture_vec_t(), texture_vec_t{TEX_HEAD_BODYPAINT, TEX_UPPER_BODYPAINT, TEX_LOWER_BODYPAINT}, subpart_vec_t{SUBPART_SKIN_COLOR, SUBPART_SKIN_FACEDETAIL, SUBPART_SKIN_MAKEUP, SUBPART_SKIN_BODYDETAIL}));
+        addEntry(LLWearableType::WT_HAIR,       new WearableEntry(LLWearableType::WT_HAIR,"edit_hair_title","hair_desc_text", texture_vec_t(), texture_vec_t{TEX_HAIR}, subpart_vec_t{SUBPART_HAIR_COLOR,       SUBPART_HAIR_STYLE,     SUBPART_HAIR_EYEBROWS, SUBPART_HAIR_FACIAL}));
+        addEntry(LLWearableType::WT_EYES,       new WearableEntry(LLWearableType::WT_EYES,"edit_eyes_title","eyes_desc_text", texture_vec_t(), texture_vec_t{TEX_EYES_IRIS}, subpart_vec_t{SUBPART_EYES}));
+        addEntry(LLWearableType::WT_SHIRT,      new WearableEntry(LLWearableType::WT_SHIRT,"edit_shirt_title","shirt_desc_text", texture_vec_t{TEX_UPPER_SHIRT}, texture_vec_t{TEX_UPPER_SHIRT}, subpart_vec_t{SUBPART_SHIRT}));
+        addEntry(LLWearableType::WT_PANTS,      new WearableEntry(LLWearableType::WT_PANTS,"edit_pants_title","pants_desc_text", texture_vec_t{TEX_LOWER_PANTS}, texture_vec_t{TEX_LOWER_PANTS}, subpart_vec_t{SUBPART_PANTS}));
+        addEntry(LLWearableType::WT_SHOES,      new WearableEntry(LLWearableType::WT_SHOES,"edit_shoes_title","shoes_desc_text", texture_vec_t{TEX_LOWER_SHOES}, texture_vec_t{TEX_LOWER_SHOES}, subpart_vec_t{SUBPART_SHOES}));
+        addEntry(LLWearableType::WT_SOCKS,      new WearableEntry(LLWearableType::WT_SOCKS,"edit_socks_title","socks_desc_text", texture_vec_t{TEX_LOWER_SOCKS}, texture_vec_t{TEX_LOWER_SOCKS}, subpart_vec_t{SUBPART_SOCKS}));
         addEntry(LLWearableType::WT_JACKET,     new WearableEntry(LLWearableType::WT_JACKET,"edit_jacket_title","jacket_desc_text", texture_vec_t{TEX_UPPER_JACKET}, texture_vec_t{TEX_UPPER_JACKET, TEX_LOWER_JACKET}, subpart_vec_t{SUBPART_JACKET}));
         addEntry(LLWearableType::WT_GLOVES,     new WearableEntry(LLWearableType::WT_GLOVES,"edit_gloves_title","gloves_desc_text", texture_vec_t{TEX_UPPER_GLOVES}, texture_vec_t{TEX_UPPER_GLOVES}, subpart_vec_t{SUBPART_GLOVES}));
         addEntry(LLWearableType::WT_UNDERSHIRT, new WearableEntry(LLWearableType::WT_UNDERSHIRT,"edit_undershirt_title","undershirt_desc_text", texture_vec_t{TEX_UPPER_UNDERSHIRT}, texture_vec_t{TEX_UPPER_UNDERSHIRT}, subpart_vec_t{SUBPART_UNDERSHIRT}));
         addEntry(LLWearableType::WT_UNDERPANTS, new WearableEntry(LLWearableType::WT_UNDERPANTS,"edit_underpants_title","underpants_desc_text", texture_vec_t{TEX_LOWER_UNDERPANTS}, texture_vec_t{TEX_LOWER_UNDERPANTS}, subpart_vec_t{SUBPART_UNDERPANTS}));
-        addEntry(LLWearableType::WT_SKIRT,              new WearableEntry(LLWearableType::WT_SKIRT,"edit_skirt_title","skirt_desc_text", texture_vec_t{TEX_SKIRT}, texture_vec_t{TEX_SKIRT}, subpart_vec_t{SUBPART_SKIRT}));
-        addEntry(LLWearableType::WT_ALPHA,              new WearableEntry(LLWearableType::WT_ALPHA,"edit_alpha_title","alpha_desc_text", texture_vec_t(), texture_vec_t{TEX_LOWER_ALPHA, TEX_UPPER_ALPHA, TEX_HEAD_ALPHA, TEX_EYES_ALPHA, TEX_HAIR_ALPHA}, subpart_vec_t{SUBPART_ALPHA}));
+        addEntry(LLWearableType::WT_SKIRT,      new WearableEntry(LLWearableType::WT_SKIRT,"edit_skirt_title","skirt_desc_text", texture_vec_t{TEX_SKIRT}, texture_vec_t{TEX_SKIRT}, subpart_vec_t{SUBPART_SKIRT}));
+        addEntry(LLWearableType::WT_ALPHA,      new WearableEntry(LLWearableType::WT_ALPHA,"edit_alpha_title","alpha_desc_text", texture_vec_t(), texture_vec_t{TEX_LOWER_ALPHA, TEX_UPPER_ALPHA, TEX_HEAD_ALPHA, TEX_EYES_ALPHA, TEX_HAIR_ALPHA}, subpart_vec_t{SUBPART_ALPHA}));
         addEntry(LLWearableType::WT_TATTOO,     new WearableEntry(LLWearableType::WT_TATTOO,"edit_tattoo_title","tattoo_desc_text", texture_vec_t{TEX_HEAD_TATTOO}, texture_vec_t{TEX_LOWER_TATTOO, TEX_UPPER_TATTOO, TEX_HEAD_TATTOO}, subpart_vec_t{SUBPART_TATTOO}));
-		addEntry(LLWearableType::WT_UNIVERSAL, new WearableEntry(LLWearableType::WT_UNIVERSAL, "edit_universal_title", "universal_desc_text", texture_vec_t{ TEX_HEAD_UNIVERSAL_TATTOO }, texture_vec_t{ TEX_HEAD_UNIVERSAL_TATTOO, TEX_UPPER_UNIVERSAL_TATTOO, TEX_LOWER_UNIVERSAL_TATTOO, TEX_SKIRT_TATTOO, TEX_HAIR_TATTOO, TEX_EYES_TATTOO, TEX_LEFT_ARM_TATTOO, TEX_LEFT_LEG_TATTOO, TEX_AUX1_TATTOO, TEX_AUX2_TATTOO, TEX_AUX3_TATTOO }, subpart_vec_t{ SUBPART_UNIVERSAL }));
-		addEntry(LLWearableType::WT_PHYSICS,    new WearableEntry(LLWearableType::WT_PHYSICS,"edit_physics_title","physics_desc_text", texture_vec_t(), texture_vec_t(), subpart_vec_t{SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BREASTS_LEFTRIGHT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED}));
+        addEntry(LLWearableType::WT_UNIVERSAL,  new WearableEntry(LLWearableType::WT_UNIVERSAL, "edit_universal_title", "universal_desc_text", texture_vec_t{ TEX_HEAD_UNIVERSAL_TATTOO }, texture_vec_t{ TEX_HEAD_UNIVERSAL_TATTOO, TEX_UPPER_UNIVERSAL_TATTOO, TEX_LOWER_UNIVERSAL_TATTOO, TEX_SKIRT_TATTOO, TEX_HAIR_TATTOO, TEX_EYES_TATTOO, TEX_LEFT_ARM_TATTOO, TEX_LEFT_LEG_TATTOO, TEX_AUX1_TATTOO, TEX_AUX2_TATTOO, TEX_AUX3_TATTOO }, subpart_vec_t{ SUBPART_UNIVERSAL }));
+        addEntry(LLWearableType::WT_PHYSICS,    new WearableEntry(LLWearableType::WT_PHYSICS, "edit_physics_title", "physics_desc_text", texture_vec_t(), texture_vec_t(), subpart_vec_t{ SUBPART_PHYSICS_BREASTS_UPDOWN, SUBPART_PHYSICS_BREASTS_INOUT, SUBPART_PHYSICS_BREASTS_LEFTRIGHT, SUBPART_PHYSICS_BELLY_UPDOWN, SUBPART_PHYSICS_BUTT_UPDOWN, SUBPART_PHYSICS_BUTT_LEFTRIGHT, SUBPART_PHYSICS_ADVANCED }));
 }
 
 LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType type,
@@ -259,52 +258,59 @@ LLEditWearableDictionary::WearableEntry::WearableEntry(LLWearableType::EType typ
         mSubparts(subparts),
         mColorSwatchCtrls(color_swatches),
         mTextureCtrls(texture_pickers)
-{}
+{
+}
 
 LLEditWearableDictionary::Subparts::Subparts()
 {
-        addEntry(SUBPART_SHAPE_WHOLE, new SubpartEntry(SUBPART_SHAPE_WHOLE, "mPelvis", "shape_body","shape_body_param_list", "shape_body_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_HEAD, new SubpartEntry(SUBPART_SHAPE_HEAD, "mHead", "shape_head", "shape_head_param_list", "shape_head_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_EYES, new SubpartEntry(SUBPART_SHAPE_EYES, "mHead", "shape_eyes", "shape_eyes_param_list", "shape_eyes_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_EARS, new SubpartEntry(SUBPART_SHAPE_EARS, "mHead", "shape_ears", "shape_ears_param_list", "shape_ears_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_NOSE, new SubpartEntry(SUBPART_SHAPE_NOSE, "mHead", "shape_nose", "shape_nose_param_list", "shape_nose_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_MOUTH, new SubpartEntry(SUBPART_SHAPE_MOUTH, "mHead", "shape_mouth", "shape_mouth_param_list", "shape_mouth_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_CHIN, new SubpartEntry(SUBPART_SHAPE_CHIN, "mHead", "shape_chin", "shape_chin_param_list", "shape_chin_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_TORSO, new SubpartEntry(SUBPART_SHAPE_TORSO, "mTorso", "shape_torso", "shape_torso_param_list", "shape_torso_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
-        addEntry(SUBPART_SHAPE_LEGS, new SubpartEntry(SUBPART_SHAPE_LEGS, "mPelvis", "shape_legs", "shape_legs_param_list", "shape_legs_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-
-        addEntry(SUBPART_SKIN_COLOR, new SubpartEntry(SUBPART_SKIN_COLOR, "mHead", "skin_color", "skin_color_param_list", "skin_color_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        // WT_SHAPE
+        addEntry(SUBPART_SHAPE_WHOLE,     new SubpartEntry(SUBPART_SHAPE_WHOLE, "mPelvis", "shape_body","shape_body_param_list", "shape_body_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_HEAD,      new SubpartEntry(SUBPART_SHAPE_HEAD, "mHead", "shape_head", "shape_head_param_list", "shape_head_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_EYES,      new SubpartEntry(SUBPART_SHAPE_EYES, "mHead", "shape_eyes", "shape_eyes_param_list", "shape_eyes_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_EARS,      new SubpartEntry(SUBPART_SHAPE_EARS, "mHead", "shape_ears", "shape_ears_param_list", "shape_ears_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_NOSE,      new SubpartEntry(SUBPART_SHAPE_NOSE, "mHead", "shape_nose", "shape_nose_param_list", "shape_nose_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_MOUTH,     new SubpartEntry(SUBPART_SHAPE_MOUTH, "mHead", "shape_mouth", "shape_mouth_param_list", "shape_mouth_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_CHIN,      new SubpartEntry(SUBPART_SHAPE_CHIN, "mHead", "shape_chin", "shape_chin_param_list", "shape_chin_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_TORSO,     new SubpartEntry(SUBPART_SHAPE_TORSO, "mTorso", "shape_torso", "shape_torso_param_list", "shape_torso_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
+        addEntry(SUBPART_SHAPE_LEGS,      new SubpartEntry(SUBPART_SHAPE_LEGS, "mPelvis", "shape_legs", "shape_legs_param_list", "shape_legs_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+
+        // WT_SKIN
+        addEntry(SUBPART_SKIN_COLOR,      new SubpartEntry(SUBPART_SKIN_COLOR, "mHead", "skin_color", "skin_color_param_list", "skin_color_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
         addEntry(SUBPART_SKIN_FACEDETAIL, new SubpartEntry(SUBPART_SKIN_FACEDETAIL, "mHead", "skin_facedetail", "skin_face_param_list", "skin_face_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_SKIN_MAKEUP, new SubpartEntry(SUBPART_SKIN_MAKEUP, "mHead", "skin_makeup", "skin_makeup_param_list", "skin_makeup_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_SKIN_MAKEUP,     new SubpartEntry(SUBPART_SKIN_MAKEUP, "mHead", "skin_makeup", "skin_makeup_param_list", "skin_makeup_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
         addEntry(SUBPART_SKIN_BODYDETAIL, new SubpartEntry(SUBPART_SKIN_BODYDETAIL, "mPelvis", "skin_bodydetail", "skin_body_param_list", "skin_body_tab", LLVector3d(0.f, 0.f, -0.2f), LLVector3d(-2.5f, 0.5f, 0.5f),SEX_BOTH));
 
-        addEntry(SUBPART_HAIR_COLOR, new SubpartEntry(SUBPART_HAIR_COLOR, "mHead", "hair_color", "hair_color_param_list", "hair_color_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f),SEX_BOTH));
-        addEntry(SUBPART_HAIR_STYLE, new SubpartEntry(SUBPART_HAIR_STYLE, "mHead", "hair_style", "hair_style_param_list", "hair_style_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f),SEX_BOTH));
-        addEntry(SUBPART_HAIR_EYEBROWS, new SubpartEntry(SUBPART_HAIR_EYEBROWS, "mHead", "hair_eyebrows", "hair_eyebrows_param_list", "hair_eyebrows_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-        addEntry(SUBPART_HAIR_FACIAL, new SubpartEntry(SUBPART_HAIR_FACIAL, "mHead", "hair_facial", "hair_facial_param_list", "hair_facial_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_MALE));
-
-        addEntry(SUBPART_EYES, new SubpartEntry(SUBPART_EYES, "mHead", "eyes", "eyes_main_param_list", "eyes_main_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
-
-        addEntry(SUBPART_SHIRT, new SubpartEntry(SUBPART_SHIRT, "mTorso", "shirt", "shirt_main_param_list", "shirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
-        addEntry(SUBPART_PANTS, new SubpartEntry(SUBPART_PANTS, "mPelvis", "pants", "pants_main_param_list", "pants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-        addEntry(SUBPART_SHOES, new SubpartEntry(SUBPART_SHOES, "mPelvis", "shoes", "shoes_main_param_list", "shoes_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-        addEntry(SUBPART_SOCKS, new SubpartEntry(SUBPART_SOCKS, "mPelvis", "socks", "socks_main_param_list", "socks_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-        addEntry(SUBPART_JACKET, new SubpartEntry(SUBPART_JACKET, "mTorso", "jacket", "jacket_main_param_list", "jacket_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-2.f, 0.1f, 0.3f),SEX_BOTH));
-        addEntry(SUBPART_SKIRT, new SubpartEntry(SUBPART_SKIRT, "mPelvis", "skirt", "skirt_main_param_list", "skirt_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-        addEntry(SUBPART_GLOVES, new SubpartEntry(SUBPART_GLOVES, "mTorso", "gloves", "gloves_main_param_list", "gloves_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-1.f, 0.15f, 0.f),SEX_BOTH));
-        addEntry(SUBPART_UNDERSHIRT, new SubpartEntry(SUBPART_UNDERSHIRT, "mTorso", "undershirt", "undershirt_main_param_list", "undershirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
-        addEntry(SUBPART_UNDERPANTS, new SubpartEntry(SUBPART_UNDERPANTS, "mPelvis", "underpants", "underpants_main_param_list", "underpants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
-        addEntry(SUBPART_ALPHA, new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
-        addEntry(SUBPART_TATTOO, new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
-		addEntry(SUBPART_UNIVERSAL, new SubpartEntry(SUBPART_UNIVERSAL, "mPelvis", "universal", "universal_main_param_list", "universal_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f), SEX_BOTH));
-
-		addEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
-        addEntry(SUBPART_PHYSICS_BREASTS_INOUT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
+        // WT_HAIR
+        addEntry(SUBPART_HAIR_COLOR,      new SubpartEntry(SUBPART_HAIR_COLOR, "mHead", "hair_color", "hair_color_param_list", "hair_color_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f),SEX_BOTH));
+        addEntry(SUBPART_HAIR_STYLE,      new SubpartEntry(SUBPART_HAIR_STYLE, "mHead", "hair_style", "hair_style_param_list", "hair_style_tab", LLVector3d(0.f, 0.f, 0.10f), LLVector3d(-0.4f, 0.05f, 0.10f), SEX_BOTH));
+        addEntry(SUBPART_HAIR_EYEBROWS,   new SubpartEntry(SUBPART_HAIR_EYEBROWS, "mHead", "hair_eyebrows", "hair_eyebrows_param_list", "hair_eyebrows_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+        addEntry(SUBPART_HAIR_FACIAL,     new SubpartEntry(SUBPART_HAIR_FACIAL, "mHead", "hair_facial", "hair_facial_param_list", "hair_facial_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_MALE));
+
+        // WT_EYES
+        addEntry(SUBPART_EYES,            new SubpartEntry(SUBPART_EYES, "mHead", "eyes", "eyes_main_param_list", "eyes_main_tab", LLVector3d(0.f, 0.f, 0.05f), LLVector3d(-0.5f, 0.05f, 0.07f),SEX_BOTH));
+
+        // WT_SHIRT, WT_PANTS, WT_SHOES, WT_SOCKS, WT_JACKET, WT_GLOVES, WT_UNDERSHIRT, WT_UNDERPANTS, WT_SKIRT, WT_ALPHA, WT_TATTOO, WT_UNIVERSAL
+        addEntry(SUBPART_SHIRT,           new SubpartEntry(SUBPART_SHIRT, "mTorso", "shirt", "shirt_main_param_list", "shirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
+        addEntry(SUBPART_PANTS,           new SubpartEntry(SUBPART_PANTS, "mPelvis", "pants", "pants_main_param_list", "pants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_SHOES,           new SubpartEntry(SUBPART_SHOES, "mPelvis", "shoes", "shoes_main_param_list", "shoes_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_SOCKS,           new SubpartEntry(SUBPART_SOCKS, "mPelvis", "socks", "socks_main_param_list", "socks_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_JACKET,          new SubpartEntry(SUBPART_JACKET, "mTorso", "jacket", "jacket_main_param_list", "jacket_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-2.f, 0.1f, 0.3f),SEX_BOTH));
+        addEntry(SUBPART_GLOVES,          new SubpartEntry(SUBPART_GLOVES, "mTorso", "gloves", "gloves_main_param_list", "gloves_main_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(-1.f, 0.15f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_UNDERSHIRT,      new SubpartEntry(SUBPART_UNDERSHIRT, "mTorso", "undershirt", "undershirt_main_param_list", "undershirt_main_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(-1.f, 0.15f, 0.3f),SEX_BOTH));
+        addEntry(SUBPART_UNDERPANTS,      new SubpartEntry(SUBPART_UNDERPANTS, "mPelvis", "underpants", "underpants_main_param_list", "underpants_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_SKIRT,           new SubpartEntry(SUBPART_SKIRT, "mPelvis", "skirt", "skirt_main_param_list", "skirt_main_tab", LLVector3d(0.f, 0.f, -0.5f), LLVector3d(-1.6f, 0.15f, -0.5f),SEX_BOTH));
+        addEntry(SUBPART_ALPHA,           new SubpartEntry(SUBPART_ALPHA, "mPelvis", "alpha", "alpha_main_param_list", "alpha_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
+        addEntry(SUBPART_TATTOO,          new SubpartEntry(SUBPART_TATTOO, "mPelvis", "tattoo", "tattoo_main_param_list", "tattoo_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f),SEX_BOTH));
+        addEntry(SUBPART_UNIVERSAL,       new SubpartEntry(SUBPART_UNIVERSAL, "mPelvis", "universal", "universal_main_param_list", "universal_main_tab", LLVector3d(0.f, 0.f, 0.1f), LLVector3d(-2.5f, 0.5f, 0.8f), SEX_BOTH));
+
+        // WT_PHYSICS
+        addEntry(SUBPART_PHYSICS_BREASTS_UPDOWN,    new SubpartEntry(SUBPART_PHYSICS_BREASTS_UPDOWN, "mTorso", "physics_breasts_updown", "physics_breasts_updown_param_list", "physics_breasts_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f), SEX_FEMALE));
+        addEntry(SUBPART_PHYSICS_BREASTS_INOUT,     new SubpartEntry(SUBPART_PHYSICS_BREASTS_INOUT, "mTorso", "physics_breasts_inout", "physics_breasts_inout_param_list", "physics_breasts_inout_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
         addEntry(SUBPART_PHYSICS_BREASTS_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BREASTS_LEFTRIGHT, "mTorso", "physics_breasts_leftright", "physics_breasts_leftright_param_list", "physics_breasts_leftright_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_FEMALE));
-        addEntry(SUBPART_PHYSICS_BELLY_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
-        addEntry(SUBPART_PHYSICS_BUTT_UPDOWN, new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
-        addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
-        addEntry(SUBPART_PHYSICS_ADVANCED, new SubpartEntry(SUBPART_PHYSICS_ADVANCED, "mTorso", "physics_advanced", "physics_advanced_param_list", "physics_advanced_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_PHYSICS_BELLY_UPDOWN,      new SubpartEntry(SUBPART_PHYSICS_BELLY_UPDOWN, "mTorso", "physics_belly_updown", "physics_belly_updown_param_list", "physics_belly_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_PHYSICS_BUTT_UPDOWN,       new SubpartEntry(SUBPART_PHYSICS_BUTT_UPDOWN, "mTorso", "physics_butt_updown", "physics_butt_updown_param_list", "physics_butt_updown_tab", LLVector3d(0.f, 0.f, 0.3f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT,    new SubpartEntry(SUBPART_PHYSICS_BUTT_LEFTRIGHT, "mTorso", "physics_butt_leftright", "physics_butt_leftright_param_list", "physics_butt_leftright_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
+        addEntry(SUBPART_PHYSICS_ADVANCED,          new SubpartEntry(SUBPART_PHYSICS_ADVANCED, "mTorso", "physics_advanced", "physics_advanced_param_list", "physics_advanced_tab", LLVector3d(0.f, 0.f, 0.f), LLVector3d(0.f, 0.f, 0.f),SEX_BOTH));
 }
 
 LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
@@ -329,55 +335,55 @@ LLEditWearableDictionary::SubpartEntry::SubpartEntry(ESubpart part,
 
 LLEditWearableDictionary::ColorSwatchCtrls::ColorSwatchCtrls()
 {
-        addEntry ( TEX_UPPER_SHIRT,  new PickerControlEntry (TEX_UPPER_SHIRT, "Color/Tint" ));
-        addEntry ( TEX_LOWER_PANTS,  new PickerControlEntry (TEX_LOWER_PANTS, "Color/Tint" ));
-        addEntry ( TEX_LOWER_SHOES,  new PickerControlEntry (TEX_LOWER_SHOES, "Color/Tint" ));
-        addEntry ( TEX_LOWER_SOCKS,  new PickerControlEntry (TEX_LOWER_SOCKS, "Color/Tint" ));
-        addEntry ( TEX_UPPER_JACKET, new PickerControlEntry (TEX_UPPER_JACKET, "Color/Tint" ));
-        addEntry ( TEX_SKIRT,  new PickerControlEntry (TEX_SKIRT, "Color/Tint" ));
-        addEntry ( TEX_UPPER_GLOVES, new PickerControlEntry (TEX_UPPER_GLOVES, "Color/Tint" ));
-        addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Color/Tint" ));
-        addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Color/Tint" ));
-        addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry(TEX_HEAD_TATTOO, "Color/Tint" ));
-		addEntry (TEX_HEAD_UNIVERSAL_TATTOO, new PickerControlEntry(TEX_HEAD_UNIVERSAL_TATTOO, "Color/Tint"));
+        addEntry(TEX_UPPER_SHIRT, new PickerControlEntry(TEX_UPPER_SHIRT, "Color/Tint"));
+        addEntry(TEX_LOWER_PANTS, new PickerControlEntry(TEX_LOWER_PANTS, "Color/Tint"));
+        addEntry(TEX_LOWER_SHOES, new PickerControlEntry(TEX_LOWER_SHOES, "Color/Tint"));
+        addEntry(TEX_LOWER_SOCKS, new PickerControlEntry(TEX_LOWER_SOCKS, "Color/Tint"));
+        addEntry(TEX_UPPER_JACKET, new PickerControlEntry(TEX_UPPER_JACKET, "Color/Tint"));
+        addEntry(TEX_SKIRT, new PickerControlEntry(TEX_SKIRT, "Color/Tint"));
+        addEntry(TEX_UPPER_GLOVES, new PickerControlEntry(TEX_UPPER_GLOVES, "Color/Tint"));
+        addEntry(TEX_UPPER_UNDERSHIRT, new PickerControlEntry(TEX_UPPER_UNDERSHIRT, "Color/Tint"));
+        addEntry(TEX_LOWER_UNDERPANTS, new PickerControlEntry(TEX_LOWER_UNDERPANTS, "Color/Tint"));
+        addEntry(TEX_HEAD_TATTOO, new PickerControlEntry(TEX_HEAD_TATTOO, "Color/Tint"));
+        addEntry(TEX_HEAD_UNIVERSAL_TATTOO, new PickerControlEntry(TEX_HEAD_UNIVERSAL_TATTOO, "Color/Tint"));
 }
 
 LLEditWearableDictionary::TextureCtrls::TextureCtrls()
 {
-        addEntry ( TEX_HEAD_BODYPAINT,  new PickerControlEntry (TEX_HEAD_BODYPAINT,  "Head", LLUUID::null, TRUE ));
-        addEntry ( TEX_UPPER_BODYPAINT, new PickerControlEntry (TEX_UPPER_BODYPAINT, "Upper Body", LLUUID::null, TRUE ));
-        addEntry ( TEX_LOWER_BODYPAINT, new PickerControlEntry (TEX_LOWER_BODYPAINT, "Lower Body", LLUUID::null, TRUE ));
-        addEntry ( TEX_HAIR, new PickerControlEntry (TEX_HAIR, "Texture", LLUUID( gSavedSettings.getString( "UIImgDefaultHairUUID" ) ), FALSE ));
-        addEntry ( TEX_EYES_IRIS, new PickerControlEntry (TEX_EYES_IRIS, "Iris", LLUUID( gSavedSettings.getString( "UIImgDefaultEyesUUID" ) ), FALSE ));
-        addEntry ( TEX_UPPER_SHIRT, new PickerControlEntry (TEX_UPPER_SHIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultShirtUUID" ) ), FALSE ));
-        addEntry ( TEX_LOWER_PANTS, new PickerControlEntry (TEX_LOWER_PANTS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultPantsUUID" ) ), FALSE ));
-        addEntry ( TEX_LOWER_SHOES, new PickerControlEntry (TEX_LOWER_SHOES, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultShoesUUID" ) ), FALSE ));
-        addEntry ( TEX_LOWER_SOCKS, new PickerControlEntry (TEX_LOWER_SOCKS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultSocksUUID" ) ), FALSE ));
-        addEntry ( TEX_UPPER_JACKET, new PickerControlEntry (TEX_UPPER_JACKET, "Upper Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultJacketUUID" ) ), FALSE ));
-        addEntry ( TEX_LOWER_JACKET, new PickerControlEntry (TEX_LOWER_JACKET, "Lower Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultJacketUUID" ) ), FALSE ));
-        addEntry ( TEX_SKIRT, new PickerControlEntry (TEX_SKIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultSkirtUUID" ) ), FALSE ));
-        addEntry ( TEX_UPPER_GLOVES, new PickerControlEntry (TEX_UPPER_GLOVES, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultGlovesUUID" ) ), FALSE ));
-        addEntry ( TEX_UPPER_UNDERSHIRT, new PickerControlEntry (TEX_UPPER_UNDERSHIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ), FALSE ));
-        addEntry ( TEX_LOWER_UNDERPANTS, new PickerControlEntry (TEX_LOWER_UNDERPANTS, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultUnderwearUUID" ) ), FALSE ));
-        addEntry ( TEX_LOWER_ALPHA, new PickerControlEntry (TEX_LOWER_ALPHA, "Lower Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-        addEntry ( TEX_UPPER_ALPHA, new PickerControlEntry (TEX_UPPER_ALPHA, "Upper Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-        addEntry ( TEX_HEAD_ALPHA, new PickerControlEntry (TEX_HEAD_ALPHA, "Head Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-        addEntry ( TEX_EYES_ALPHA, new PickerControlEntry (TEX_EYES_ALPHA, "Eye Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-        addEntry ( TEX_HAIR_ALPHA, new PickerControlEntry (TEX_HAIR_ALPHA, "Hair Alpha", LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) ), TRUE ));
-        addEntry ( TEX_LOWER_TATTOO, new PickerControlEntry (TEX_LOWER_TATTOO, "Lower Tattoo", LLUUID::null, TRUE ));
-        addEntry ( TEX_UPPER_TATTOO, new PickerControlEntry (TEX_UPPER_TATTOO, "Upper Tattoo", LLUUID::null, TRUE ));
-        addEntry ( TEX_HEAD_TATTOO, new PickerControlEntry (TEX_HEAD_TATTOO, "Head Tattoo", LLUUID::null, TRUE ));
-		addEntry ( TEX_LOWER_UNIVERSAL_TATTOO, new PickerControlEntry( TEX_LOWER_UNIVERSAL_TATTOO, "Lower Universal Tattoo", LLUUID::null, TRUE));
-		addEntry ( TEX_UPPER_UNIVERSAL_TATTOO, new PickerControlEntry( TEX_UPPER_UNIVERSAL_TATTOO, "Upper Universal Tattoo", LLUUID::null, TRUE));
-		addEntry ( TEX_HEAD_UNIVERSAL_TATTOO, new PickerControlEntry( TEX_HEAD_UNIVERSAL_TATTOO, "Head Universal Tattoo", LLUUID::null, TRUE));
-		addEntry ( TEX_SKIRT_TATTOO, new PickerControlEntry(TEX_SKIRT_TATTOO, "Skirt Tattoo", LLUUID::null, TRUE));
-		addEntry ( TEX_HAIR_TATTOO, new PickerControlEntry(TEX_HAIR_TATTOO, "Hair Tattoo", LLUUID::null, TRUE));
-		addEntry ( TEX_EYES_TATTOO, new PickerControlEntry(TEX_EYES_TATTOO, "Eyes Tattoo", LLUUID::null, TRUE));
-		addEntry (TEX_LEFT_ARM_TATTOO, new PickerControlEntry(TEX_LEFT_ARM_TATTOO, "Left Arm Tattoo", LLUUID::null, TRUE));
-		addEntry (TEX_LEFT_LEG_TATTOO, new PickerControlEntry(TEX_LEFT_LEG_TATTOO, "Left Leg Tattoo", LLUUID::null, TRUE));
-		addEntry (TEX_AUX1_TATTOO, new PickerControlEntry(TEX_AUX1_TATTOO, "Aux1 Tattoo", LLUUID::null, TRUE));
-		addEntry (TEX_AUX2_TATTOO, new PickerControlEntry(TEX_AUX2_TATTOO, "Aux2 Tattoo", LLUUID::null, TRUE));
-		addEntry (TEX_AUX3_TATTOO, new PickerControlEntry(TEX_AUX3_TATTOO, "Aux3 Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_HEAD_BODYPAINT, new PickerControlEntry(TEX_HEAD_BODYPAINT, "Head", LLUUID::null, TRUE));
+        addEntry(TEX_UPPER_BODYPAINT, new PickerControlEntry(TEX_UPPER_BODYPAINT, "Upper Body", LLUUID::null, TRUE));
+        addEntry(TEX_LOWER_BODYPAINT, new PickerControlEntry(TEX_LOWER_BODYPAINT, "Lower Body", LLUUID::null, TRUE));
+        addEntry(TEX_HAIR, new PickerControlEntry(TEX_HAIR, "Texture", LLUUID(gSavedSettings.getString("UIImgDefaultHairUUID")), FALSE));
+        addEntry(TEX_EYES_IRIS, new PickerControlEntry(TEX_EYES_IRIS, "Iris", LLUUID(gSavedSettings.getString("UIImgDefaultEyesUUID")), FALSE));
+        addEntry(TEX_UPPER_SHIRT, new PickerControlEntry(TEX_UPPER_SHIRT, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultShirtUUID")), FALSE));
+        addEntry(TEX_LOWER_PANTS, new PickerControlEntry(TEX_LOWER_PANTS, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultPantsUUID")), FALSE));
+        addEntry(TEX_LOWER_SHOES, new PickerControlEntry(TEX_LOWER_SHOES, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultShoesUUID")), FALSE));
+        addEntry(TEX_LOWER_SOCKS, new PickerControlEntry(TEX_LOWER_SOCKS, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultSocksUUID")), FALSE));
+        addEntry(TEX_UPPER_JACKET, new PickerControlEntry(TEX_UPPER_JACKET, "Upper Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultJacketUUID")), FALSE));
+        addEntry(TEX_LOWER_JACKET, new PickerControlEntry(TEX_LOWER_JACKET, "Lower Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultJacketUUID")), FALSE));
+        addEntry(TEX_SKIRT, new PickerControlEntry(TEX_SKIRT, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultSkirtUUID")), FALSE));
+        addEntry(TEX_UPPER_GLOVES, new PickerControlEntry(TEX_UPPER_GLOVES, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultGlovesUUID")), FALSE));
+        addEntry(TEX_UPPER_UNDERSHIRT, new PickerControlEntry(TEX_UPPER_UNDERSHIRT, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultUnderwearUUID")), FALSE));
+        addEntry(TEX_LOWER_UNDERPANTS, new PickerControlEntry(TEX_LOWER_UNDERPANTS, "Fabric", LLUUID(gSavedSettings.getString("UIImgDefaultUnderwearUUID")), FALSE));
+        addEntry(TEX_LOWER_ALPHA, new PickerControlEntry(TEX_LOWER_ALPHA, "Lower Alpha", LLUUID(gSavedSettings.getString("UIImgDefaultAlphaUUID")), TRUE));
+        addEntry(TEX_UPPER_ALPHA, new PickerControlEntry(TEX_UPPER_ALPHA, "Upper Alpha", LLUUID(gSavedSettings.getString("UIImgDefaultAlphaUUID")), TRUE));
+        addEntry(TEX_HEAD_ALPHA, new PickerControlEntry(TEX_HEAD_ALPHA, "Head Alpha", LLUUID(gSavedSettings.getString("UIImgDefaultAlphaUUID")), TRUE));
+        addEntry(TEX_EYES_ALPHA, new PickerControlEntry(TEX_EYES_ALPHA, "Eye Alpha", LLUUID(gSavedSettings.getString("UIImgDefaultAlphaUUID")), TRUE));
+        addEntry(TEX_HAIR_ALPHA, new PickerControlEntry(TEX_HAIR_ALPHA, "Hair Alpha", LLUUID(gSavedSettings.getString("UIImgDefaultAlphaUUID")), TRUE));
+        addEntry(TEX_LOWER_TATTOO, new PickerControlEntry(TEX_LOWER_TATTOO, "Lower Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_UPPER_TATTOO, new PickerControlEntry(TEX_UPPER_TATTOO, "Upper Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_HEAD_TATTOO, new PickerControlEntry(TEX_HEAD_TATTOO, "Head Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_LOWER_UNIVERSAL_TATTOO, new PickerControlEntry(TEX_LOWER_UNIVERSAL_TATTOO, "Lower Universal Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_UPPER_UNIVERSAL_TATTOO, new PickerControlEntry(TEX_UPPER_UNIVERSAL_TATTOO, "Upper Universal Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_HEAD_UNIVERSAL_TATTOO, new PickerControlEntry(TEX_HEAD_UNIVERSAL_TATTOO, "Head Universal Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_SKIRT_TATTOO, new PickerControlEntry(TEX_SKIRT_TATTOO, "Skirt Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_HAIR_TATTOO, new PickerControlEntry(TEX_HAIR_TATTOO, "Hair Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_EYES_TATTOO, new PickerControlEntry(TEX_EYES_TATTOO, "Eyes Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_LEFT_ARM_TATTOO, new PickerControlEntry(TEX_LEFT_ARM_TATTOO, "Left Arm Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_LEFT_LEG_TATTOO, new PickerControlEntry(TEX_LEFT_LEG_TATTOO, "Left Leg Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_AUX1_TATTOO, new PickerControlEntry(TEX_AUX1_TATTOO, "Aux1 Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_AUX2_TATTOO, new PickerControlEntry(TEX_AUX2_TATTOO, "Aux2 Tattoo", LLUUID::null, TRUE));
+        addEntry(TEX_AUX3_TATTOO, new PickerControlEntry(TEX_AUX3_TATTOO, "Aux3 Tattoo", LLUUID::null, TRUE));
 }
 
 LLEditWearableDictionary::PickerControlEntry::PickerControlEntry(ETextureIndex tex_index,
@@ -490,8 +496,8 @@ template <typename CtrlType, class Predicate>
 const LLEditWearableDictionary::PickerControlEntry*
 find_picker_ctrl_entry_if(LLWearableType::EType type, const Predicate pred)
 {
-        const LLEditWearableDictionary::WearableEntry *wearable_entry
-                = LLEditWearableDictionary::getInstance()->getWearable(type);
+        const LLEditWearableDictionary::WearableEntry *wearable_entry =
+                LLEditWearableDictionary::getInstance()->getWearable(type);
         if (!wearable_entry)
         {
                 LL_WARNS() << "could not get wearable dictionary entry for wearable of type: " << type << LL_ENDL;
@@ -520,8 +526,7 @@ find_picker_ctrl_entry_if(LLWearableType::EType type, const Predicate pred)
 }
 
 template <typename CtrlType>
-void
-for_each_picker_ctrl_entry(LLPanel* panel, LLWearableType::EType type, function_t fun)
+void for_each_picker_ctrl_entry(LLPanel* panel, LLWearableType::EType type, function_t fun)
 {
         if (!panel)
         {
@@ -542,14 +547,13 @@ for_each_picker_ctrl_entry(LLPanel* panel, LLWearableType::EType type, function_
                  iter != iter_end; ++iter)
         {
                 const ETextureIndex te = *iter;
-                const LLEditWearableDictionary::PickerControlEntry*     entry
-                        = get_picker_entry<CtrlType>(te);
+                const LLEditWearableDictionary::PickerControlEntry* entry = get_picker_entry<CtrlType>(te);
                 if (!entry)
                 {
                         LL_WARNS() << "could not get picker dictionary entry (" << te << ") for wearable of type: " << type << LL_ENDL;
                         continue;
                 }
-                fun (panel, entry);
+                fun(panel, entry);
         }
 }
 
@@ -595,7 +599,7 @@ static void update_texture_ctrl(LLPanelEditWearable* self, LLPanel* panel, const
         {
                 LLUUID new_id;
                 LLLocalTextureObject *lto = self->getWearable()->getLocalTextureObject(entry->mTextureIndex);
-                if( lto && (lto->getID() != IMG_DEFAULT_AVATAR) )
+                if (lto && (lto->getID() != IMG_DEFAULT_AVATAR))
                 {
                         new_id = lto->getID();
                 }
@@ -645,7 +649,6 @@ LLPanelEditWearable::LLPanelEditWearable()
 //virtual
 LLPanelEditWearable::~LLPanelEditWearable()
 {
-
 }
 
 bool LLPanelEditWearable::changeHeightUnits(const LLSD& new_value)
@@ -755,7 +758,7 @@ BOOL LLPanelEditWearable::postBuild()
         mPanelSkirt = getChild<LLPanel>("edit_skirt_panel");
         mPanelAlpha = getChild<LLPanel>("edit_alpha_panel");
         mPanelTattoo = getChild<LLPanel>("edit_tattoo_panel");
-		mPanelUniversal = getChild<LLPanel>("edit_universal_panel");
+        mPanelUniversal = getChild<LLPanel>("edit_universal_panel");
         mPanelPhysics = getChild<LLPanel>("edit_physics_panel");
 
         mTxtAvatarHeight = mPanelShape->getChild<LLTextBox>("avatar_height");
@@ -779,29 +782,27 @@ BOOL LLPanelEditWearable::postBuild()
                         continue;
                 }
                 U8 num_subparts = (U8)(wearable_entry->mSubparts.size());
-        
+
                 for (U8 index = 0; index < num_subparts; ++index)
                 {
                         // dive into data structures to get the panel we need
                         ESubpart subpart_e = wearable_entry->mSubparts[index];
                         const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
-        
+
                         if (!subpart_entry)
                         {
                                 LL_WARNS() << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << LL_ENDL;
                                 continue;
                         }
-        
+
                         const std::string accordion_tab = subpart_entry->mAccordionTab;
-        
                         LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
-        
                         if (!tab)
                         {
                                 LL_WARNS() << "could not get llaccordionctrltab from UI with name: " << accordion_tab << LL_ENDL;
                                 continue;
                         }
-        
+
                         // initialize callback to ensure camera view changes appropriately.
                         tab->setDropDownStateChangedCallback(boost::bind(&LLPanelEditWearable::onTabExpandedCollapsed,this,_2,index));
                 }
@@ -835,14 +836,16 @@ BOOL LLPanelEditWearable::isDirty() const
         BOOL isDirty = FALSE;
         if (mWearablePtr)
         {
-			if (mWearablePtr->isDirty() ||
-				( mWearableItem && mNameEditor && mWearableItem->getName().compare(mNameEditor->getText()) != 0 ))
-			{
-				isDirty = TRUE;
-			}
+                if (mWearablePtr->isDirty() ||
+                        (mWearableItem && mNameEditor && mWearableItem->getName().compare(mNameEditor->getText()) != 0))
+                {
+                        isDirty = TRUE;
+                }
         }
         return isDirty;
 }
+
+
 //virtual
 void LLPanelEditWearable::draw()
 {
@@ -858,8 +861,8 @@ void LLPanelEditWearable::draw()
 
 void LLPanelEditWearable::onClose()
 {
-	// any unsaved changes should be reverted at this point
-	revertChanges();
+        // any unsaved changes should be reverted at this point
+        revertChanges();
 }
 
 void LLPanelEditWearable::setVisible(BOOL visible)
@@ -881,11 +884,11 @@ void LLPanelEditWearable::setWearable(LLViewerWearable *wearable, BOOL disable_c
 //static 
 void LLPanelEditWearable::onBackButtonClicked(void* userdata)
 {
-    LLPanelEditWearable *panel = (LLPanelEditWearable*) userdata;
-	if ( panel->isDirty() )
-	{
-		LLAppearanceMgr::instance().setOutfitDirty( true );		
-	}
+        LLPanelEditWearable* panel = (LLPanelEditWearable*)userdata;
+        if (panel->isDirty())
+        {
+                LLAppearanceMgr::instance().setOutfitDirty(true);
+        }
 }
 
 //static 
@@ -910,7 +913,7 @@ void LLPanelEditWearable::saveAsCallback(const LLSD& notification, const LLSD& r
         {
                 std::string wearable_name = response["message"].asString();
                 LLStringUtil::trim(wearable_name);
-                if( !wearable_name.empty() )
+                if (!wearable_name.empty())
                 {
                         mNameEditor->setText(wearable_name);
                         saveChanges(true);
@@ -920,24 +923,27 @@ void LLPanelEditWearable::saveAsCallback(const LLSD& notification, const LLSD& r
 
 void LLPanelEditWearable::onCommitSexChange()
 {
-        if (!isAgentAvatarValid()) return;
+        if (!isAgentAvatarValid())
+        {
+                return;
+        }
 
         LLWearableType::EType type = mWearablePtr->getType();
         U32 index;
-        if( !gAgentWearables.getWearableIndex(mWearablePtr, index) ||
-			!gAgentWearables.isWearableModifiable(type, index))
+        if (!gAgentWearables.getWearableIndex(mWearablePtr, index) ||
+                !gAgentWearables.isWearableModifiable(type, index))
         {
-			return;
+                return;
         }
 
         LLViewerVisualParam* param = static_cast<LLViewerVisualParam*>(gAgentAvatarp->getVisualParam( "male" ));
-        if( !param )
+        if (!param)
         {
-			return;
+                return;
         }
 
         bool is_new_sex_male = (gSavedSettings.getU32("AvatarSex") ? SEX_MALE : SEX_FEMALE) == SEX_MALE;
-        LLViewerWearable*     wearable = gAgentWearables.getViewerWearable(type, index);
+        LLViewerWearable* wearable = gAgentWearables.getViewerWearable(type, index);
         if (wearable)
         {
                 wearable->setVisualParamWeight(param->getID(), is_new_sex_male);
@@ -970,23 +976,23 @@ void LLPanelEditWearable::onTexturePickerCommit(const LLUICtrl* ctrl)
                 {
                         // Set the new version
                         LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(texture_ctrl->getImageAssetID());
-                        if( image->getID() == IMG_DEFAULT )
+                        if (image->getID() == IMG_DEFAULT)
                         {
                                 image = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT_AVATAR);
                         }
                         if (getWearable())
                         {
-							U32 index;
-							if (gAgentWearables.getWearableIndex(getWearable(), index))
-							{
-								gAgentAvatarp->setLocalTexture(entry->mTextureIndex, image, FALSE, index);
-								LLVisualParamHint::requestHintUpdates();
-								gAgentAvatarp->wearableUpdated(type);
-							}
-							else
-							{
-								LL_WARNS() << "wearable not found in gAgentWearables" << LL_ENDL;
-							}
+                                U32 index;
+                                if (gAgentWearables.getWearableIndex(getWearable(), index))
+                                {
+                                        gAgentAvatarp->setLocalTexture(entry->mTextureIndex, image, FALSE, index);
+                                        LLVisualParamHint::requestHintUpdates();
+                                        gAgentAvatarp->wearableUpdated(type);
+                                }
+                                else
+                                {
+                                        LL_WARNS() << "wearable not found in gAgentWearables" << LL_ENDL;
+                                }
                         }
                 }
                 else
@@ -1002,13 +1008,13 @@ void LLPanelEditWearable::onColorSwatchCommit(const LLUICtrl* ctrl)
         {
                 LLWearableType::EType type = getWearable()->getType();
                 const PickerControlEntryNamePredicate name_pred(ctrl->getName());
-                const LLEditWearableDictionary::PickerControlEntry* entry
-                        = find_picker_ctrl_entry_if<LLColorSwatchCtrl, PickerControlEntryNamePredicate>(type, name_pred);
+                const LLEditWearableDictionary::PickerControlEntry* entry =
+                        find_picker_ctrl_entry_if<LLColorSwatchCtrl, PickerControlEntryNamePredicate>(type, name_pred);
                 if (entry)
                 {
                         const LLColor4& old_color = getWearable()->getClothesColor(entry->mTextureIndex);
                         const LLColor4& new_color = LLColor4(ctrl->getValue());
-                        if( old_color != new_color )
+                        if (old_color != new_color)
                         {
                                 getWearable()->setClothesColor(entry->mTextureIndex, new_color);
                                 LLVisualParamHint::requestHintUpdates();
@@ -1026,11 +1032,13 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type)
 {
         LLPanel* panel = getPanel(type);
         if (!panel)
+        {
                 return;
+        }
 
         bool is_modifiable = false;
 
-        if(mWearableItem)
+        if (mWearableItem)
         {
                 const LLPermissions& perm = mWearableItem->getPermissions();
                 is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
@@ -1052,7 +1060,6 @@ void LLPanelEditWearable::updatePanelPickerControls(LLWearableType::EType type)
 
 void LLPanelEditWearable::incrementCofVersionLegacy()
 {
-
 }
 
 void LLPanelEditWearable::saveChanges(bool force_save_as)
@@ -1064,59 +1071,57 @@ void LLPanelEditWearable::saveChanges(bool force_save_as)
         }
 
         U32 index;
-		if (!gAgentWearables.getWearableIndex(mWearablePtr, index))
-		{
-			LL_WARNS() << "wearable not found" << LL_ENDL;
-			return;
-		}
+        if (!gAgentWearables.getWearableIndex(mWearablePtr, index))
+        {
+                LL_WARNS() << "wearable not found" << LL_ENDL;
+                return;
+        }
 
         std::string new_name = mNameEditor->getText();
 
-		// Find an existing link to this wearable's inventory item, if any, and its description field.
-		LLInventoryItem *link_item = NULL;
-		std::string description;
-		LLInventoryModel::item_array_t links =
-			LLAppearanceMgr::instance().findCOFItemLinks(mWearablePtr->getItemID());
-		if (links.size()>0)
-		{
-			link_item = links.at(0).get();
-			if (link_item && link_item->getIsLinkType())
-			{
-				description = link_item->getActualDescription();
-			}
-		}
+        // Find an existing link to this wearable's inventory item, if any, and its description field.
+        LLInventoryItem* link_item = NULL;
+        std::string description;
+        LLInventoryModel::item_array_t links =
+                LLAppearanceMgr::instance().findCOFItemLinks(mWearablePtr->getItemID());
+        if (links.size() > 0)
+        {
+                link_item = links.at(0).get();
+                if (link_item && link_item->getIsLinkType())
+                {
+                        description = link_item->getActualDescription();
+                }
+        }
 
         if (force_save_as)
         {
-			// the name of the wearable has changed, re-save wearable with new name
-			LLAppearanceMgr::instance().removeCOFItemLinks(mWearablePtr->getItemID(),gAgentAvatarp->mEndCustomizeCallback);
-			gAgentWearables.saveWearableAs(mWearablePtr->getType(), index, new_name, description, FALSE);
-			mNameEditor->setText(mWearableItem->getName());
+                // the name of the wearable has changed, re-save wearable with new name
+                LLAppearanceMgr::instance().removeCOFItemLinks(mWearablePtr->getItemID(), gAgentAvatarp->mEndCustomizeCallback);
+                gAgentWearables.saveWearableAs(mWearablePtr->getType(), index, new_name, description, FALSE);
+                mNameEditor->setText(mWearableItem->getName());
         }
         else
         {
-			// Make another copy of this link, with the same
-			// description.  This is needed to bump the COF
-			// version so texture baking service knows appearance has changed.
-			if (link_item)
-			{
-				// Create new link
-				LL_DEBUGS("Avatar") << "link refresh, creating new link to " << link_item->getLinkedUUID()
-									<< " removing old link at " << link_item->getUUID()
-									<< " wearable item id " << mWearablePtr->getItemID() << LL_ENDL;
-
-				LLInventoryObject::const_object_list_t obj_array;
-				obj_array.push_back(LLConstPointer<LLInventoryObject>(link_item));
-				link_inventory_array(LLAppearanceMgr::instance().getCOF(),
-									 obj_array, 
-									 gAgentAvatarp->mEndCustomizeCallback);
-				// Remove old link
-				remove_inventory_item(link_item->getUUID(), gAgentAvatarp->mEndCustomizeCallback);
-			}
-			gAgentWearables.saveWearable(mWearablePtr->getType(), index, new_name);
-        }
-
-	
+                // Make another copy of this link, with the same
+                // description.  This is needed to bump the COF
+                // version so texture baking service knows appearance has changed.
+                if (link_item)
+                {
+                        // Create new link
+                        LL_DEBUGS("Avatar") << "link refresh, creating new link to " << link_item->getLinkedUUID()
+                                << " removing old link at " << link_item->getUUID()
+                                << " wearable item id " << mWearablePtr->getItemID() << LL_ENDL;
+
+                        LLInventoryObject::const_object_list_t obj_array;
+                        obj_array.push_back(LLConstPointer<LLInventoryObject>(link_item));
+                        link_inventory_array(LLAppearanceMgr::instance().getCOF(),
+                                obj_array,
+                                gAgentAvatarp->mEndCustomizeCallback);
+                        // Remove old link
+                        remove_inventory_item(link_item->getUUID(), gAgentAvatarp->mEndCustomizeCallback);
+                }
+                gAgentWearables.saveWearable(mWearablePtr->getType(), index, new_name);
+        }
 }
 
 void LLPanelEditWearable::revertChanges()
@@ -1166,15 +1171,15 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
 
         targetPanel->setVisible(show);
         toggleTypeSpecificControls(type);
-		// Update type controls here
-		updateTypeSpecificControls(type);
+        // Update type controls here
+        updateTypeSpecificControls(type);
 
         if (show)
         {
                 mPanelTitle->setText(title);
                 mPanelTitle->setToolTip(title);
                 mDescTitle->setText(description_title);
-                
+
                 // set name
                 mNameEditor->setText(mWearableItem->getName());
 
@@ -1182,51 +1187,51 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
 
                 // clear and rebuild visual param list
                 U8 num_subparts = (U8)(wearable_entry->mSubparts.size());
-        
+
                 for (U8 index = 0; index < num_subparts; ++index)
                 {
                         // dive into data structures to get the panel we need
                         ESubpart subpart_e = wearable_entry->mSubparts[index];
                         const LLEditWearableDictionary::SubpartEntry *subpart_entry = LLEditWearableDictionary::getInstance()->getSubpart(subpart_e);
-        
+
                         if (!subpart_entry)
                         {
                                 LL_WARNS() << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << LL_ENDL;
                                 continue;
                         }
-        
+
                         const std::string scrolling_panel = subpart_entry->mParamList;
                         const std::string accordion_tab = subpart_entry->mAccordionTab;
-        
+
                         LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
                         LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
-			
+
                         if (!panel_list)
                         {
                                 LL_WARNS() << "could not get scrolling panel list: " << scrolling_panel << LL_ENDL;
                                 continue;
                         }
-        
+
                         if (!tab)
                         {
                                 LL_WARNS() << "could not get llaccordionctrltab from UI with name: " << accordion_tab << LL_ENDL;
                                 continue;
                         }
 
-			// Don't show female subparts if you're not female, etc.
-			if (!(gAgentAvatarp->getSex() & subpart_entry->mSex))
-			{
-				tab->setVisible(FALSE);
-				continue;
-			}
-			else
-			{
-				tab->setVisible(TRUE);
-			}
-			
+                        // Don't show female subparts if you're not female, etc.
+                        if (!(gAgentAvatarp->getSex() & subpart_entry->mSex))
+                        {
+                                tab->setVisible(FALSE);
+                                continue;
+                        }
+                        else
+                        {
+                                tab->setVisible(TRUE);
+                        }
+
                         // what edit group do we want to extract params for?
                         const std::string edit_group = subpart_entry->mEditGroup;
-        
+
                         // storage for ordered list of visual params
                         value_map_t sorted_params;
                         getSortedParams(sorted_params, edit_group);
@@ -1238,9 +1243,10 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
                         }
 
                         buildParamList(panel_list, sorted_params, tab, jointp);
-        
+
                         updateScrollingPanelUI();
                 }
+
                 if (!disable_camera_switch)
                 {
                         showDefaultSubpart();
@@ -1269,17 +1275,17 @@ void LLPanelEditWearable::onTabExpandedCollapsed(const LLSD& param, U8 index)
         {
                 changeCamera(index);
         }
-
 }
 
 void LLPanelEditWearable::changeCamera(U8 subpart)
 {
-	// Don't change the camera if this type doesn't have a camera switch.
-	// Useful for wearables like physics that don't have an associated physical body part.
-	if (LLWearableType::getInstance()->getDisableCameraSwitch(mWearablePtr->getType()))
-	{
-		return;
-	}
+        // Don't change the camera if this type doesn't have a camera switch.
+        // Useful for wearables like physics that don't have an associated physical body part.
+        if (LLWearableType::getInstance()->getDisableCameraSwitch(mWearablePtr->getType()))
+        {
+                return;
+        }
+
         const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(mWearablePtr->getType());
         if (!wearable_entry)
         {
@@ -1308,9 +1314,9 @@ void LLPanelEditWearable::changeCamera(U8 subpart)
         gMorphView->setCameraOffset( subpart_entry->mCameraOffset );
         if (gSavedSettings.getBOOL("AppearanceCameraMovement"))
         {
-            // Unlock focus from avatar but don't stop animation to not interrupt ANIM_AGENT_CUSTOMIZE
-            gAgentCamera.setFocusOnAvatar(FALSE, gAgentCamera.getCameraAnimating());
-            gMorphView->updateCamera();
+                // Unlock focus from avatar but don't stop animation to not interrupt ANIM_AGENT_CUSTOMIZE
+                gAgentCamera.setFocusOnAvatar(FALSE, gAgentCamera.getCameraAnimating());
+                gMorphView->updateCamera();
         }
 }
 
@@ -1369,14 +1375,18 @@ void LLPanelEditWearable::updateScrollingPanelUI()
         LLWearableType::EType type = mWearablePtr->getType();
         LLPanel *panel = getPanel(type);
 
-        if(panel && (mWearablePtr->getItemID().notNull()))
+        if (panel && (mWearablePtr->getItemID().notNull()))
         {
                 const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(type);
                 llassert(wearable_entry);
-                if (!wearable_entry) return;
-                U8 num_subparts = (U8)(wearable_entry->mSubparts.size());
+                if (!wearable_entry)
+                {
+                        return;
+                }
 
                 LLScrollingPanelParam::sUpdateDelayFrames = 0;
+
+                U8 num_subparts = (U8)(wearable_entry->mSubparts.size());
                 for (U8 index = 0; index < num_subparts; ++index)
                 {
                         // dive into data structures to get the panel we need
@@ -1386,13 +1396,13 @@ void LLPanelEditWearable::updateScrollingPanelUI()
                         const std::string scrolling_panel = subpart_entry->mParamList;
 
                         LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
-        
+
                         if (!panel_list)
                         {
                                 LL_WARNS() << "could not get scrolling panel list: " << scrolling_panel << LL_ENDL;
                                 continue;
                         }
-                        
+
                         panel_list->updatePanels(TRUE);
                 }
         }
@@ -1404,75 +1414,56 @@ LLPanel* LLPanelEditWearable::getPanel(LLWearableType::EType type)
         {
                 case LLWearableType::WT_SHAPE:
                         return mPanelShape;
-                        break;
 
                 case LLWearableType::WT_SKIN:
                         return mPanelSkin;
-                        break;
 
                 case LLWearableType::WT_HAIR:
                         return mPanelHair;
-                        break;
 
                 case LLWearableType::WT_EYES:
                         return mPanelEyes;
-                        break;
 
                 case LLWearableType::WT_SHIRT:
                         return mPanelShirt;
-                        break;
 
                 case LLWearableType::WT_PANTS:
                         return mPanelPants;
-                        break;
 
                 case LLWearableType::WT_SHOES:
                         return mPanelShoes;
-                        break;
 
                 case LLWearableType::WT_SOCKS:
                         return mPanelSocks;
-                        break;
 
                 case LLWearableType::WT_JACKET:
                         return mPanelJacket;
-                        break;
 
                 case LLWearableType::WT_GLOVES:
                         return mPanelGloves;
-                        break;
 
                 case LLWearableType::WT_UNDERSHIRT:
                         return mPanelUndershirt;
-                        break;
 
                 case LLWearableType::WT_UNDERPANTS:
                         return mPanelUnderpants;
-                        break;
 
                 case LLWearableType::WT_SKIRT:
                         return mPanelSkirt;
-                        break;
 
                 case LLWearableType::WT_ALPHA:
                         return mPanelAlpha;
-                        break;
 
                 case LLWearableType::WT_TATTOO:
                         return mPanelTattoo;
-                        break;
-				
-				case LLWearableType::WT_UNIVERSAL:
-					return mPanelUniversal;
-					break;
+
+                case LLWearableType::WT_UNIVERSAL:
+                        return mPanelUniversal;
 
                 case LLWearableType::WT_PHYSICS:
                         return mPanelPhysics;
-                        break;
-
-                default:
-                        break;
         }
+
         return NULL;
 }
 
@@ -1508,11 +1499,11 @@ void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value
         // sorted_params is sorted according to magnitude of effect from
         // least to greatest.  Adding to the front of the child list
         // reverses that order.
-        if( panel_list )
+        if (panel_list)
         {
                 panel_list->clearPanels();
                 value_map_t::iterator end = sorted_params.end();
-                for(value_map_t::iterator it = sorted_params.begin(); it != end; ++it)
+                for (value_map_t::iterator it = sorted_params.begin(); it != end; ++it)
                 {
                         LLPanel::Params p;
                         p.name("LLScrollingPanelParam");
@@ -1535,7 +1526,7 @@ void LLPanelEditWearable::updateVerbs()
 {
         bool can_copy = false;
 
-        if(mWearableItem)
+        if (mWearableItem)
         {
                 can_copy = mWearableItem->getPermissions().allowCopyBy(gAgentID);
         }
@@ -1545,7 +1536,7 @@ void LLPanelEditWearable::updateVerbs()
         mBtnRevert->setEnabled(is_dirty);
         getChildView("save_as_button")->setEnabled(is_dirty && can_copy);
 
-        if(isAgentAvatarValid())
+        if (isAgentAvatarValid())
         {
                 // Update viewer's radio buttons (of RadioGroup with control_name="AvatarSex") of Avatar's gender
                 // with value from "AvatarSex" setting
@@ -1586,17 +1577,20 @@ void LLPanelEditWearable::configureAlphaCheckbox(LLAvatarAppearanceDefines::ETex
 
 void LLPanelEditWearable::onInvisibilityCommit(LLCheckBoxCtrl* checkbox_ctrl, LLAvatarAppearanceDefines::ETextureIndex te)
 {
-        if (!checkbox_ctrl) return;
-        if (!getWearable()) return;
+        if (!checkbox_ctrl || !getWearable())
+        {
+                return;
+        }
 
         LL_INFOS() << "onInvisibilityCommit, self " << this << " checkbox_ctrl " << checkbox_ctrl << LL_ENDL;
 
-		U32 index;
-		if (!gAgentWearables.getWearableIndex(getWearable(),index))
-		{
-			LL_WARNS() << "wearable not found" << LL_ENDL;
-			return;
-		}
+        U32 index;
+        if (!gAgentWearables.getWearableIndex(getWearable(), index))
+        {
+                LL_WARNS() << "wearable not found" << LL_ENDL;
+                return;
+        }
+
         bool new_invis_state = checkbox_ctrl->get();
         if (new_invis_state)
         {
@@ -1604,8 +1598,8 @@ void LLPanelEditWearable::onInvisibilityCommit(LLCheckBoxCtrl* checkbox_ctrl, LL
                 mPreviousAlphaTexture[te] = lto->getID();
                 
                 LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture( IMG_INVISIBLE );
-				gAgentAvatarp->setLocalTexture(te, image, FALSE, index);
-				gAgentAvatarp->wearableUpdated(getWearable()->getType());
+                gAgentAvatarp->setLocalTexture(te, image, FALSE, index);
+                gAgentAvatarp->wearableUpdated(getWearable()->getType());
         }
         else
         {
@@ -1615,10 +1609,16 @@ void LLPanelEditWearable::onInvisibilityCommit(LLCheckBoxCtrl* checkbox_ctrl, LL
                 {
                         prev_id = LLUUID( gSavedSettings.getString( "UIImgDefaultAlphaUUID" ) );
                 }
-                if (prev_id.isNull()) return;
-                
+                if (prev_id.isNull())
+                {
+                        return;
+                }
+
                 LLViewerFetchedTexture* image = LLViewerTextureManager::getFetchedTexture(prev_id);
-                if (!image) return;
+                if (!image)
+                {
+                        return;
+                }
 
                 gAgentAvatarp->setLocalTexture(te, image, FALSE, index);
                 gAgentAvatarp->wearableUpdated(getWearable()->getType());
@@ -1629,7 +1629,7 @@ void LLPanelEditWearable::onInvisibilityCommit(LLCheckBoxCtrl* checkbox_ctrl, LL
 
 void LLPanelEditWearable::updateAlphaCheckboxes()
 {
-        for(string_texture_index_map_t::iterator iter = mAlphaCheckbox2Index.begin();
+        for (string_texture_index_map_t::iterator iter = mAlphaCheckbox2Index.begin();
                 iter != mAlphaCheckbox2Index.end(); ++iter )
         {
                 LLAvatarAppearanceDefines::ETextureIndex te = (LLAvatarAppearanceDefines::ETextureIndex)iter->second;
-- 
cgit v1.2.3


From b07a9cfec36cdcad604b8aa775ed282793116a4d Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 21 Aug 2023 11:12:11 +0200
Subject: SL-20140 Setting shape hand size to 36 won't save

---
 indra/newview/character/avatar_lad.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 2cdd86267e..3a333b7faf 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -1928,8 +1928,8 @@
      edit_group_order="10"
      label_min="Small Hands"
      label_max="Large Hands"
-     value_min="-.3"
-     value_max=".3"
+     value_min="-.5"
+     value_max=".5"
      camera_elevation=".1"
      camera_distance="1.4"
      camera_angle="0">
-- 
cgit v1.2.3


From d2bb4cd19d3a044276cc4c60770cff607d697b35 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 21 Aug 2023 10:58:52 -0700
Subject: SL-20172: Add in an 'Are you sure Y/N' type dialog before writing
 thumbnails (as well as for clearing thumbnails) since it's also a
 destructive, non-undoiable operation

---
 .../newview/llfloaterinventorythumbnailshelper.cpp | 71 +++++++++++++---------
 .../newview/skins/default/xui/en/notifications.xml | 14 ++++-
 2 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/indra/newview/llfloaterinventorythumbnailshelper.cpp b/indra/newview/llfloaterinventorythumbnailshelper.cpp
index 15e1c88572..814f88e9b9 100644
--- a/indra/newview/llfloaterinventorythumbnailshelper.cpp
+++ b/indra/newview/llfloaterinventorythumbnailshelper.cpp
@@ -5,7 +5,7 @@
  *
  * Usage instructions and some brief notes can be found in Confluence here:
  * https://lindenlab.atlassian.net/wiki/spaces/~174746736/pages/2928672843/Inventory+Thumbnail+Helper+Tool
- * 
+ *
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
@@ -372,43 +372,56 @@ bool writeInventoryThumbnailID(LLUUID item_id, LLUUID thumbnail_asset_id)
 // writes the thumbnail accordingly.
 void LLFloaterInventoryThumbnailsHelper::onWriteThumbnails()
 {
-    std::map<std::string, LLViewerInventoryItem*>::iterator item_iter = mItemNamesItems.begin();
-    while (item_iter != mItemNamesItems.end())
+    // create and show confirmation (Yes/No) textbox since this is a destructive operation
+    LLNotificationsUtil::add("WriteInventoryThumbnailsWarning", LLSD(), LLSD(),
+                             [&](const LLSD & notif, const LLSD & resp)
     {
-        std::string item_name = (*item_iter).first;
-
-        std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
-        if (texture_iter != mTextureNamesIDs.end())
+        S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp);
+        if (opt == 0)
         {
-            LLUUID item_id = (*item_iter).second->getUUID();
+            std::map<std::string, LLViewerInventoryItem*>::iterator item_iter = mItemNamesItems.begin();
+            while (item_iter != mItemNamesItems.end())
+            {
+                std::string item_name = (*item_iter).first;
 
-            LLUUID thumbnail_asset_id = (*texture_iter).second;
+                std::map<std::string, LLUUID>::iterator texture_iter = mTextureNamesIDs.find(item_name);
+                if (texture_iter != mTextureNamesIDs.end())
+                {
+                    LLUUID item_id = (*item_iter).second->getUUID();
 
-            writeToLog(
-                STRINGIZE(
-                    "WRITING THUMB " <<
-                    (*item_iter).first <<
-                    "\n" <<
-                    "item ID: " <<
-                    item_id <<
-                    "\n" <<
-                    "thumbnail texture ID: " <<
-                    thumbnail_asset_id <<
-                    "\n"
-                ), true);
+                    LLUUID thumbnail_asset_id = (*texture_iter).second;
 
+                    writeToLog(
+                        STRINGIZE(
+                            "WRITING THUMB " <<
+                            (*item_iter).first <<
+                            "\n" <<
+                            "item ID: " <<
+                            item_id <<
+                            "\n" <<
+                            "thumbnail texture ID: " <<
+                            thumbnail_asset_id <<
+                            "\n"
+                        ), true);
 
-            (*item_iter).second->setThumbnailUUID(thumbnail_asset_id);
 
-            // This additional step (notifying AIS API) is required
-            // to make the changes persist outside of the local cache
-            writeInventoryThumbnailID(item_id, thumbnail_asset_id);
-        }
+                    (*item_iter).second->setThumbnailUUID(thumbnail_asset_id);
 
-        ++item_iter;
-    }
+                    // This additional step (notifying AIS API) is required
+                    // to make the changes persist outside of the local cache
+                    writeInventoryThumbnailID(item_id, thumbnail_asset_id);
+                }
 
-    updateDisplayList();
+                ++item_iter;
+            }
+
+            updateDisplayList();
+        }
+        else
+        {
+            LL_INFOS() << "Writing new thumbnails was canceled" << LL_ENDL;
+        }
+    });
 }
 
 // Called when the Log Items with Missing Thumbnails is selected. This merely writes
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 45020163ef..ca9f2c07e8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12087,5 +12087,17 @@ Would you like to save them first?
          notext="No"
          yestext="Yes"/>
     </notification>
-    
+    <notification
+  icon="alertmodal.tga"
+  name="WriteInventoryThumbnailsWarning"
+  type="alertmodal">
+        You are about to overwrite thumbnail images for some or all of the inventory items in the list. This change cannot be undone.
+
+        Would you like to proceed?
+        <tag>confirm</tag>
+        <usetemplate
+         name="okcancelbuttons"
+         notext="No"
+         yestext="Yes"/>
+    </notification
 </notifications>
-- 
cgit v1.2.3


From 82ee49ad9ff5ca95d9f7215a959612c4efa21599 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 21 Aug 2023 11:22:30 -0700
Subject: SL-20172: I missed a closing angle brace after adding a new XML
 notification entry - mysteriously, the Viewer still worked as expected but
 the TeamCity coding check policy (WTF??) got a bit sad about it..

---
 indra/newview/skins/default/xui/en/notifications.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ca9f2c07e8..f7a581e3d7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12087,6 +12087,7 @@ Would you like to save them first?
          notext="No"
          yestext="Yes"/>
     </notification>
+
     <notification
   icon="alertmodal.tga"
   name="WriteInventoryThumbnailsWarning"
@@ -12099,5 +12100,5 @@ Would you like to save them first?
          name="okcancelbuttons"
          notext="No"
          yestext="Yes"/>
-    </notification
+    </notification>
 </notifications>
-- 
cgit v1.2.3


From 0b6c9c50c3049eb75a0305376d067bf8982e184d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 21 Aug 2023 23:55:00 +0300
Subject: SL-20173 show warning notification when trying to add invalid files
 as local texture

---
 indra/llimage/llimagedimensionsinfo.cpp              |  3 +++
 indra/llimage/llimagedimensionsinfo.h                |  7 +++++++
 indra/newview/lllocalbitmaps.cpp                     |  3 +++
 indra/newview/skins/default/xui/en/notifications.xml | 10 +++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/indra/llimage/llimagedimensionsinfo.cpp b/indra/llimage/llimagedimensionsinfo.cpp
index 97b543f3b6..5756ddb32b 100644
--- a/indra/llimage/llimagedimensionsinfo.cpp
+++ b/indra/llimage/llimagedimensionsinfo.cpp
@@ -90,6 +90,7 @@ bool LLImageDimensionsInfo::getImageDimensionsBmp()
 	if (signature[0] != 'B' || signature[1] != 'M')
 	{
 		LL_WARNS() << "Not a BMP" << LL_ENDL;
+        mWarning = "IncorrectFormat";
 		return false;
 	}
 
@@ -140,6 +141,7 @@ bool LLImageDimensionsInfo::getImageDimensionsPng()
 	if (memcmp(signature, png_magic, PNG_MAGIC_SIZE) != 0)
 	{
 		LL_WARNS() << "Not a PNG" << LL_ENDL;
+        mWarning = "IncorrectFormat";
 		return false;
 	}
 
@@ -183,6 +185,7 @@ bool LLImageDimensionsInfo::getImageDimensionsJpeg()
 	if (memcmp(signature, jpeg_magic, JPEG_MAGIC_SIZE) != 0)
 	{
 		LL_WARNS() << "Not a JPEG" << LL_ENDL;
+        mWarning = "IncorrectFormat";
 		return false;
 	}
 	fseek(fp, 0, SEEK_SET); // go back to start of the file
diff --git a/indra/llimage/llimagedimensionsinfo.h b/indra/llimage/llimagedimensionsinfo.h
index 8f716c5d02..ade283bb85 100644
--- a/indra/llimage/llimagedimensionsinfo.h
+++ b/indra/llimage/llimagedimensionsinfo.h
@@ -55,6 +55,12 @@ public:
 	{
 		return mLastError;
 	}
+
+    const std::string& getWarningName()
+    {
+        return mWarning;
+    }
+
 protected:
 
 	void clean()
@@ -129,6 +135,7 @@ protected:
 	std::string mSrcFilename;
 
 	std::string mLastError;
+    std::string mWarning;
 
 	U8* mData;
 
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index de8db69e19..72ef365a6d 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -982,6 +982,9 @@ bool LLLocalBitmapMgr::checkTextureDimensions(std::string filename)
 	LLImageDimensionsInfo image_info;
 	if (!image_info.load(filename,codec))
 	{
+        LLSD args;
+        args["NAME"] = gDirUtilp->getBaseFileName(filename);
+        LLNotificationsUtil::add(image_info.getWarningName(), args);
 		return false;
 	}
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a216ef7c0d..a4b73879b8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11986,5 +11986,13 @@ Would you like to save them first?
        notext="No"
        yestext="Yes"/>
   </notification>
-    
+
+  <notification
+   icon="notifytip.tga"
+   name="IncorrectFormat"
+   priority="high"
+   type="notifytip">
+Unable to upload &apos;[NAME]&apos; due to the following reason: incorrect image format.
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3


From 226a0025e9c8f4cf612e1781fb083e32939a32b4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 22 Aug 2023 00:39:47 +0300
Subject: SL-20182 dirtyFilter crash while accessing parent

---
 indra/llui/llfolderviewitem.cpp       | 18 +++++++++++-------
 indra/newview/llconversationmodel.cpp |  7 +++++++
 indra/newview/llconversationmodel.h   |  1 +
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index e2b5279aab..16e9034430 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -181,14 +181,18 @@ LLFolderViewItem::~LLFolderViewItem()
 
 BOOL LLFolderViewItem::postBuild()
 {
-    LLFolderViewModelItem& vmi = *getViewModelItem();
-    // getDisplayName() is expensive (due to internal getLabelSuffix() and name building)
-    // it also sets search strings so it requires a filter reset
-    mLabel = vmi.getDisplayName();
-    setToolTip(vmi.getName());
+    LLFolderViewModelItem* vmi = getViewModelItem();
+    llassert(vmi); // not supposed to happen, if happens, find out why and fix
+    if (vmi)
+    {
+        // getDisplayName() is expensive (due to internal getLabelSuffix() and name building)
+        // it also sets search strings so it requires a filter reset
+        mLabel = vmi->getDisplayName();
+        setToolTip(vmi->getName());
 
-    // Dirty the filter flag of the model from the view (CHUI-849)
-    vmi.dirtyFilter();
+        // Dirty the filter flag of the model from the view (CHUI-849)
+        vmi->dirtyFilter();
+    }
 
     // Don't do full refresh on constructor if it is possible to avoid
     // it significantly slows down bulk view creation.
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index 9ec4fb085b..9e043dbac0 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -90,6 +90,8 @@ LLConversationItem::~LLConversationItem()
 	{
 		mAvatarNameCacheConnection.disconnect();
 	}
+
+    clearChildren();
 }
 
 //virtual
@@ -254,6 +256,11 @@ LLConversationItemSession::LLConversationItemSession(const LLUUID& uuid, LLFolde
 	mConvType = CONV_SESSION_UNKNOWN;
 }
 
+LLConversationItemSession::~LLConversationItemSession()
+{
+    clearAndDeparentModels();
+}
+
 bool LLConversationItemSession::hasChildren() const
 {
 	return getChildrenCount() > 0;
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 7c6980a7e6..07e60d7f62 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -156,6 +156,7 @@ class LLConversationItemSession : public LLConversationItem
 public:
 	LLConversationItemSession(std::string display_name, const LLUUID& uuid, LLFolderViewModelInterface& root_view_model);
 	LLConversationItemSession(const LLUUID& uuid, LLFolderViewModelInterface& root_view_model);
+    ~LLConversationItemSession();
 	
 	/*virtual*/ bool hasChildren() const;
     LLPointer<LLUIImage> getIcon() const { return NULL; }
-- 
cgit v1.2.3


From 720504595a09a94d10ff07926e8d1274dcab440c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 23 Aug 2023 02:20:12 +0300
Subject: SL-20189 Crash at LLViewerMediaTexture::addFace

---
 indra/newview/llviewertexture.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 97ff5f58e4..18c3a582a2 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -3742,7 +3742,10 @@ void LLViewerMediaTexture::addFace(U32 ch, LLFace* facep)
 	
 	if(te && te->getID().notNull()) //should have a texture
 	{
-		LL_ERRS() << "The face does not have a valid texture before media texture." << LL_ENDL;
+        LL_WARNS_ONCE() << "The face's texture " << te->getID() << " is not valid. Face must have a valid texture before media texture." << LL_ENDL;
+        // This might break the object, but it likely isn't a 'recoverable' situation.
+        LLViewerFetchedTexture* tex = LLViewerTextureManager::getFetchedTexture(te->getID());
+        mTextureList.push_back(tex);
 	}
 }
 
-- 
cgit v1.2.3


From 85efb85acfa098998c0f1249320f7e08288efdfc Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 23 Aug 2023 11:06:53 +0200
Subject: SL-19299 Viewer crashes after change 'Pick a physics model:' dropdown

---
 indra/llcommon/llpointer.h       | 31 ++++++++++++++++---------------
 indra/llcommon/llrefcount.cpp    |  2 +-
 indra/llcommon/llrefcount.h      | 12 ++++--------
 indra/newview/llmodelpreview.cpp |  1 +
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h
index 9a6453ea48..2401951465 100644
--- a/indra/llcommon/llpointer.h
+++ b/indra/llcommon/llpointer.h
@@ -129,16 +129,6 @@ protected:
 	void ref();                             
 	void unref();
 #else
-
-	void assign(const LLPointer<Type>& ptr)
-	{
-		if( mPointer != ptr.mPointer )
-		{
-			unref(); 
-			mPointer = ptr.mPointer;
-			ref();
-		}
-	}
 	void ref()                             
 	{ 
 		if (mPointer)
@@ -161,7 +151,18 @@ protected:
 			}
 		}
 	}
-#endif
+#endif // LL_LIBRARY_INCLUDE
+
+	void assign(const LLPointer<Type>& ptr)
+	{
+		if (mPointer != ptr.mPointer)
+		{
+			unref();
+			mPointer = ptr.mPointer;
+			ref();
+		}
+	}
+
 protected:
 	Type*	mPointer;
 };
@@ -264,7 +265,7 @@ protected:
 #ifdef LL_LIBRARY_INCLUDE
 	void ref();                             
 	void unref();
-#else
+#else // LL_LIBRARY_INCLUDE
 	void ref()                             
 	{ 
 		if (mPointer)
@@ -277,9 +278,9 @@ protected:
 	{
 		if (mPointer)
 		{
-			const Type *tempp = mPointer;
+			const Type *temp = mPointer;
 			mPointer = NULL;
-			tempp->unref();
+			temp->unref();
 			if (mPointer != NULL)
 			{
 				LL_WARNS() << "Unreference did assignment to non-NULL because of destructor" << LL_ENDL;
@@ -287,7 +288,7 @@ protected:
 			}
 		}
 	}
-#endif
+#endif // LL_LIBRARY_INCLUDE
 protected:
 	const Type*	mPointer;
 };
diff --git a/indra/llcommon/llrefcount.cpp b/indra/llcommon/llrefcount.cpp
index 6852b5536a..3eae252ed5 100644
--- a/indra/llcommon/llrefcount.cpp
+++ b/indra/llcommon/llrefcount.cpp
@@ -30,7 +30,7 @@
 #include "llerror.h"
 
 // maximum reference count before sounding memory leak alarm
-const S32 gMaxRefCount = S32_MAX;
+const S32 gMaxRefCount = LL_REFCOUNT_FREE;
 
 LLRefCount::LLRefCount(const LLRefCount& other)
 :	mRef(0)
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 2080da1565..2281bf87da 100644
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -51,21 +51,17 @@ protected:
 public:
 	LLRefCount();
 
-    inline void validateRefCount() const
-    {
-        llassert(mRef > 0); // ref count below 0, likely corrupted
-        llassert(mRef < gMaxRefCount); // ref count excessive, likely memory leak
-    }
-
 	inline void ref() const
 	{ 
+		llassert(mRef != LL_REFCOUNT_FREE); // object is deleted
 		mRef++; 
-        validateRefCount();
+		llassert(mRef < gMaxRefCount); // ref count excessive, likely memory leak
 	} 
 
 	inline S32 unref() const
 	{
-        validateRefCount();
+		llassert(mRef != LL_REFCOUNT_FREE); // object is deleted
+		llassert(mRef > 0); // ref count below 1, likely corrupted
 		if (0 == --mRef)
 		{
             mRef = LL_REFCOUNT_FREE; // set to nonsense yet recognizable value to aid in debugging
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 495153981b..519d11e2ad 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -270,6 +270,7 @@ void LLModelPreview::rebuildUploadData()
 {
     assert_main_thread();
 
+    mDefaultPhysicsShapeP = NULL;
     mUploadData.clear();
     mTextureSet.clear();
 
-- 
cgit v1.2.3


From beb6181863bbce18ff7f408014e02a1086bc9711 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 23 Aug 2023 07:13:43 +0200
Subject: SL-19299 Code formatting in modified files

---
 indra/llcommon/llpointer.h       | 114 +++++++++++++++++++--------------------
 indra/llcommon/llrefcount.cpp    |   2 +-
 indra/llcommon/llrefcount.h      |  34 ++++++------
 indra/newview/llmodelpreview.cpp |  17 +++---
 4 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h
index 2401951465..96ccfb481e 100644
--- a/indra/llcommon/llpointer.h
+++ b/indra/llcommon/llpointer.h
@@ -46,33 +46,32 @@
 template <class Type> class LLPointer
 {
 public:
-
-	LLPointer() : 
+	LLPointer() :
 		mPointer(NULL)
 	{
 	}
 
-	LLPointer(Type* ptr) : 
+	LLPointer(Type* ptr) :
 		mPointer(ptr)
 	{
 		ref();
 	}
 
-	LLPointer(const LLPointer<Type>& ptr) : 
+	LLPointer(const LLPointer<Type>& ptr) :
 		mPointer(ptr.mPointer)
 	{
 		ref();
 	}
 
-	// support conversion up the type hierarchy.  See Item 45 in Effective C++, 3rd Ed.
+	// Support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
 	template<typename Subclass>
-	LLPointer(const LLPointer<Subclass>& ptr) : 
+	LLPointer(const LLPointer<Subclass>& ptr) :
 		mPointer(ptr.get())
 	{
 		ref();
 	}
 
-	~LLPointer()								
+	~LLPointer()
 	{
 		unref();
 	}
@@ -83,39 +82,39 @@ public:
 	const Type&	operator*() const				{ return *mPointer; }
 	Type&	operator*()							{ return *mPointer; }
 
-	operator BOOL()  const						{ return (mPointer != NULL); }
-	operator bool()  const						{ return (mPointer != NULL); }
+	operator BOOL() const						{ return (mPointer != NULL); }
+	operator bool() const						{ return (mPointer != NULL); }
 	bool operator!() const						{ return (mPointer == NULL); }
 	bool isNull() const							{ return (mPointer == NULL); }
 	bool notNull() const						{ return (mPointer != NULL); }
 
-	operator Type*()       const				{ return mPointer; }
-	bool operator !=(Type* ptr) const           { return (mPointer != ptr); 	}
-	bool operator ==(Type* ptr) const           { return (mPointer == ptr); 	}
-	bool operator ==(const LLPointer<Type>& ptr) const           { return (mPointer == ptr.mPointer); 	}
-	bool operator < (const LLPointer<Type>& ptr) const           { return (mPointer < ptr.mPointer); 	}
-	bool operator > (const LLPointer<Type>& ptr) const           { return (mPointer > ptr.mPointer); 	}
+	operator Type*() const						{ return mPointer; }
+	bool operator !=(Type* ptr) const			{ return (mPointer != ptr); }
+	bool operator ==(Type* ptr) const			{ return (mPointer == ptr); }
+	bool operator ==(const LLPointer<Type>& ptr) const { return (mPointer == ptr.mPointer); }
+	bool operator < (const LLPointer<Type>& ptr) const { return (mPointer < ptr.mPointer); }
+	bool operator > (const LLPointer<Type>& ptr) const { return (mPointer > ptr.mPointer); }
 
-	LLPointer<Type>& operator =(Type* ptr)                   
-	{ 
+	LLPointer<Type>& operator =(Type* ptr)
+	{
 		assign(ptr);
-		return *this; 
+		return *this;
 	}
 
-	LLPointer<Type>& operator =(const LLPointer<Type>& ptr)  
-	{ 
+	LLPointer<Type>& operator =(const LLPointer<Type>& ptr)
+	{
 		assign(ptr);
-		return *this; 
+		return *this;
 	}
 
 	// support assignment up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
 	template<typename Subclass>
-	LLPointer<Type>& operator =(const LLPointer<Subclass>& ptr)  
-	{ 
+	LLPointer<Type>& operator =(const LLPointer<Subclass>& ptr)
+	{
 		assign(ptr.get());
-		return *this; 
+		return *this;
 	}
-	
+
 	// Just exchange the pointers, which will not change the reference counts.
 	static void swap(LLPointer<Type>& a, LLPointer<Type>& b)
 	{
@@ -170,18 +169,18 @@ protected:
 template <class Type> class LLConstPointer
 {
 public:
-	LLConstPointer() : 
+	LLConstPointer() :
 		mPointer(NULL)
 	{
 	}
 
-	LLConstPointer(const Type* ptr) : 
+	LLConstPointer(const Type* ptr) :
 		mPointer(ptr)
 	{
 		ref();
 	}
 
-	LLConstPointer(const LLConstPointer<Type>& ptr) : 
+	LLConstPointer(const LLConstPointer<Type>& ptr) :
 		mPointer(ptr.mPointer)
 	{
 		ref();
@@ -189,7 +188,7 @@ public:
 
 	// support conversion up the type hierarchy.  See Item 45 in Effective C++, 3rd Ed.
 	template<typename Subclass>
-	LLConstPointer(const LLConstPointer<Subclass>& ptr) : 
+	LLConstPointer(const LLConstPointer<Subclass>& ptr) :
 		mPointer(ptr.get())
 	{
 		ref();
@@ -204,55 +203,55 @@ public:
 	const Type*	operator->() const				{ return mPointer; }
 	const Type&	operator*() const				{ return *mPointer; }
 
-	operator BOOL()  const						{ return (mPointer != NULL); }
-	operator bool()  const						{ return (mPointer != NULL); }
+	operator BOOL() const						{ return (mPointer != NULL); }
+	operator bool() const						{ return (mPointer != NULL); }
 	bool operator!() const						{ return (mPointer == NULL); }
 	bool isNull() const							{ return (mPointer == NULL); }
 	bool notNull() const						{ return (mPointer != NULL); }
 
-	operator const Type*()       const			{ return mPointer; }
-	bool operator !=(const Type* ptr) const     { return (mPointer != ptr); 	}
-	bool operator ==(const Type* ptr) const     { return (mPointer == ptr); 	}
-	bool operator ==(const LLConstPointer<Type>& ptr) const           { return (mPointer == ptr.mPointer); 	}
-	bool operator < (const LLConstPointer<Type>& ptr) const           { return (mPointer < ptr.mPointer); 	}
-	bool operator > (const LLConstPointer<Type>& ptr) const           { return (mPointer > ptr.mPointer); 	}
+	operator const Type*() const				{ return mPointer; }
+	bool operator !=(const Type* ptr) const		{ return (mPointer != ptr); }
+	bool operator ==(const Type* ptr) const		{ return (mPointer == ptr); }
+	bool operator ==(const LLConstPointer<Type>& ptr) const { return (mPointer == ptr.mPointer); }
+	bool operator < (const LLConstPointer<Type>& ptr) const { return (mPointer < ptr.mPointer); }
+	bool operator > (const LLConstPointer<Type>& ptr) const { return (mPointer > ptr.mPointer); }
 
-	LLConstPointer<Type>& operator =(const Type* ptr)                   
+	LLConstPointer<Type>& operator =(const Type* ptr)
 	{
 		if( mPointer != ptr )
 		{
-			unref(); 
-			mPointer = ptr; 
+			unref();
+			mPointer = ptr;
 			ref();
 		}
 
-		return *this; 
+		return *this;
 	}
 
-	LLConstPointer<Type>& operator =(const LLConstPointer<Type>& ptr)  
-	{ 
+	LLConstPointer<Type>& operator =(const LLConstPointer<Type>& ptr)
+	{
 		if( mPointer != ptr.mPointer )
 		{
-			unref(); 
+			unref();
 			mPointer = ptr.mPointer;
 			ref();
 		}
-		return *this; 
+		return *this;
 	}
 
 	// support assignment up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
 	template<typename Subclass>
-	LLConstPointer<Type>& operator =(const LLConstPointer<Subclass>& ptr)  
-	{ 
+	LLConstPointer<Type>& operator =(const LLConstPointer<Subclass>& ptr)
+	{
 		if( mPointer != ptr.get() )
 		{
-			unref(); 
+			unref();
 			mPointer = ptr.get();
 			ref();
 		}
-		return *this; 
+		return *this;
 	}
-	
+
 	// Just exchange the pointers, which will not change the reference counts.
 	static void swap(LLConstPointer<Type>& a, LLConstPointer<Type>& b)
 	{
@@ -263,11 +262,11 @@ public:
 
 protected:
 #ifdef LL_LIBRARY_INCLUDE
-	void ref();                             
+	void ref();
 	void unref();
 #else // LL_LIBRARY_INCLUDE
-	void ref()                             
-	{ 
+	void ref()
+	{
 		if (mPointer)
 		{
 			mPointer->ref();
@@ -289,6 +288,7 @@ protected:
 		}
 	}
 #endif // LL_LIBRARY_INCLUDE
+
 protected:
 	const Type*	mPointer;
 };
@@ -298,13 +298,13 @@ class LLCopyOnWritePointer : public LLPointer<Type>
 {
 public:
 	typedef LLCopyOnWritePointer<Type> self_t;
-    typedef LLPointer<Type> pointer_t;
-    
-	LLCopyOnWritePointer() 
+	typedef LLPointer<Type> pointer_t;
+
+	LLCopyOnWritePointer()
 	:	mStayUnique(false)
 	{}
 
-	LLCopyOnWritePointer(Type* ptr) 
+	LLCopyOnWritePointer(Type* ptr)
 	:	LLPointer<Type>(ptr),
 		mStayUnique(false)
 	{}
diff --git a/indra/llcommon/llrefcount.cpp b/indra/llcommon/llrefcount.cpp
index 3eae252ed5..3da94e7a8d 100644
--- a/indra/llcommon/llrefcount.cpp
+++ b/indra/llcommon/llrefcount.cpp
@@ -49,7 +49,7 @@ LLRefCount::LLRefCount() :
 }
 
 LLRefCount::~LLRefCount()
-{ 
+{
 	if (mRef != LL_REFCOUNT_FREE && mRef != 0)
 	{
 		LL_ERRS() << "deleting non-zero reference" << LL_ENDL;
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 2281bf87da..15e7175fc8 100644
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -52,11 +52,11 @@ public:
 	LLRefCount();
 
 	inline void ref() const
-	{ 
+	{
 		llassert(mRef != LL_REFCOUNT_FREE); // object is deleted
-		mRef++; 
+		mRef++;
 		llassert(mRef < gMaxRefCount); // ref count excessive, likely memory leak
-	} 
+	}
 
 	inline S32 unref() const
 	{
@@ -64,7 +64,7 @@ public:
 		llassert(mRef > 0); // ref count below 1, likely corrupted
 		if (0 == --mRef)
 		{
-            mRef = LL_REFCOUNT_FREE; // set to nonsense yet recognizable value to aid in debugging
+			mRef = LL_REFCOUNT_FREE; // set to nonsense yet recognizable value to aid in debugging
 			delete this;
 			return 0;
 		}
@@ -78,8 +78,8 @@ public:
 		return mRef;
 	}
 
-private: 
-	mutable S32	mRef; 
+private:
+	mutable S32	mRef;
 };
 
 
@@ -102,7 +102,7 @@ protected:
 public:
 	LLThreadSafeRefCount();
 	LLThreadSafeRefCount(const LLThreadSafeRefCount&);
-	LLThreadSafeRefCount& operator=(const LLThreadSafeRefCount& ref) 
+	LLThreadSafeRefCount& operator=(const LLThreadSafeRefCount& ref)
 	{
 		mRef = 0;
 		return *this;
@@ -110,8 +110,8 @@ public:
 
 	void ref()
 	{
-		mRef++; 
-	} 
+		mRef++;
+	}
 
 	void unref()
 	{
@@ -132,36 +132,36 @@ public:
 		return currentVal;
 	}
 
-private: 
-	LLAtomicS32 mRef; 
+private:
+	LLAtomicS32 mRef;
 };
 
 /**
  * intrusive pointer support for LLThreadSafeRefCount
  * this allows you to use boost::intrusive_ptr with any LLThreadSafeRefCount-derived type
  */
-inline void intrusive_ptr_add_ref(LLThreadSafeRefCount* p) 
+inline void intrusive_ptr_add_ref(LLThreadSafeRefCount* p)
 {
 	p->ref();
 }
 
-inline void intrusive_ptr_release(LLThreadSafeRefCount* p) 
+inline void intrusive_ptr_release(LLThreadSafeRefCount* p)
 {
-	p->unref(); 
+	p->unref();
 }
 
 /**
  * intrusive pointer support
  * this allows you to use boost::intrusive_ptr with any LLRefCount-derived type
  */
-inline void intrusive_ptr_add_ref(LLRefCount* p) 
+inline void intrusive_ptr_add_ref(LLRefCount* p)
 {
 	p->ref();
 }
 
-inline void intrusive_ptr_release(LLRefCount* p) 
+inline void intrusive_ptr_release(LLRefCount* p)
 {
-	p->unref(); 
+	p->unref();
 }
 
 #endif
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 519d11e2ad..ab8fdd6716 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -248,7 +248,7 @@ void LLModelPreview::updateDimentionsAndOffsets()
         {
             accounted.insert(instance.mModel);
 
-            //update instance skin info for each lods pelvisZoffset 
+            // update instance skin info for each lods pelvisZoffset
             for (int j = 0; j<LLModel::NUM_LODS; ++j)
             {
                 if (instance.mLOD[j])
@@ -310,7 +310,7 @@ void LLModelPreview::rebuildUploadData()
         mat *= scale_mat;
 
         for (LLModelLoader::model_instance_list::iterator model_iter = iter->second.begin(); model_iter != iter->second.end();)
-        { //for each instance with said transform applied 
+        { // for each instance with said transform applied
             LLModelInstance instance = *model_iter++;
 
             LLModel* base_model = instance.mModel;
@@ -573,7 +573,7 @@ void LLModelPreview::rebuildUploadData()
     else if (getLoadState() == LLModelLoader::ERROR_MATERIALS
              || getLoadState() == LLModelLoader::WARNING_BIND_SHAPE_ORIENTATION)
     {
-        // This is only valid for these two error types because they are 
+        // This is only valid for these two error types because they are
         // only used inside rebuildUploadData() and updateStatusMessages()
         // updateStatusMessages() is called after rebuildUploadData()
         setLoadState(LLModelLoader::DONE);
@@ -775,7 +775,7 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
         // it tends to force the UI into strange checkbox options
         // which cannot be altered.
 
-        //only try to load from slm if viewer is configured to do so and this is the 
+        //only try to load from slm if viewer is configured to do so and this is the
         //initial model load (not an LoD or physics shape)
         mModelLoader->mTrySLM = gSavedSettings.getBOOL("MeshImportUseSLM") && mUploadData.empty();
     }
@@ -861,12 +861,13 @@ void LLModelPreview::clearIncompatible(S32 lod)
 
         // Check if already started
         bool subscribe_for_generation = mLodsQuery.empty();
-        
+
         // Remove previously scheduled work
         mLodsQuery.clear();
 
         LLFloaterModelPreview* fmp = LLFloaterModelPreview::sInstance;
-        if (!fmp) return;
+        if (!fmp)
+            return;
 
         // Schedule new work
         for (S32 i = LLModel::LOD_HIGH; i >= 0; --i)
@@ -1696,7 +1697,7 @@ F32 LLModelPreview::genMeshOptimizerPerFace(LLModel *base_model, LLModel *target
 
     ll_aligned_free_16(output_indices);
     ll_aligned_free_16(shadow_indices);
-     
+
     if (size_new_indices < 3)
     {
         // At least one triangle is needed
@@ -1881,7 +1882,7 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d
                 {
                     precise_ratio = genMeshOptimizerPerModel(base, target_model, indices_decimator, lod_error_threshold, MESH_OPTIMIZER_NO_UVS);
                 }
-                
+
                 if (precise_ratio < 0 || (precise_ratio * allowed_ratio_drift < indices_decimator))
                 {
                     // Try sloppy variant if normal one failed to simplify model enough.
-- 
cgit v1.2.3


From 57d784f80728f9ecd75f8dbc989cd75cf328c353 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 24 Aug 2023 16:02:08 +0200
Subject: SL-18620 Statistics->Advanced->Memory Usage no longer updating

---
 indra/llcommon/lltrace.cpp                         |   2 -
 indra/llcommon/lltrace.h                           |  82 ----
 indra/llcommon/lltraceaccumulators.cpp             |  69 +---
 indra/llcommon/lltraceaccumulators.h               | 120 ++----
 indra/llcommon/lltracerecording.cpp                | 439 +++++----------------
 indra/llcommon/lltracerecording.h                  | 109 ++---
 indra/llcommon/lltracethreadrecorder.cpp           |  14 +-
 indra/llui/llstatbar.cpp                           |  28 +-
 indra/llui/llstatbar.h                             |   8 +-
 indra/newview/llscenemonitor.cpp                   |  13 -
 .../newview/skins/default/xui/en/floater_stats.xml |  49 ---
 11 files changed, 195 insertions(+), 738 deletions(-)

diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp
index ff671a8370..bce186054f 100644
--- a/indra/llcommon/lltrace.cpp
+++ b/indra/llcommon/lltrace.cpp
@@ -33,8 +33,6 @@
 namespace LLTrace
 {
 
-MemStatHandle gTraceMemStat("LLTrace");
-
 StatBase::StatBase( const char* name, const char* description ) 
 :	mName(name),
 	mDescription(description ? description : "")
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index 580cf0a5fd..21a5803a76 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -193,61 +193,6 @@ void add(CountStatHandle<T>& count, VALUE_T value)
 #endif
 }
 
-template<>
-class StatType<MemAccumulator::AllocationFacet>
-:	public StatType<MemAccumulator>
-{
-public:
-
-	StatType(const char* name, const char* description = "")
-	:	StatType<MemAccumulator>(name, description)
-	{}
-};
-
-template<>
-class StatType<MemAccumulator::DeallocationFacet>
-:	public StatType<MemAccumulator>
-{
-public:
-
-	StatType(const char* name, const char* description = "")
-	:	StatType<MemAccumulator>(name, description)
-	{}
-};
-
-class MemStatHandle : public StatType<MemAccumulator>
-{
-public:
-	typedef StatType<MemAccumulator> stat_t;
-	MemStatHandle(const char* name, const char* description = "")
-	:	stat_t(name, description)
-	{
-		mName = name;
-	}
-
-	void setName(const char* name)
-	{
-        LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-		mName = name;
-		setKey(name);
-	}
-
-	/*virtual*/ const char* getUnitLabel() const { return "KB"; }
-
-	StatType<MemAccumulator::AllocationFacet>& allocations() 
-	{
-        LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-		return static_cast<StatType<MemAccumulator::AllocationFacet>&>(*(StatType<MemAccumulator>*)this);
-	}
-
-	StatType<MemAccumulator::DeallocationFacet>& deallocations() 
-	{
-        LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-		return static_cast<StatType<MemAccumulator::DeallocationFacet>&>(*(StatType<MemAccumulator>*)this);
-	}
-};
-
-
 // measures effective memory footprint of specified type
 // specialize to cover different types
 template<typename T, typename IS_MEM_TRACKABLE = void, typename IS_UNITS = void>
@@ -334,33 +279,6 @@ struct MeasureMem<std::basic_string<T>, IS_MEM_TRACKABLE, IS_BYTES>
 	}
 };
 
-
-template<typename T>
-inline void claim_alloc(MemStatHandle& measurement, const T& value)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-#if LL_TRACE_ENABLED
-	auto size = MeasureMem<T>::measureFootprint(value);
-	if(size == 0) return;
-	MemAccumulator& accumulator = measurement.getCurrentAccumulator();
-	accumulator.mSize.sample(accumulator.mSize.hasValue() ? accumulator.mSize.getLastValue() + (F64)size : (F64)size);
-	accumulator.mAllocations.record(size);
-#endif
-}
-
-template<typename T>
-inline void disclaim_alloc(MemStatHandle& measurement, const T& value)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-#if LL_TRACE_ENABLED
-	auto size = MeasureMem<T>::measureFootprint(value);
-	if(size == 0) return;
-	MemAccumulator& accumulator = measurement.getCurrentAccumulator();
-	accumulator.mSize.sample(accumulator.mSize.hasValue() ? accumulator.mSize.getLastValue() - (F64)size : -(F64)size);
-	accumulator.mDeallocations.add(size);
-#endif
-}
-
 }
 
 #endif // LL_LLTRACE_H
diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp
index 6bd886ae98..5fafb53832 100644
--- a/indra/llcommon/lltraceaccumulators.cpp
+++ b/indra/llcommon/lltraceaccumulators.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file lltracesampler.cpp
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2012, 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,66 +32,45 @@
 namespace LLTrace
 {
 
-extern MemStatHandle gTraceMemStat;
-
-
 ///////////////////////////////////////////////////////////////////////
 // AccumulatorBufferGroup
 ///////////////////////////////////////////////////////////////////////
 
-AccumulatorBufferGroup::AccumulatorBufferGroup() 
+AccumulatorBufferGroup::AccumulatorBufferGroup()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	claim_alloc(gTraceMemStat, mCounts.capacity() * sizeof(CountAccumulator));
-	claim_alloc(gTraceMemStat, mSamples.capacity() * sizeof(SampleAccumulator));
-	claim_alloc(gTraceMemStat, mEvents.capacity() * sizeof(EventAccumulator));
-	claim_alloc(gTraceMemStat, mStackTimers.capacity() * sizeof(TimeBlockAccumulator));
-	claim_alloc(gTraceMemStat, mMemStats.capacity() * sizeof(MemAccumulator));
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 }
 
 AccumulatorBufferGroup::AccumulatorBufferGroup(const AccumulatorBufferGroup& other)
 :	mCounts(other.mCounts),
 	mSamples(other.mSamples),
 	mEvents(other.mEvents),
-	mStackTimers(other.mStackTimers),
-	mMemStats(other.mMemStats)
+	mStackTimers(other.mStackTimers)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	claim_alloc(gTraceMemStat, mCounts.capacity() * sizeof(CountAccumulator));
-	claim_alloc(gTraceMemStat, mSamples.capacity() * sizeof(SampleAccumulator));
-	claim_alloc(gTraceMemStat, mEvents.capacity() * sizeof(EventAccumulator));
-	claim_alloc(gTraceMemStat, mStackTimers.capacity() * sizeof(TimeBlockAccumulator));
-	claim_alloc(gTraceMemStat, mMemStats.capacity() * sizeof(MemAccumulator));
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 }
 
 AccumulatorBufferGroup::~AccumulatorBufferGroup()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	disclaim_alloc(gTraceMemStat, mCounts.capacity() * sizeof(CountAccumulator));
-	disclaim_alloc(gTraceMemStat, mSamples.capacity() * sizeof(SampleAccumulator));
-	disclaim_alloc(gTraceMemStat, mEvents.capacity() * sizeof(EventAccumulator));
-	disclaim_alloc(gTraceMemStat, mStackTimers.capacity() * sizeof(TimeBlockAccumulator));
-	disclaim_alloc(gTraceMemStat, mMemStats.capacity() * sizeof(MemAccumulator));
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 }
 
 void AccumulatorBufferGroup::handOffTo(AccumulatorBufferGroup& other)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	other.mCounts.reset(&mCounts);
 	other.mSamples.reset(&mSamples);
 	other.mEvents.reset(&mEvents);
 	other.mStackTimers.reset(&mStackTimers);
-	other.mMemStats.reset(&mMemStats);
 }
 
 void AccumulatorBufferGroup::makeCurrent()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mCounts.makeCurrent();
 	mSamples.makeCurrent();
 	mEvents.makeCurrent();
 	mStackTimers.makeCurrent();
-	mMemStats.makeCurrent();
 
 	ThreadRecorder* thread_recorder = get_thread_recorder();
 	AccumulatorBuffer<TimeBlockAccumulator>& timer_accumulator_buffer = mStackTimers;
@@ -109,12 +88,11 @@ void AccumulatorBufferGroup::makeCurrent()
 //static
 void AccumulatorBufferGroup::clearCurrent()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	AccumulatorBuffer<CountAccumulator>::clearCurrent();	
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	AccumulatorBuffer<CountAccumulator>::clearCurrent();
 	AccumulatorBuffer<SampleAccumulator>::clearCurrent();
 	AccumulatorBuffer<EventAccumulator>::clearCurrent();
 	AccumulatorBuffer<TimeBlockAccumulator>::clearCurrent();
-	AccumulatorBuffer<MemAccumulator>::clearCurrent();
 }
 
 bool AccumulatorBufferGroup::isCurrent() const
@@ -124,44 +102,39 @@ bool AccumulatorBufferGroup::isCurrent() const
 
 void AccumulatorBufferGroup::append( const AccumulatorBufferGroup& other )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mCounts.addSamples(other.mCounts, SEQUENTIAL);
 	mSamples.addSamples(other.mSamples, SEQUENTIAL);
 	mEvents.addSamples(other.mEvents, SEQUENTIAL);
-	mMemStats.addSamples(other.mMemStats, SEQUENTIAL);
 	mStackTimers.addSamples(other.mStackTimers, SEQUENTIAL);
 }
 
 void AccumulatorBufferGroup::merge( const AccumulatorBufferGroup& other)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mCounts.addSamples(other.mCounts, NON_SEQUENTIAL);
 	mSamples.addSamples(other.mSamples, NON_SEQUENTIAL);
 	mEvents.addSamples(other.mEvents, NON_SEQUENTIAL);
-	mMemStats.addSamples(other.mMemStats, NON_SEQUENTIAL);
 	// for now, hold out timers from merge, need to be displayed per thread
 	//mStackTimers.addSamples(other.mStackTimers, NON_SEQUENTIAL);
 }
 
 void AccumulatorBufferGroup::reset(AccumulatorBufferGroup* other)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mCounts.reset(other ? &other->mCounts : NULL);
 	mSamples.reset(other ? &other->mSamples : NULL);
 	mEvents.reset(other ? &other->mEvents : NULL);
 	mStackTimers.reset(other ? &other->mStackTimers : NULL);
-	mMemStats.reset(other ? &other->mMemStats : NULL);
 }
 
 void AccumulatorBufferGroup::sync()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	if (isCurrent())
 	{
 		F64SecondsImplicit time_stamp = LLTimer::getTotalSeconds();
-
 		mSamples.sync(time_stamp);
-		mMemStats.sync(time_stamp);
 	}
 }
 
@@ -197,10 +170,9 @@ F64 SampleAccumulator::mergeSumsOfSquares(const SampleAccumulator& a, const Samp
 	return a.getSumOfSquares();
 }
 
-
 void SampleAccumulator::addSamples( const SampleAccumulator& other, EBufferAppendType append_type )
 {
-    if (append_type == NON_SEQUENTIAL)
+	if (append_type == NON_SEQUENTIAL)
 	{
 		return;
 	}
@@ -299,7 +271,7 @@ void EventAccumulator::addSamples( const EventAccumulator& other, EBufferAppendT
 
 void EventAccumulator::reset( const EventAccumulator* other )
 {
-    mNumSamples = 0;
+	mNumSamples = 0;
 	mSum = 0;
 	mMin = F32(NaN);
 	mMax = F32(NaN);
@@ -308,5 +280,4 @@ void EventAccumulator::reset( const EventAccumulator* other )
 	mLastValue = other ? other->mLastValue : NaN;
 }
 
-
 }
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h
index 7267a44300..b9d577be9e 100644
--- a/indra/llcommon/lltraceaccumulators.h
+++ b/indra/llcommon/lltraceaccumulators.h
@@ -1,26 +1,26 @@
 
-/** 
+/**
  * @file lltraceaccumulators.h
  * @brief Storage for accumulating statistics
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2012, 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$
  */
@@ -28,7 +28,6 @@
 #ifndef LL_LLTRACEACCUMULATORS_H
 #define LL_LLTRACEACCUMULATORS_H
 
-
 #include "stdtypes.h"
 #include "llpreprocessor.h"
 #include "llunits.h"
@@ -66,7 +65,7 @@ namespace LLTrace
 			: mStorageSize(0),
 			mStorage(NULL)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			const AccumulatorBuffer& other = *getDefaultBuffer();
 			resize(sNextStorageSlot);
 			for (S32 i = 0; i < sNextStorageSlot; i++)
@@ -77,7 +76,7 @@ namespace LLTrace
 
 		~AccumulatorBuffer()
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			if (isCurrent())
 			{
 				LLThreadLocalSingletonPointer<ACCUMULATOR>::setInstance(NULL);
@@ -85,14 +84,14 @@ namespace LLTrace
 			delete[] mStorage;
 		}
 
-		LL_FORCE_INLINE ACCUMULATOR& operator[](size_t index) 
-		{ 
-			return mStorage[index]; 
+		LL_FORCE_INLINE ACCUMULATOR& operator[](size_t index)
+		{
+			return mStorage[index];
 		}
 
 		LL_FORCE_INLINE const ACCUMULATOR& operator[](size_t index) const
-		{ 
-			return mStorage[index]; 
+		{
+			return mStorage[index];
 		}
 
 
@@ -100,7 +99,7 @@ namespace LLTrace
 			: mStorageSize(0),
 			mStorage(NULL)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			resize(sNextStorageSlot);
 			for (S32 i = 0; i < sNextStorageSlot; i++)
 			{
@@ -110,7 +109,7 @@ namespace LLTrace
 
 		void addSamples(const AccumulatorBuffer<ACCUMULATOR>& other, EBufferAppendType append_type)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot);
 			for (size_t i = 0; i < sNextStorageSlot; i++)
 			{
@@ -120,7 +119,7 @@ namespace LLTrace
 
 		void copyFrom(const AccumulatorBuffer<ACCUMULATOR>& other)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot);
 			for (size_t i = 0; i < sNextStorageSlot; i++)
 			{
@@ -130,7 +129,7 @@ namespace LLTrace
 
 		void reset(const AccumulatorBuffer<ACCUMULATOR>* other = NULL)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			llassert(mStorageSize >= sNextStorageSlot);
 			for (size_t i = 0; i < sNextStorageSlot; i++)
 			{
@@ -140,7 +139,7 @@ namespace LLTrace
 
 		void sync(F64SecondsImplicit time_stamp)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			llassert(mStorageSize >= sNextStorageSlot);
 			for (size_t i = 0; i < sNextStorageSlot; i++)
 			{
@@ -160,13 +159,13 @@ namespace LLTrace
 
 		static void clearCurrent()
 		{
-            LLThreadLocalSingletonPointer<ACCUMULATOR>::setInstance(NULL);
+			LLThreadLocalSingletonPointer<ACCUMULATOR>::setInstance(NULL);
 		}
 
 		// NOTE: this is not thread-safe.  We assume that slots are reserved in the main thread before any child threads are spawned
 		size_t reserveSlot()
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			size_t next_slot = sNextStorageSlot++;
 			if (next_slot >= mStorageSize)
 			{
@@ -180,7 +179,7 @@ namespace LLTrace
 
 		void resize(size_t new_size)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			if (new_size <= mStorageSize) return;
 
 			ACCUMULATOR* old_storage = mStorage;
@@ -214,14 +213,14 @@ namespace LLTrace
 			return mStorageSize;
 		}
 
-		static size_t getNumIndices() 
+		static size_t getNumIndices()
 		{
 			return sNextStorageSlot;
 		}
 
 		static self_t* getDefaultBuffer()
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			static bool sInitialized = false;
 			if (!sInitialized)
 			{
@@ -336,7 +335,7 @@ namespace LLTrace
 
 		void sample(F64 value)
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			F64SecondsImplicit time_stamp = LLTimer::getTotalSeconds();
 
 			// store effect of last value
@@ -399,7 +398,7 @@ namespace LLTrace
 		F64		mMean,
 				mSumOfSquares;
 
-		F64SecondsImplicit	
+		F64SecondsImplicit
 				mLastSampleTimeStamp,
 				mTotalSamplingTime;
 
@@ -409,7 +408,7 @@ namespace LLTrace
 		S32		mNumSamples;
 		// distinct from mNumSamples, since we might have inherited a last value from
 		// a previous sampling period
-		bool	mHasValue;		
+		bool	mHasValue;
 	};
 
 	class CountAccumulator
@@ -457,14 +456,14 @@ namespace LLTrace
 
 	class alignas(32) TimeBlockAccumulator
 	{
-    public:
+	public:
 		typedef F64Seconds value_t;
 		static F64Seconds getDefaultValue() { return F64Seconds(0); }
 
 		typedef TimeBlockAccumulator self_t;
 
 		// fake classes that allows us to view different facets of underlying statistic
-		struct CallCountFacet 
+		struct CallCountFacet
 		{
 			typedef S32 value_t;
 		};
@@ -515,12 +514,12 @@ namespace LLTrace
 		BlockTimerStatHandle* getParent() { return mParent; }
 
 		BlockTimerStatHandle*					mBlock;
-		BlockTimerStatHandle*					mParent;	
+		BlockTimerStatHandle*					mParent;
 		std::vector<BlockTimerStatHandle*>		mChildren;
 		bool						mCollapsed;
 		bool						mNeedsSorting;
 	};
-	
+
 	struct BlockTimerStackRecord
 	{
 		class BlockTimer*	mActiveTimer;
@@ -528,65 +527,6 @@ namespace LLTrace
 		U64					mChildTime;
 	};
 
-	struct MemAccumulator
-	{
-		typedef F64Bytes value_t;
-		static F64Bytes getDefaultValue() { return F64Bytes(0); }
-
-		typedef MemAccumulator self_t;
-
-		// fake classes that allows us to view different facets of underlying statistic
-		struct AllocationFacet 
-		{
-			typedef F64Bytes value_t;
-			static F64Bytes getDefaultValue() { return F64Bytes(0); }
-		};
-
-		struct DeallocationFacet 
-		{
-			typedef F64Bytes value_t;
-			static F64Bytes getDefaultValue() { return F64Bytes(0); }
-		};
-
-		void addSamples(const MemAccumulator& other, EBufferAppendType append_type)
-		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-			mAllocations.addSamples(other.mAllocations, append_type);
-			mDeallocations.addSamples(other.mDeallocations, append_type);
-
-			if (append_type == SEQUENTIAL)
-			{
-				mSize.addSamples(other.mSize, SEQUENTIAL);
-			}
-			else
-			{
-				F64 allocation_delta(other.mAllocations.getSum() - other.mDeallocations.getSum());
-				mSize.sample(mSize.hasValue() 
-					? mSize.getLastValue() + allocation_delta 
-					: allocation_delta);
-			}
-		}
-
-		void reset(const MemAccumulator* other)
-		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-			mSize.reset(other ? &other->mSize : NULL);
-			mAllocations.reset(other ? &other->mAllocations : NULL);
-			mDeallocations.reset(other ? &other->mDeallocations : NULL);
-		}
-
-		void sync(F64SecondsImplicit time_stamp) 
-		{
-			mSize.sync(time_stamp);
-		}
-
-		bool hasValue() const			 { return mSize.hasValue(); }
-
-		SampleAccumulator	mSize;
-		EventAccumulator	mAllocations;
-		CountAccumulator	mDeallocations;
-	};
-
 	struct AccumulatorBufferGroup : public LLRefCount
 	{
 		AccumulatorBufferGroup();
@@ -607,9 +547,7 @@ namespace LLTrace
 		AccumulatorBuffer<SampleAccumulator>	mSamples;
 		AccumulatorBuffer<EventAccumulator>		mEvents;
 		AccumulatorBuffer<TimeBlockAccumulator> mStackTimers;
-		AccumulatorBuffer<MemAccumulator> 	mMemStats;
 	};
 }
 
 #endif // LL_LLTRACEACCUMULATORS_H
-
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index bb3d667a42..075e7c1d28 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file lltracesampler.cpp
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2012, 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,7 +32,7 @@
 #include "lltracethreadrecorder.h"
 #include "llthread.h"
 
-inline F64 lerp(F64 a, F64 b, F64 u) 
+inline F64 lerp(F64 a, F64 b, F64 u)
 {
 	return a + ((b - a) * u);
 }
@@ -40,34 +40,29 @@ inline F64 lerp(F64 a, F64 b, F64 u)
 namespace LLTrace
 {
 
-extern MemStatHandle gTraceMemStat;
-
 ///////////////////////////////////////////////////////////////////////
 // Recording
 ///////////////////////////////////////////////////////////////////////
 
-Recording::Recording(EPlayState state) 
+Recording::Recording(EPlayState state)
 :	mElapsedSeconds(0),
 	mActiveBuffers(NULL)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	claim_alloc(gTraceMemStat, this);
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mBuffers = new AccumulatorBufferGroup();
-	claim_alloc(gTraceMemStat, mBuffers);
 	setPlayState(state);
 }
 
 Recording::Recording( const Recording& other )
 :	mActiveBuffers(NULL)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	claim_alloc(gTraceMemStat, this);
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	*this = other;
 }
 
 Recording& Recording::operator = (const Recording& other)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	// this will allow us to seamlessly start without affecting any data we've acquired from other
 	setPlayState(PAUSED);
 
@@ -85,14 +80,11 @@ Recording& Recording::operator = (const Recording& other)
 	return *this;
 }
 
-
 Recording::~Recording()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	disclaim_alloc(gTraceMemStat, this);
-	disclaim_alloc(gTraceMemStat, mBuffers);
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 
-	// allow recording destruction without thread recorder running, 
+	// allow recording destruction without thread recorder running,
 	// otherwise thread shutdown could crash if a recording outlives the thread recorder
 	// besides, recording construction and destruction is fine without a recorder...just don't attempt to start one
 	if (isStarted() && LLTrace::get_thread_recorder() != NULL)
@@ -107,14 +99,14 @@ void Recording::update()
 #if LL_TRACE_ENABLED
 	if (isStarted())
 	{
-        LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+		LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 		mElapsedSeconds += mSamplingTimer.getElapsedTimeF64();
 
-		// must have 
-		llassert(mActiveBuffers != NULL 
+		// must have
+		llassert(mActiveBuffers != NULL
 				&& LLTrace::get_thread_recorder() != NULL);
 
-		if(!mActiveBuffers->isCurrent() && LLTrace::get_thread_recorder() != NULL)
+		if (!mActiveBuffers->isCurrent() && LLTrace::get_thread_recorder() != NULL)
 		{
 			AccumulatorBufferGroup* buffers = mBuffers.write();
 			LLTrace::get_thread_recorder()->deactivate(buffers);
@@ -128,7 +120,7 @@ void Recording::update()
 
 void Recording::handleReset()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 #if LL_TRACE_ENABLED
 	mBuffers.write()->reset();
 
@@ -139,7 +131,7 @@ void Recording::handleReset()
 
 void Recording::handleStart()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 #if LL_TRACE_ENABLED
 	mSamplingTimer.reset();
 	mBuffers.setStayUnique(true);
@@ -151,7 +143,7 @@ void Recording::handleStart()
 
 void Recording::handleStop()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 #if LL_TRACE_ENABLED
 	mElapsedSeconds += mSamplingTimer.getElapsedTimeF64();
 	// must have thread recorder running on this thread
@@ -204,7 +196,6 @@ F64Seconds Recording::getSum(const StatType<TimeBlockAccumulator::SelfTimeFacet>
 	return F64Seconds(((F64)(accumulator.mSelfTimeCounter) + (F64)(active_accumulator ? active_accumulator->mSelfTimeCounter : 0)) / (F64)LLTrace::BlockTimer::countsPerSecond());
 }
 
-
 S32 Recording::getSum(const StatType<TimeBlockAccumulator::CallCountFacet>& stat)
 {
 	update();
@@ -219,7 +210,7 @@ F64Seconds Recording::getPerSec(const StatType<TimeBlockAccumulator>& stat)
 	const TimeBlockAccumulator& accumulator = mBuffers->mStackTimers[stat.getIndex()];
 	const TimeBlockAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mStackTimers[stat.getIndex()] : NULL;
 
-	return F64Seconds((F64)(accumulator.mTotalTimeCounter + (active_accumulator ? active_accumulator->mTotalTimeCounter : 0)) 
+	return F64Seconds((F64)(accumulator.mTotalTimeCounter + (active_accumulator ? active_accumulator->mTotalTimeCounter : 0))
 				/ ((F64)LLTrace::BlockTimer::countsPerSecond() * mElapsedSeconds.value()));
 }
 
@@ -241,144 +232,9 @@ F32 Recording::getPerSec(const StatType<TimeBlockAccumulator::CallCountFacet>& s
 	return (F32)(accumulator.mCalls + (active_accumulator ? active_accumulator->mCalls : 0)) / mElapsedSeconds.value();
 }
 
-bool Recording::hasValue(const StatType<MemAccumulator>& stat)
-{
-	update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return accumulator.mSize.hasValue() || (active_accumulator && active_accumulator->mSize.hasValue() ? active_accumulator->mSize.hasValue() : false);
-}
-
-F64Kilobytes Recording::getMin(const StatType<MemAccumulator>& stat)
-{
-	update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return F64Bytes(llmin(accumulator.mSize.getMin(), (active_accumulator && active_accumulator->mSize.hasValue() ? active_accumulator->mSize.getMin() : F32_MAX)));
-}
-
-F64Kilobytes Recording::getMean(const StatType<MemAccumulator>& stat)
-{
-	update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	
-	if (active_accumulator && active_accumulator->mSize.hasValue())
-	{
-        F32 t = 0.0f;
-        S32 div = accumulator.mSize.getSampleCount() + active_accumulator->mSize.getSampleCount();
-        if (div > 0)
-        {
-            t = active_accumulator->mSize.getSampleCount() / div;
-        }
-		return F64Bytes(lerp(accumulator.mSize.getMean(), active_accumulator->mSize.getMean(), t));
-	}
-	else
-	{
-		return F64Bytes(accumulator.mSize.getMean());
-	}
-}
-
-F64Kilobytes Recording::getMax(const StatType<MemAccumulator>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return F64Bytes(llmax(accumulator.mSize.getMax(), active_accumulator && active_accumulator->mSize.hasValue() ? active_accumulator->mSize.getMax() : F32_MIN));
-}
-
-F64Kilobytes Recording::getStandardDeviation(const StatType<MemAccumulator>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	if (active_accumulator && active_accumulator->hasValue())
-	{
-		F64 sum_of_squares = SampleAccumulator::mergeSumsOfSquares(accumulator.mSize, active_accumulator->mSize);
-		return F64Bytes(sqrtf(sum_of_squares / (accumulator.mSize.getSamplingTime().value() + active_accumulator->mSize.getSamplingTime().value())));
-	}
-	else
-	{
-		return F64Bytes(accumulator.mSize.getStandardDeviation());
-	}
-}
-
-F64Kilobytes Recording::getLastValue(const StatType<MemAccumulator>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return F64Bytes(active_accumulator ? active_accumulator->mSize.getLastValue() : accumulator.mSize.getLastValue());
-}
-
-bool Recording::hasValue(const StatType<MemAccumulator::AllocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return accumulator.mAllocations.hasValue() || (active_accumulator ? active_accumulator->mAllocations.hasValue() : false);
-}
-
-F64Kilobytes Recording::getSum(const StatType<MemAccumulator::AllocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return F64Bytes(accumulator.mAllocations.getSum() + (active_accumulator ? active_accumulator->mAllocations.getSum() : 0));
-}
-
-F64Kilobytes Recording::getPerSec(const StatType<MemAccumulator::AllocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return F64Bytes((accumulator.mAllocations.getSum() + (active_accumulator ? active_accumulator->mAllocations.getSum() : 0)) / mElapsedSeconds.value());
-}
-
-S32 Recording::getSampleCount(const StatType<MemAccumulator::AllocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return accumulator.mAllocations.getSampleCount() + (active_accumulator ? active_accumulator->mAllocations.getSampleCount() : 0);
-}
-
-bool Recording::hasValue(const StatType<MemAccumulator::DeallocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return accumulator.mDeallocations.hasValue() || (active_accumulator ? active_accumulator->mDeallocations.hasValue() : false);
-}
-
-
-F64Kilobytes Recording::getSum(const StatType<MemAccumulator::DeallocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return F64Bytes(accumulator.mDeallocations.getSum() + (active_accumulator ? active_accumulator->mDeallocations.getSum() : 0));
-}
-
-F64Kilobytes Recording::getPerSec(const StatType<MemAccumulator::DeallocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return F64Bytes((accumulator.mDeallocations.getSum() + (active_accumulator ? active_accumulator->mDeallocations.getSum() : 0)) / mElapsedSeconds.value());
-}
-
-S32 Recording::getSampleCount(const StatType<MemAccumulator::DeallocationFacet>& stat)
-{
-    update();
-	const MemAccumulator& accumulator = mBuffers->mMemStats[stat.getIndex()];
-	const MemAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mMemStats[stat.getIndex()] : NULL;
-	return accumulator.mDeallocations.getSampleCount() + (active_accumulator ? active_accumulator->mDeallocations.getSampleCount() : 0);
-}
-
 bool Recording::hasValue(const StatType<CountAccumulator>& stat)
 {
-    update();
+	update();
 	const CountAccumulator& accumulator = mBuffers->mCounts[stat.getIndex()];
 	const CountAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mCounts[stat.getIndex()] : NULL;
 	return accumulator.hasValue() || (active_accumulator ? active_accumulator->hasValue() : false);
@@ -386,7 +242,7 @@ bool Recording::hasValue(const StatType<CountAccumulator>& stat)
 
 F64 Recording::getSum(const StatType<CountAccumulator>& stat)
 {
-    update();
+	update();
 	const CountAccumulator& accumulator = mBuffers->mCounts[stat.getIndex()];
 	const CountAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mCounts[stat.getIndex()] : NULL;
 	return accumulator.getSum() + (active_accumulator ? active_accumulator->getSum() : 0);
@@ -394,7 +250,7 @@ F64 Recording::getSum(const StatType<CountAccumulator>& stat)
 
 F64 Recording::getPerSec( const StatType<CountAccumulator>& stat )
 {
-    update();
+	update();
 	const CountAccumulator& accumulator = mBuffers->mCounts[stat.getIndex()];
 	const CountAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mCounts[stat.getIndex()] : NULL;
 	F64 sum = accumulator.getSum() + (active_accumulator ? active_accumulator->getSum() : 0);
@@ -403,7 +259,7 @@ F64 Recording::getPerSec( const StatType<CountAccumulator>& stat )
 
 S32 Recording::getSampleCount( const StatType<CountAccumulator>& stat )
 {
-    update();
+	update();
 	const CountAccumulator& accumulator = mBuffers->mCounts[stat.getIndex()];
 	const CountAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mCounts[stat.getIndex()] : NULL;
 	return accumulator.getSampleCount() + (active_accumulator ? active_accumulator->getSampleCount() : 0);
@@ -411,7 +267,7 @@ S32 Recording::getSampleCount( const StatType<CountAccumulator>& stat )
 
 bool Recording::hasValue(const StatType<SampleAccumulator>& stat)
 {
-    update();
+	update();
 	const SampleAccumulator& accumulator = mBuffers->mSamples[stat.getIndex()];
 	const SampleAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mSamples[stat.getIndex()] : NULL;
 	return accumulator.hasValue() || (active_accumulator && active_accumulator->hasValue());
@@ -419,7 +275,7 @@ bool Recording::hasValue(const StatType<SampleAccumulator>& stat)
 
 F64 Recording::getMin( const StatType<SampleAccumulator>& stat )
 {
-    update();
+	update();
 	const SampleAccumulator& accumulator = mBuffers->mSamples[stat.getIndex()];
 	const SampleAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mSamples[stat.getIndex()] : NULL;
 	return llmin(accumulator.getMin(), active_accumulator && active_accumulator->hasValue() ? active_accumulator->getMin() : F32_MAX);
@@ -427,7 +283,7 @@ F64 Recording::getMin( const StatType<SampleAccumulator>& stat )
 
 F64 Recording::getMax( const StatType<SampleAccumulator>& stat )
 {
-    update();
+	update();
 	const SampleAccumulator& accumulator = mBuffers->mSamples[stat.getIndex()];
 	const SampleAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mSamples[stat.getIndex()] : NULL;
 	return llmax(accumulator.getMax(), active_accumulator && active_accumulator->hasValue() ? active_accumulator->getMax() : F32_MIN);
@@ -435,17 +291,17 @@ F64 Recording::getMax( const StatType<SampleAccumulator>& stat )
 
 F64 Recording::getMean( const StatType<SampleAccumulator>& stat )
 {
-    update();
+	update();
 	const SampleAccumulator& accumulator = mBuffers->mSamples[stat.getIndex()];
 	const SampleAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mSamples[stat.getIndex()] : NULL;
 	if (active_accumulator && active_accumulator->hasValue())
 	{
-        F32 t = 0.0f;
-        S32 div = accumulator.getSampleCount() + active_accumulator->getSampleCount();
-        if (div > 0)
-        {
-            t = active_accumulator->getSampleCount() / div;
-        }
+		F32 t = 0.0f;
+		S32 div = accumulator.getSampleCount() + active_accumulator->getSampleCount();
+		if (div > 0)
+		{
+			t = active_accumulator->getSampleCount() / div;
+		}
 		return lerp(accumulator.getMean(), active_accumulator->getMean(), t);
 	}
 	else
@@ -456,7 +312,7 @@ F64 Recording::getMean( const StatType<SampleAccumulator>& stat )
 
 F64 Recording::getStandardDeviation( const StatType<SampleAccumulator>& stat )
 {
-    update();
+	update();
 	const SampleAccumulator& accumulator = mBuffers->mSamples[stat.getIndex()];
 	const SampleAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mSamples[stat.getIndex()] : NULL;
 
@@ -473,7 +329,7 @@ F64 Recording::getStandardDeviation( const StatType<SampleAccumulator>& stat )
 
 F64 Recording::getLastValue( const StatType<SampleAccumulator>& stat )
 {
-    update();
+	update();
 	const SampleAccumulator& accumulator = mBuffers->mSamples[stat.getIndex()];
 	const SampleAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mSamples[stat.getIndex()] : NULL;
 	return (active_accumulator && active_accumulator->hasValue() ? active_accumulator->getLastValue() : accumulator.getLastValue());
@@ -481,7 +337,7 @@ F64 Recording::getLastValue( const StatType<SampleAccumulator>& stat )
 
 S32 Recording::getSampleCount( const StatType<SampleAccumulator>& stat )
 {
-    update();
+	update();
 	const SampleAccumulator& accumulator = mBuffers->mSamples[stat.getIndex()];
 	const SampleAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mSamples[stat.getIndex()] : NULL;
 	return accumulator.getSampleCount() + (active_accumulator && active_accumulator->hasValue() ? active_accumulator->getSampleCount() : 0);
@@ -489,7 +345,7 @@ S32 Recording::getSampleCount( const StatType<SampleAccumulator>& stat )
 
 bool Recording::hasValue(const StatType<EventAccumulator>& stat)
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 	return accumulator.hasValue() || (active_accumulator && active_accumulator->hasValue());
@@ -497,7 +353,7 @@ bool Recording::hasValue(const StatType<EventAccumulator>& stat)
 
 F64 Recording::getSum( const StatType<EventAccumulator>& stat)
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 	return (F64)(accumulator.getSum() + (active_accumulator && active_accumulator->hasValue() ? active_accumulator->getSum() : 0));
@@ -505,7 +361,7 @@ F64 Recording::getSum( const StatType<EventAccumulator>& stat)
 
 F64 Recording::getMin( const StatType<EventAccumulator>& stat )
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 	return llmin(accumulator.getMin(), active_accumulator && active_accumulator->hasValue() ? active_accumulator->getMin() : F32_MAX);
@@ -513,7 +369,7 @@ F64 Recording::getMin( const StatType<EventAccumulator>& stat )
 
 F64 Recording::getMax( const StatType<EventAccumulator>& stat )
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 	return llmax(accumulator.getMax(), active_accumulator && active_accumulator->hasValue() ? active_accumulator->getMax() : F32_MIN);
@@ -521,17 +377,17 @@ F64 Recording::getMax( const StatType<EventAccumulator>& stat )
 
 F64 Recording::getMean( const StatType<EventAccumulator>& stat )
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 	if (active_accumulator && active_accumulator->hasValue())
 	{
 		F32 t = 0.0f;
-        S32 div = accumulator.getSampleCount() + active_accumulator->getSampleCount();
-        if (div > 0)
-        {
-            t = active_accumulator->getSampleCount() / div;
-        }
+		S32 div = accumulator.getSampleCount() + active_accumulator->getSampleCount();
+		if (div > 0)
+		{
+			t = active_accumulator->getSampleCount() / div;
+		}
 		return lerp(accumulator.getMean(), active_accumulator->getMean(), t);
 	}
 	else
@@ -542,7 +398,7 @@ F64 Recording::getMean( const StatType<EventAccumulator>& stat )
 
 F64 Recording::getStandardDeviation( const StatType<EventAccumulator>& stat )
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 
@@ -559,7 +415,7 @@ F64 Recording::getStandardDeviation( const StatType<EventAccumulator>& stat )
 
 F64 Recording::getLastValue( const StatType<EventAccumulator>& stat )
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 	return active_accumulator ? active_accumulator->getLastValue() : accumulator.getLastValue();
@@ -567,7 +423,7 @@ F64 Recording::getLastValue( const StatType<EventAccumulator>& stat )
 
 S32 Recording::getSampleCount( const StatType<EventAccumulator>& stat )
 {
-    update();
+	update();
 	const EventAccumulator& accumulator = mBuffers->mEvents[stat.getIndex()];
 	const EventAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mEvents[stat.getIndex()] : NULL;
 	return accumulator.getSampleCount() + (active_accumulator ? active_accumulator->getSampleCount() : 0);
@@ -577,7 +433,7 @@ S32 Recording::getSampleCount( const StatType<EventAccumulator>& stat )
 // PeriodicRecording
 ///////////////////////////////////////////////////////////////////////
 
-PeriodicRecording::PeriodicRecording( size_t num_periods, EPlayState state) 
+PeriodicRecording::PeriodicRecording( size_t num_periods, EPlayState state)
 :	mAutoResize(num_periods == 0),
 	mCurPeriod(0),
 	mNumRecordedPeriods(0),
@@ -585,15 +441,13 @@ PeriodicRecording::PeriodicRecording( size_t num_periods, EPlayState state)
 	// code in several methods.
 	mRecordingPeriods(num_periods ? num_periods : 1)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	setPlayState(state);
-	claim_alloc(gTraceMemStat, this);
 }
 
 PeriodicRecording::~PeriodicRecording()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	disclaim_alloc(gTraceMemStat, this);
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 }
 
 void PeriodicRecording::nextPeriod()
@@ -615,12 +469,11 @@ void PeriodicRecording::nextPeriod()
 
 void PeriodicRecording::appendRecording(Recording& recording)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	getCurRecording().appendRecording(recording);
 	nextPeriod();
 }
 
-
 void PeriodicRecording::appendPeriodicRecording( PeriodicRecording& other )
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
@@ -693,16 +546,14 @@ F64Seconds PeriodicRecording::getDuration() const
 	return duration;
 }
 
-
 LLTrace::Recording PeriodicRecording::snapshotCurRecording() const
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	Recording recording_copy(getCurRecording());
 	recording_copy.stop();
 	return recording_copy;
 }
 
-
 Recording& PeriodicRecording::getLastRecording()
 {
 	return getPrevRecording(1);
@@ -737,19 +588,19 @@ const Recording& PeriodicRecording::getPrevRecording( size_t offset ) const
 
 void PeriodicRecording::handleStart()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	getCurRecording().start();
 }
 
 void PeriodicRecording::handleStop()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	getCurRecording().pause();
 }
 
 void PeriodicRecording::handleReset()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	getCurRecording().stop();
 
 	if (mAutoResize)
@@ -771,13 +622,13 @@ void PeriodicRecording::handleReset()
 
 void PeriodicRecording::handleSplitTo(PeriodicRecording& other)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	getCurRecording().splitTo(other.getCurRecording());
 }
 
 F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	bool has_value = false;
@@ -792,14 +643,14 @@ F64 PeriodicRecording::getPeriodMin( const StatType<EventAccumulator>& stat, siz
 		}
 	}
 
-	return has_value 
-			? min_val 
+	return has_value
+			? min_val
 			: NaN;
 }
 
 F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	bool has_value = false;
@@ -814,15 +665,15 @@ F64 PeriodicRecording::getPeriodMax( const StatType<EventAccumulator>& stat, siz
 		}
 	}
 
-	return has_value 
-			? max_val 
+	return has_value
+			? max_val
 			: NaN;
 }
 
 // calculates means using aggregates per period
 F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	F64 mean = 0;
@@ -838,14 +689,14 @@ F64 PeriodicRecording::getPeriodMean( const StatType<EventAccumulator>& stat, si
 		}
 	}
 
-	return valid_period_count 
+	return valid_period_count
 			? mean / (F64)valid_period_count
 			: NaN;
 }
 
 F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	F64 period_mean = getPeriodMean(stat, num_periods);
@@ -870,7 +721,7 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<EventAccumulat
 
 F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	bool has_value = false;
@@ -885,14 +736,14 @@ F64 PeriodicRecording::getPeriodMin( const StatType<SampleAccumulator>& stat, si
 		}
 	}
 
-	return has_value 
-			? min_val 
+	return has_value
+			? min_val
 			: NaN;
 }
 
 F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	bool has_value = false;
@@ -907,15 +758,15 @@ F64 PeriodicRecording::getPeriodMax(const StatType<SampleAccumulator>& stat, siz
 		}
 	}
 
-	return has_value 
-			? max_val 
+	return has_value
+			? max_val
 			: NaN;
 }
 
 
 F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	S32 valid_period_count = 0;
@@ -938,7 +789,7 @@ F64 PeriodicRecording::getPeriodMean( const StatType<SampleAccumulator>& stat, s
 
 F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	std::vector<F64> buf;
@@ -964,7 +815,7 @@ F64 PeriodicRecording::getPeriodMedian( const StatType<SampleAccumulator>& stat,
 
 F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 	F64 period_mean = getPeriodMean(stat, num_periods);
@@ -987,105 +838,13 @@ F64 PeriodicRecording::getPeriodStandardDeviation( const StatType<SampleAccumula
 			: NaN;
 }
 
-
-F64Kilobytes PeriodicRecording::getPeriodMin( const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	num_periods = llmin(num_periods, getNumRecordedPeriods());
-
-	F64Kilobytes min_val(std::numeric_limits<F64>::max());
-	for (size_t i = 1; i <= num_periods; i++)
-	{
-		Recording& recording = getPrevRecording(i);
-		min_val = llmin(min_val, recording.getMin(stat));
-	}
-
-	return min_val;
-}
-
-F64Kilobytes PeriodicRecording::getPeriodMin(const MemStatHandle& stat, size_t num_periods)
-{
-	return getPeriodMin(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
-}
-
-F64Kilobytes PeriodicRecording::getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	num_periods = llmin(num_periods, getNumRecordedPeriods());
-
-	F64Kilobytes max_val(0.0);
-	for (size_t i = 1; i <= num_periods; i++)
-	{
-		Recording& recording = getPrevRecording(i);
-		max_val = llmax(max_val, recording.getMax(stat));
-	}
-
-	return max_val;
-}
-
-F64Kilobytes PeriodicRecording::getPeriodMax(const MemStatHandle& stat, size_t num_periods)
-{
-	return getPeriodMax(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
-}
-
-F64Kilobytes PeriodicRecording::getPeriodMean( const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	num_periods = llmin(num_periods, getNumRecordedPeriods());
-
-	F64Kilobytes mean(0);
-
-	for (size_t i = 1; i <= num_periods; i++)
-	{
-		Recording& recording = getPrevRecording(i);
-		mean += recording.getMean(stat);
-	}
-
-	return mean / F64(num_periods);
-}
-
-F64Kilobytes PeriodicRecording::getPeriodMean(const MemStatHandle& stat, size_t num_periods)
-{
-	return getPeriodMean(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
-}
-
-F64Kilobytes PeriodicRecording::getPeriodStandardDeviation( const StatType<MemAccumulator>& stat, size_t num_periods /*= std::numeric_limits<size_t>::max()*/ )
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-	num_periods = llmin(num_periods, getNumRecordedPeriods());
-
-	F64Kilobytes period_mean = getPeriodMean(stat, num_periods);
-	S32 valid_period_count = 0;
-	F64 sum_of_squares = 0;
-
-	for (size_t i = 1; i <= num_periods; i++)
-	{
-		Recording& recording = getPrevRecording(i);
-		if (recording.hasValue(stat))
-		{
-			F64Kilobytes delta = recording.getMean(stat) - period_mean;
-			sum_of_squares += delta.value() * delta.value();
-			valid_period_count++;
-		}
-	}
-
-	return F64Kilobytes(valid_period_count
-			? sqrt(sum_of_squares / (F64)valid_period_count)
-			: NaN);
-}
-
-F64Kilobytes PeriodicRecording::getPeriodStandardDeviation(const MemStatHandle& stat, size_t num_periods)
-{
-	return getPeriodStandardDeviation(static_cast<const StatType<MemAccumulator>&>(stat), num_periods);
-}
-
 ///////////////////////////////////////////////////////////////////////
 // ExtendableRecording
 ///////////////////////////////////////////////////////////////////////
 
 void ExtendableRecording::extend()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	// push the data back to accepted recording
 	mAcceptedRecording.appendRecording(mPotentialRecording);
 	// flush data, so we can start from scratch
@@ -1094,76 +853,72 @@ void ExtendableRecording::extend()
 
 void ExtendableRecording::handleStart()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mPotentialRecording.start();
 }
 
 void ExtendableRecording::handleStop()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mPotentialRecording.pause();
 }
 
 void ExtendableRecording::handleReset()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mAcceptedRecording.reset();
 	mPotentialRecording.reset();
 }
 
 void ExtendableRecording::handleSplitTo(ExtendableRecording& other)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mPotentialRecording.splitTo(other.mPotentialRecording);
 }
 
-
 ///////////////////////////////////////////////////////////////////////
 // ExtendablePeriodicRecording
 ///////////////////////////////////////////////////////////////////////
 
-
-ExtendablePeriodicRecording::ExtendablePeriodicRecording() 
-:	mAcceptedRecording(0), 
+ExtendablePeriodicRecording::ExtendablePeriodicRecording()
+:	mAcceptedRecording(0),
 	mPotentialRecording(0)
 {}
 
 void ExtendablePeriodicRecording::extend()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	// push the data back to accepted recording
 	mAcceptedRecording.appendPeriodicRecording(mPotentialRecording);
 	// flush data, so we can start from scratch
 	mPotentialRecording.reset();
 }
 
-
 void ExtendablePeriodicRecording::handleStart()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mPotentialRecording.start();
 }
 
 void ExtendablePeriodicRecording::handleStop()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mPotentialRecording.pause();
 }
 
 void ExtendablePeriodicRecording::handleReset()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mAcceptedRecording.reset();
 	mPotentialRecording.reset();
 }
 
 void ExtendablePeriodicRecording::handleSplitTo(ExtendablePeriodicRecording& other)
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	mPotentialRecording.splitTo(other.mPotentialRecording);
 }
 
-
 PeriodicRecording& get_frame_recording()
 {
 	static thread_local PeriodicRecording sRecording(200, PeriodicRecording::STARTED);
@@ -1174,7 +929,7 @@ PeriodicRecording& get_frame_recording()
 
 void LLStopWatchControlsMixinCommon::start()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	switch (mPlayState)
 	{
 	case STOPPED:
@@ -1196,7 +951,7 @@ void LLStopWatchControlsMixinCommon::start()
 
 void LLStopWatchControlsMixinCommon::stop()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	switch (mPlayState)
 	{
 	case STOPPED:
@@ -1216,7 +971,7 @@ void LLStopWatchControlsMixinCommon::stop()
 
 void LLStopWatchControlsMixinCommon::pause()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	switch (mPlayState)
 	{
 	case STOPPED:
@@ -1236,7 +991,7 @@ void LLStopWatchControlsMixinCommon::pause()
 
 void LLStopWatchControlsMixinCommon::unpause()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	switch (mPlayState)
 	{
 	case STOPPED:
@@ -1256,7 +1011,7 @@ void LLStopWatchControlsMixinCommon::unpause()
 
 void LLStopWatchControlsMixinCommon::resume()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	switch (mPlayState)
 	{
 	case STOPPED:
@@ -1277,7 +1032,7 @@ void LLStopWatchControlsMixinCommon::resume()
 
 void LLStopWatchControlsMixinCommon::restart()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	switch (mPlayState)
 	{
 	case STOPPED:
@@ -1301,13 +1056,13 @@ void LLStopWatchControlsMixinCommon::restart()
 
 void LLStopWatchControlsMixinCommon::reset()
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	handleReset();
 }
 
 void LLStopWatchControlsMixinCommon::setPlayState( EPlayState state )
 {
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+	LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 	switch(state)
 	{
 	case STOPPED:
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index a6b1a67d02..61b9096ae2 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltracerecording.h
  * @brief Sampling object for collecting runtime statistics originating from lltrace.
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2012, 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$
  */
@@ -112,7 +112,6 @@ private:
 	// atomically stop this object while starting the other
 	// no data can be missed in between stop and start
 	virtual void handleSplitTo(DERIVED& other) {};
-
 };
 
 namespace LLTrace
@@ -129,8 +128,6 @@ namespace LLTrace
 	template<typename T>
 	class EventStatHandle;
 
-	class MemStatHandle;
-
 	template<typename T>
 	struct RelatedTypes
 	{
@@ -152,7 +149,7 @@ namespace LLTrace
 		typedef S32 sum_t;
 	};
 
-	class Recording 
+	class Recording
 	:	public LLStopWatchControlsMixin<Recording>
 	{
 	public:
@@ -182,24 +179,6 @@ namespace LLTrace
 		F64Seconds getPerSec(const StatType<TimeBlockAccumulator::SelfTimeFacet>& stat);
 		F32 getPerSec(const StatType<TimeBlockAccumulator::CallCountFacet>& stat);
 
-		// Memory accessors
-		bool hasValue(const StatType<MemAccumulator>& stat);
-		F64Kilobytes getMin(const StatType<MemAccumulator>& stat);
-		F64Kilobytes getMean(const StatType<MemAccumulator>& stat);
-		F64Kilobytes getMax(const StatType<MemAccumulator>& stat);
-		F64Kilobytes getStandardDeviation(const StatType<MemAccumulator>& stat);
-		F64Kilobytes getLastValue(const StatType<MemAccumulator>& stat);
-
-		bool hasValue(const StatType<MemAccumulator::AllocationFacet>& stat);
-		F64Kilobytes getSum(const StatType<MemAccumulator::AllocationFacet>& stat);
-		F64Kilobytes getPerSec(const StatType<MemAccumulator::AllocationFacet>& stat);
-		S32 getSampleCount(const StatType<MemAccumulator::AllocationFacet>& stat);
-
-		bool hasValue(const StatType<MemAccumulator::DeallocationFacet>& stat);
-		F64Kilobytes getSum(const StatType<MemAccumulator::DeallocationFacet>& stat);
-		F64Kilobytes getPerSec(const StatType<MemAccumulator::DeallocationFacet>& stat);
-		S32 getSampleCount(const StatType<MemAccumulator::DeallocationFacet>& stat);
-
 		// CountStatHandle accessors
 		bool hasValue(const StatType<CountAccumulator>& stat);
 		F64 getSum(const StatType<CountAccumulator>& stat);
@@ -318,7 +297,7 @@ namespace LLTrace
 		/*virtual*/ void handleSplitTo(Recording& other);
 
 		// returns data for current thread
-		class ThreadRecorder* getThreadRecorder(); 
+		class ThreadRecorder* getThreadRecorder();
 
 		LLTimer											mSamplingTimer;
 		F64Seconds										mElapsedSeconds;
@@ -335,10 +314,10 @@ namespace LLTrace
 		~PeriodicRecording();
 
 		void nextPeriod();
-		auto getNumRecordedPeriods() 
-		{ 
+		auto getNumRecordedPeriods()
+		{
 			// current period counts if not active
-			return mNumRecordedPeriods + (isStarted() ? 0 : 1); 
+			return mNumRecordedPeriods + (isStarted() ? 0 : 1);
 		}
 
 		F64Seconds getDuration() const;
@@ -367,7 +346,7 @@ namespace LLTrace
 			}
 			return num_samples;
 		}
-        
+
 		//
 		// PERIODIC MIN
 		//
@@ -376,7 +355,7 @@ namespace LLTrace
 		template <typename T>
 		typename T::value_t getPeriodMin(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			bool has_value = false;
@@ -391,15 +370,15 @@ namespace LLTrace
 				}
 			}
 
-			return has_value 
-				? min_val 
+			return has_value
+				? min_val
 				: T::getDefaultValue();
 		}
 
 		template<typename T>
 		T getPeriodMin(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMin(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
@@ -407,7 +386,7 @@ namespace LLTrace
 		template<typename T>
 		T getPeriodMin(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMin(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
@@ -415,17 +394,14 @@ namespace LLTrace
 		template<typename T>
 		T getPeriodMin(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMin(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodMin(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-		F64Kilobytes getPeriodMin(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-
 		template <typename T>
 		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMinPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			typename RelatedTypes<typename T::value_t>::fractional_t min_val(std::numeric_limits<F64>::max());
@@ -440,7 +416,7 @@ namespace LLTrace
 		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodMinPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMinPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
@@ -452,7 +428,7 @@ namespace LLTrace
 		template <typename T>
 		typename T::value_t getPeriodMax(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			bool has_value = false;
@@ -467,15 +443,15 @@ namespace LLTrace
 				}
 			}
 
-			return has_value 
-				? max_val 
+			return has_value
+				? max_val
 				: T::getDefaultValue();
 		}
 
 		template<typename T>
 		T getPeriodMax(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMax(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
@@ -483,7 +459,7 @@ namespace LLTrace
 		template<typename T>
 		T getPeriodMax(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMax(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
@@ -491,17 +467,14 @@ namespace LLTrace
 		template<typename T>
 		T getPeriodMax(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return T(getPeriodMax(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodMax(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-		F64Kilobytes getPeriodMax(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-
 		template <typename T>
 		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMaxPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			F64 max_val = std::numeric_limits<F64>::min();
@@ -516,7 +489,7 @@ namespace LLTrace
 		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodMaxPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMaxPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
@@ -528,7 +501,7 @@ namespace LLTrace
 		template <typename T>
 		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMean(const StatType<T >& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			typename RelatedTypes<typename T::value_t>::fractional_t mean(0);
@@ -549,14 +522,14 @@ namespace LLTrace
 		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodMean(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 		F64 getPeriodMean(const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-		template<typename T> 
+		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodMean(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
@@ -564,17 +537,14 @@ namespace LLTrace
 		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodMean(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMean(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodMean(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-		F64Kilobytes getPeriodMean(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-		
 		template <typename T>
 		typename RelatedTypes<typename T::value_t>::fractional_t getPeriodMeanPerSec(const StatType<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			num_periods = llmin(num_periods, getNumRecordedPeriods());
 
 			typename RelatedTypes<typename T::value_t>::fractional_t mean = 0;
@@ -596,7 +566,7 @@ namespace LLTrace
 		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodMeanPerSec(const CountStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodMeanPerSec(static_cast<const StatType<CountAccumulator>&>(stat), num_periods));
 		}
 
@@ -635,10 +605,10 @@ namespace LLTrace
 
 		F64 getPeriodStandardDeviation(const StatType<SampleAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
 
-		template<typename T> 
+		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const SampleStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodStandardDeviation(static_cast<const StatType<SampleAccumulator>&>(stat), num_periods));
 		}
 
@@ -646,13 +616,10 @@ namespace LLTrace
 		template<typename T>
 		typename RelatedTypes<T>::fractional_t getPeriodStandardDeviation(const EventStatHandle<T>& stat, size_t num_periods = std::numeric_limits<size_t>::max())
 		{
-            LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
+			LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
 			return typename RelatedTypes<T>::fractional_t(getPeriodStandardDeviation(static_cast<const StatType<EventAccumulator>&>(stat), num_periods));
 		}
 
-		F64Kilobytes getPeriodStandardDeviation(const StatType<MemAccumulator>& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-		F64Kilobytes getPeriodStandardDeviation(const MemStatHandle& stat, size_t num_periods = std::numeric_limits<size_t>::max());
-
 	private:
 		// implementation for LLStopWatchControlsMixin
 		/*virtual*/ void handleStart();
@@ -731,7 +698,7 @@ namespace LLTrace
 
 		PeriodicRecording& getResults()				{ return mAcceptedRecording; }
 		const PeriodicRecording& getResults() const	{return mAcceptedRecording;}
-		
+
 		void nextPeriod() { mPotentialRecording.nextPeriod(); }
 
 	private:
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index 282c454a2a..914bfb55dc 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -32,7 +32,7 @@
 
 namespace LLTrace
 {
-extern MemStatHandle gTraceMemStat;
+//extern MemStatHandle gTraceMemStat;
 
 static ThreadRecorder* sMasterThreadRecorder = NULL;
 
@@ -81,9 +81,9 @@ void ThreadRecorder::init()
 
 	BlockTimer::getRootTimeBlock().getCurrentAccumulator().mActiveCount = 1;
 
-	claim_alloc(gTraceMemStat, this);
-	claim_alloc(gTraceMemStat, mRootTimer);
-	claim_alloc(gTraceMemStat, sizeof(TimeBlockTreeNode) * mNumTimeBlockTreeNodes);
+	//claim_alloc(gTraceMemStat, this);
+	//claim_alloc(gTraceMemStat, mRootTimer);
+	//claim_alloc(gTraceMemStat, sizeof(TimeBlockTreeNode) * mNumTimeBlockTreeNodes);
 #endif
 }
 
@@ -101,9 +101,9 @@ ThreadRecorder::~ThreadRecorder()
 #if LL_TRACE_ENABLED
 	LLThreadLocalSingletonPointer<BlockTimerStackRecord>::setInstance(NULL);
 
-	disclaim_alloc(gTraceMemStat, this);
-	disclaim_alloc(gTraceMemStat, sizeof(BlockTimer));
-	disclaim_alloc(gTraceMemStat, sizeof(TimeBlockTreeNode) * mNumTimeBlockTreeNodes);
+	//disclaim_alloc(gTraceMemStat, this);
+	//disclaim_alloc(gTraceMemStat, sizeof(BlockTimer));
+	//disclaim_alloc(gTraceMemStat, sizeof(TimeBlockTreeNode) * mNumTimeBlockTreeNodes);
 
 	deactivate(&mThreadRecordingBuffers);
 
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 2449100952..fc3024c0de 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -181,7 +181,7 @@ LLStatBar::LLStatBar(const Params& p)
 	mTargetMinBar(llmin(p.bar_min, p.bar_max)),
 	mTargetMaxBar(llmax(p.bar_max, p.bar_min)),
 	mCurMaxBar(p.bar_max),
-    mCurMinBar(0),
+	mCurMinBar(0),
 	mDecimalDigits(p.decimal_digits),
 	mNumHistoryFrames(p.num_frames),
 	mNumShortHistoryFrames(p.num_frames_short),
@@ -222,9 +222,6 @@ BOOL LLStatBar::handleHover(S32 x, S32 y, MASK mask)
 	case STAT_SAMPLE:
 		LLToolTipMgr::instance().show(LLToolTip::Params().message(mStat.sampleStatp->getDescription()).sticky_rect(calcScreenRect()));
 		break;
-	case STAT_MEM:
-		LLToolTipMgr::instance().show(LLToolTip::Params().message(mStat.memStatp->getDescription()).sticky_rect(calcScreenRect()));
-		break;
 	default:
 		break;
 	}
@@ -373,18 +370,6 @@ void LLStatBar::draw()
 			}
 		}
 		break;
-	case STAT_MEM:
-		{
-			const LLTrace::StatType<LLTrace::MemAccumulator>& mem_stat = *mStat.memStatp;
-
-			unit_label        = mUnitLabel.empty() ? mem_stat.getUnitLabel() : mUnitLabel;
-			current           = last_frame_recording.getLastValue(mem_stat).value();
-			min               = frame_recording.getPeriodMin(mem_stat, num_frames).value();
-			max               = frame_recording.getPeriodMax(mem_stat, num_frames).value();
-			mean              = frame_recording.getPeriodMean(mem_stat, num_frames).value();
-			display_value	  = current;
-		}
-		break;
 	default:
 		break;
 	}
@@ -500,11 +485,6 @@ void LLStatBar::draw()
 							max_value		= recording.getMax(*mStat.sampleStatp);
 							num_samples		= recording.getSampleCount(*mStat.sampleStatp);
 							break;
-						case STAT_MEM:
-							min_value       = recording.getMin(*mStat.memStatp).value();
-							max_value		= recording.getMax(*mStat.memStatp).value();
-							num_samples = 1;
-							break;
 						default:
 							break;
 					}
@@ -583,14 +563,8 @@ void LLStatBar::setStat(const std::string& stat_name)
 		mStat.sampleStatp = sample_stat.get();
 		mStatType = STAT_SAMPLE;
 	}
-	else if (auto mem_stat = StatType<MemAccumulator>::getInstance(stat_name))
-	{
-		mStat.memStatp = mem_stat.get();
-		mStatType = STAT_MEM;
-	}
 }
 
-
 void LLStatBar::setRange(F32 bar_min, F32 bar_max)
 {
 	mTargetMinBar		= llmin(bar_min, bar_max);
diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h
index 6b481ca68f..384d0950a6 100644
--- a/indra/llui/llstatbar.h
+++ b/indra/llui/llstatbar.h
@@ -95,17 +95,15 @@ private:
 		STAT_NONE,
 		STAT_COUNT,
 		STAT_EVENT,
-		STAT_SAMPLE,
-		STAT_MEM
+		STAT_SAMPLE
 	} mStatType;
 
 	union
 	{
-		void*														valid;
+		void*													valid;
 		const LLTrace::StatType<LLTrace::CountAccumulator>*		countStatp;
 		const LLTrace::StatType<LLTrace::EventAccumulator>*		eventStatp;
-		const LLTrace::StatType<LLTrace::SampleAccumulator>*		sampleStatp;
-		const LLTrace::StatType<LLTrace::MemAccumulator>*		memStatp;
+		const LLTrace::StatType<LLTrace::SampleAccumulator>*	sampleStatp;
 	} mStat;
 
 	LLUIString   mLabel;
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 7089df677e..c070510b82 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -657,19 +657,6 @@ void LLSceneMonitor::dumpToFile(const std::string &file_name)
 			}
 		}
 
-		typedef LLTrace::StatType<LLTrace::MemAccumulator> trace_mem;
-		for (auto& it : trace_mem::instance_snapshot())
-		{
-			os << it.getName() << "(KiB)";
-
-			for (S32 frame = 1; frame <= frame_count; frame++)
-			{
-				os << ", " << scene_load_recording.getPrevRecording(frame_count - frame).getMax(it).valueInUnits<LLUnits::Kilobytes>();
-			}
-
-			os << '\n';
-		}
-
 		os.flush();
 		os.close();
 	}
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 0fde6a329a..63402f3856 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -134,55 +134,6 @@
                     label="Bound Mem"
                     stat="glboundmemstat"/>
         </stat_view>
-        <stat_view name="memory"
-                   label="Memory Usage"
-                   setting="OpenDebugStatMemory">
-          <stat_bar name="LLTrace"
-                    label="LLTrace"
-                    stat="LLTrace"/>
-          <stat_bar name="LLView"
-                    label="UI"
-                    stat="LLView"/>
-          <stat_bar name="LLFontFreetype"
-                    label="Fonts"
-                    stat="LLFontFreetype"/>
-          <stat_bar name="LLInventoryObject"
-                    label="Inventory"
-                    stat="LLInventoryObject"/>
-          <stat_bar name="LLViewerObject"
-                    label="Viewer Objects"
-                    stat="LLViewerObject"/>
-          <stat_bar name="LLViewerOctreeGroup"
-                    label="Octree Group Data"
-                    stat="LLViewerOctreeGroup"/>
-          <stat_bar name="LLViewerOctreeEntry"
-                    label="Octree Data"
-                    stat="LLViewerOctreeEntry"/>
-          <stat_bar name="LLVOCacheEntry"
-                    label="Viewer Object Cache"
-                    stat="LLVOCacheEntry"/>
-          <stat_bar name="LLDrawable"
-                    label="Drawables"
-                    stat="LLDrawable"/>
-          <stat_bar name="LLFace"
-                    label="Face Data"
-                    stat="LLFace"/>
-          <stat_bar name="LLDrawInfo"
-                    label="Draw Info"
-                    stat="LLDrawInfo"/>
-          <stat_bar name="LLTexture"
-                    label="Texture Data"
-                    stat="LLTexture"/>
-          <stat_bar name="LLImage"
-                    label="Image Data"
-                    stat="LLImage"/>
-          <stat_bar name="LLImageGL"
-                    label="GL Image Data"
-                    stat="LLImageGL"/>
-          <stat_bar name="LLVertexBuffer"
-                    label="Vertex Buffers"
-                    stat="LLVertexBuffer"/>
-        </stat_view>
         <stat_view name="network"
                    label="Network"
                    setting="OpenDebugStatNet">
-- 
cgit v1.2.3


From 0cc9a2d8fd54ea5ed906597f2f922a85265bdd03 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 25 Aug 2023 19:18:52 +0300
Subject: MacOS gmock build fix

Updated gmock complains about missing regex_t. This is likely a macos
configuration issue and needs to be fixed, but fot now just forcing the
declaration
---
 indra/test/test.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index bb48216b2b..cae9d4f5fd 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -54,6 +54,12 @@
 #endif
 
 #ifndef LL_WINDOWS
+
+typedef struct {
+  void *re_pcre;
+  size_t re_nsub;
+  size_t re_erroffset;
+} regex_t;
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #endif
-- 
cgit v1.2.3


From d9cefb2890b0a0ff74089e65a296f5cdf097996a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 28 Aug 2023 12:22:11 +0300
Subject: SL-20171 use nametag position to draw voice indication dot

---
 indra/newview/llvoavatar.cpp        | 36 +++++++++++-------------------------
 indra/newview/llvoavatar.h          |  5 +++--
 indra/newview/llvoicevisualizer.cpp |  3 ++-
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 250366dbea..2bb032ed1a 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2568,7 +2568,7 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time)
 	{
         if (!mIsControlAvatar)
         {
-            idleUpdateNameTag( mLastRootPos );
+            idleUpdateNameTag(idleCalcNameTagPosition(mLastRootPos));
         }
         return;
 	}
@@ -2652,7 +2652,9 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time)
 	bool voice_enabled = (visualizers_in_calls || LLVoiceClient::getInstance()->inProximalChannel()) &&
 						 LLVoiceClient::getInstance()->getVoiceEnabled(mID);
 
-	idleUpdateVoiceVisualizer( voice_enabled );
+    LLVector3 hud_name_pos = idleCalcNameTagPosition(mLastRootPos);
+
+	idleUpdateVoiceVisualizer(voice_enabled, hud_name_pos);
 	idleUpdateMisc( detailed_update );
 	idleUpdateAppearanceAnimation();
 	if (detailed_update)
@@ -2663,7 +2665,7 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time)
 		idleUpdateWindEffect();
 	}
 		
-	idleUpdateNameTag( mLastRootPos );
+	idleUpdateNameTag(hud_name_pos);
 
     // Complexity has stale mechanics, but updates still can be very rapid
     // so spread avatar complexity calculations over frames to lesen load from
@@ -2699,7 +2701,7 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time)
     idleUpdateDebugInfo();
 }
 
-void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled)
+void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled, const LLVector3 &position)
 {
 	bool render_visualizer = voice_enabled;
 	
@@ -2788,24 +2790,7 @@ void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled)
 				}
 			}
 		}
-		
-		//--------------------------------------------------------------------------------------------
-		// here we get the approximate head position and set as sound source for the voice symbol
-		// (the following version uses a tweak of "mHeadOffset" which handle sitting vs. standing)
-		//--------------------------------------------------------------------------------------------
-		
-		if ( isSitting() )
-		{
-			LLVector3 headOffset = LLVector3( 0.0f, 0.0f, mHeadOffset.mV[2] );
-			mVoiceVisualizer->setVoiceSourceWorldPosition( mRoot->getWorldPosition() + headOffset );
-		}
-		else 
-		{
-			LLVector3 tagPos = mRoot->getWorldPosition();
-			tagPos[VZ] -= mPelvisToFoot;
-			tagPos[VZ] += ( mBodySize[VZ] + 0.125f ); // does not need mAvatarOffset -Nyx
-			mVoiceVisualizer->setVoiceSourceWorldPosition( tagPos );
-		}
+        mVoiceVisualizer->setPositionAgent(position);
 	}//if ( voiceEnabled )
 }		
 
@@ -3321,7 +3306,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 		new_name = TRUE;
     }
 				
-	idleUpdateNameTagPosition(root_pos_last);
+    mNameText->setPositionAgent(root_pos_last);
+
 	idleUpdateNameTagText(new_name);			
 	idleUpdateNameTagAlpha(new_name, alpha);
 }
@@ -3598,7 +3584,7 @@ void LLVOAvatar::invalidateNameTags()
 }
 
 // Compute name tag position during idle update
-void LLVOAvatar::idleUpdateNameTagPosition(const LLVector3& root_pos_last)
+LLVector3 LLVOAvatar::idleCalcNameTagPosition(const LLVector3 &root_pos_last)
 {
 	LLQuaternion root_rot = mRoot->getWorldRotation();
 	LLQuaternion inv_root_rot = ~root_rot;
@@ -3652,7 +3638,7 @@ void LLVOAvatar::idleUpdateNameTagPosition(const LLVector3& root_pos_last)
 		}
 	}
 
-	mNameText->setPositionAgent(name_position);				
+	return name_position;
 }
 
 void LLVOAvatar::idleUpdateNameTagAlpha(bool new_name, F32 alpha)
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 970ca523a5..b3f4b8e41e 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -275,7 +275,7 @@ public:
     void			updateTimeStep();
     void			updateRootPositionAndRotation(LLAgent &agent, F32 speed, bool was_sit_ground_constrained);
     
-	void 			idleUpdateVoiceVisualizer(bool voice_enabled);
+	void            idleUpdateVoiceVisualizer(bool voice_enabled, const LLVector3 &position);
 	void 			idleUpdateMisc(bool detailed_update);
 	virtual void	idleUpdateAppearanceAnimation();
 	void 			idleUpdateLipSync(bool voice_enabled);
@@ -283,7 +283,6 @@ public:
 	void 			idleUpdateWindEffect();
 	void 			idleUpdateNameTag(const LLVector3& root_pos_last);
 	void			idleUpdateNameTagText(bool new_name);
-	void			idleUpdateNameTagPosition(const LLVector3& root_pos_last);
 	void			idleUpdateNameTagAlpha(bool new_name, F32 alpha);
 	LLColor4		getNameTagColor(bool is_friend);
 	void			clearNameTag();
@@ -317,6 +316,8 @@ public:
 
 	static void updateNearbyAvatarCount();
 
+    LLVector3 idleCalcNameTagPosition(const LLVector3 &root_pos_last);
+
 	//--------------------------------------------------------------------
 	// Static preferences (controlled by user settings/menus)
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp
index 6e08a2ff12..4a140524e6 100644
--- a/indra/newview/llvoicevisualizer.cpp
+++ b/indra/newview/llvoicevisualizer.cpp
@@ -40,6 +40,7 @@
 #include "llviewertexturelist.h"
 #include "llvoiceclient.h"
 #include "llrender.h"
+#include "llagent.h"
 
 //brent's wave image
 //29de489d-0491-fb00-7dab-f9e686d31e83
@@ -349,7 +350,7 @@ void LLVoiceVisualizer::render()
 		//---------------------------------------------------------------
 		// set the sound symbol position over the source (avatar's head)
 		//---------------------------------------------------------------
-		mSoundSymbol.mPosition = mVoiceSourceWorldPosition + WORLD_UPWARD_DIRECTION * HEIGHT_ABOVE_HEAD;
+        mSoundSymbol.mPosition = gAgent.getPosAgentFromGlobal(mPositionGlobal) + WORLD_UPWARD_DIRECTION * HEIGHT_ABOVE_HEAD;
 	
 		//---------------------------------------------------------------
 		// some gl state
-- 
cgit v1.2.3


From 031032fb892560a0f5fa1a996aea77f593f54704 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 29 Aug 2023 13:12:09 +0200
Subject: SL-20211 EmojiPicker - The search field should be the same as other
 floaters

---
 indra/llui/llsearcheditor.cpp                               |  4 ++++
 indra/newview/llfloateremojipicker.cpp                      | 10 +++++-----
 indra/newview/llfloateremojipicker.h                        |  4 ++--
 indra/newview/skins/default/xui/en/floater_emoji_picker.xml |  9 ++-------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index bafeef41fb..cfaf08ec0a 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -178,6 +178,10 @@ void LLSearchEditor::setFocus( BOOL b )
 void LLSearchEditor::onClearButtonClick(const LLSD& data)
 {
 	setText(LLStringUtil::null);
+	if (mTextChangedCallback)
+	{
+		mTextChangedCallback(this, getValue());
+	}
 	mSearchEditor->onCommit(); // force keystroke callback
 }
 
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index c3344fc18a..af807ba7cf 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -31,9 +31,9 @@
 #include "llbutton.h"
 #include "llcombobox.h"
 #include "llemojidictionary.h"
+#include "llfiltereditor.h"
 #include "llfloaterreg.h"
 #include "llkeyboard.h"
-#include "lllineeditor.h"
 #include "llscrollcontainer.h"
 #include "llscrollingpanellist.h"
 #include "llscrolllistctrl.h"
@@ -294,9 +294,9 @@ BOOL LLFloaterEmojiPicker::postBuild()
     mGroups = getChild<LLPanel>("Groups");
     mBadge = getChild<LLPanel>("Badge");
 
-    mFilter = getChild<LLLineEditor>("Filter");
-    mFilter->setKeystrokeCallback([this](LLLineEditor*, void*) { onSearchKeystroke(); }, NULL);
-    mFilter->setFont(LLViewerChat::getChatFont());
+    mFilter = getChild<LLFilterEditor>("Filter");
+    mFilter->setKeystrokeCallback([this](LLUICtrl*, const LLSD&) { onFilterChanged(); });
+    mFilter->setTextChangedCallback([this](LLUICtrl*, const LLSD&) { onFilterChanged(); });
     mFilter->setText(sFilterPattern);
 
     mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
@@ -588,7 +588,7 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
     }
 }
 
-void LLFloaterEmojiPicker::onSearchKeystroke()
+void LLFloaterEmojiPicker::onFilterChanged()
 {
     sFilterPattern = mFilter->getText();
     fillEmojis();
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index e4b1216ce6..3cae818e15 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -60,7 +60,7 @@ private:
     void fillEmojis(bool fromResize = false);
 
     void onGroupButtonClick(LLUICtrl* ctrl);
-    void onSearchKeystroke();
+    void onFilterChanged();
     void onGridMouseEnter();
     void onGridMouseLeave();
     void onGroupButtonMouseEnter(LLUICtrl* ctrl);
@@ -81,7 +81,7 @@ private:
 
     class LLPanel* mGroups { nullptr };
     class LLPanel* mBadge { nullptr };
-    class LLLineEditor* mFilter { nullptr };
+    class LLFilterEditor* mFilter { nullptr };
     class LLScrollContainer* mEmojiScroll { nullptr };
     class LLScrollingPanelList* mEmojiGrid { nullptr };
     class LLEmojiPreviewPanel* mPreview { nullptr };
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index a2a290c306..6c440de573 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -12,19 +12,14 @@
     width="250">
   <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
-  <line_editor
+  <filter_editor
       name="Filter"
       label="Start typing to filter"
       layout="bottomleft"
       follows="bottom|left|right"
-      text_tentative_color="TextFgTentativeColor"
-      show_label_focused="true"
-      max_length_bytes="63"
-      text_pad_right="5"
-      text_pad_left="5"
       bottom="14"
       left="10"
-      height="29"
+      height="23"
       width="230" />
   <scroll_container
       name="EmojiGridContainer"
-- 
cgit v1.2.3


From 1e5ac99fd840b7d85d06fd08b27f2c2cb6201b9c Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 29 Aug 2023 14:23:48 +0200
Subject: SL-20209 Open read access to the recently used emojis

---
 indra/newview/llfloateremojipicker.cpp | 10 ++++++++++
 indra/newview/llfloateremojipicker.h   |  9 +++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index af807ba7cf..95ea9fc478 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -723,6 +723,14 @@ void LLFloaterEmojiPicker::closeFloater(bool app_quitting)
     }
 }
 
+// static
+std::list<llwchar>& LLFloaterEmojiPicker::getRecentlyUsed()
+{
+    loadState();
+    return sRecentlyUsed;
+}
+
+// static
 void LLFloaterEmojiPicker::onEmojiUsed(llwchar emoji)
 {
     // Update sRecentlyUsed
@@ -762,6 +770,7 @@ void LLFloaterEmojiPicker::onEmojiUsed(llwchar emoji)
         sFrequentlyUsed.push_back(std::make_pair(emoji, 1));
 }
 
+// static
 void LLFloaterEmojiPicker::loadState()
 {
     if (!sStateFileName.empty())
@@ -844,6 +853,7 @@ void LLFloaterEmojiPicker::loadState()
     }
 }
 
+// static
 void LLFloaterEmojiPicker::saveState()
 {
     if (sStateFileName.empty())
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 3cae818e15..decee41721 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -54,6 +54,11 @@ public:
 
     virtual void closeFloater(bool app_quitting = false) override;
 
+    static std::list<llwchar>& getRecentlyUsed();
+    static void onEmojiUsed(llwchar emoji);
+    static void loadState();
+    static void saveState();
+
 private:
     void fillGroups();
     void moveGroups();
@@ -75,10 +80,6 @@ private:
 
     virtual BOOL handleKeyHere(KEY key, MASK mask) override;
 
-    void onEmojiUsed(llwchar emoji);
-    void loadState();
-    void saveState();
-
     class LLPanel* mGroups { nullptr };
     class LLPanel* mBadge { nullptr };
     class LLFilterEditor* mFilter { nullptr };
-- 
cgit v1.2.3


From b9de65d2750c0f5632116864af792c40078830ab Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 29 Aug 2023 15:07:41 +0200
Subject: SL-20209 Add 'noscroll' parameter to LLPanelEmojiComplete::Params

---
 indra/newview/llpanelemojicomplete.cpp | 25 ++++++++++++++++++++++---
 indra/newview/llpanelemojicomplete.h   | 17 ++++++++++++-----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 8b89e3aa14..8fc84c0387 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -41,6 +41,7 @@ static LLDefaultChildRegistry::Register<LLPanelEmojiComplete> r("emoji_complete"
 
 LLPanelEmojiComplete::Params::Params()
 	: autosize("autosize")
+	, noscroll("noscroll")
 	, max_emoji("max_emoji")
 	, padding("padding")
 	, selected_image("selected_image")
@@ -50,6 +51,7 @@ LLPanelEmojiComplete::Params::Params()
 LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p)
 	: LLUICtrl(p)
 	, mAutoSize(p.autosize)
+	, mNoScroll(p.noscroll)
 	, mMaxVisible(p.max_emoji)
 	, mPadding(p.padding)
 	, mSelectedImage(p.selected_image)
@@ -152,7 +154,7 @@ BOOL LLPanelEmojiComplete::handleMouseUp(S32 x, S32 y, MASK mask)
 
 void LLPanelEmojiComplete::onCommit()
 {
-	if (npos != mCurSelected)
+	if (mCurSelected < mEmojis.size())
 	{
 		LLWString wstr;
 		wstr.push_back(mEmojis.at(mCurSelected));
@@ -167,6 +169,14 @@ void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_paren
 	updateConstraints();
 }
 
+void LLPanelEmojiComplete::setEmojis(const LLWString& emojis)
+{
+	mEmojis = emojis;
+	mCurSelected = 0;
+
+	onEmojisChanged();
+}
+
 void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 {
 	llwchar curEmoji = (mCurSelected < mEmojis.size()) ? mEmojis.at(mCurSelected) : 0;
@@ -175,6 +185,11 @@ void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 	size_t curEmojiIdx = (curEmoji) ? mEmojis.find(curEmoji) : std::string::npos;
 	mCurSelected = (std::string::npos != curEmojiIdx) ? curEmojiIdx : 0;
 
+	onEmojisChanged();
+}
+
+void LLPanelEmojiComplete::onEmojisChanged()
+{
 	if (mAutoSize)
 	{
 		mVisibleEmojis = std::min(mEmojis.size(), mMaxVisible);
@@ -233,9 +248,13 @@ void LLPanelEmojiComplete::updateConstraints()
 void LLPanelEmojiComplete::updateScrollPos()
 {
 	const size_t cntEmoji = mEmojis.size();
-	if (0 == cntEmoji || cntEmoji < mVisibleEmojis || 0 == mCurSelected)
+	if (mNoScroll || 0 == cntEmoji || cntEmoji < mVisibleEmojis || 0 == mCurSelected)
 	{
 		mScrollPos = 0;
+		if (mCurSelected >= mVisibleEmojis)
+		{
+			mCurSelected = mVisibleEmojis ? mVisibleEmojis - 1 : 0;
+		}
 	}
 	else if (cntEmoji - 1 == mCurSelected)
 	{
@@ -273,11 +292,11 @@ BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_pare
 				handled = true;
 				break;
 		}
-
 	}
 
 	if (handled)
 		return TRUE;
+
 	return LLFloater::handleKey(key, mask, called_from_parent);
 }
 
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index aa0f806525..3456de4044 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -40,6 +40,7 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
 		Optional<bool>       autosize;
+		Optional<bool>       noscroll;
 		Optional<S32>        max_emoji,
 		                     padding;
 
@@ -50,6 +51,7 @@ public:
 
 protected:
 	LLPanelEmojiComplete(const LLPanelEmojiComplete::Params&);
+
 public:
 	virtual ~LLPanelEmojiComplete();
 
@@ -62,9 +64,13 @@ public:
 	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 public:
+	const LLWString& getEmojis() const { return mEmojis; }
 	size_t getEmojiCount() const { return mEmojis.size(); }
-	void   setEmojiHint(const std::string& hint);
+	void setEmojis(const LLWString& emojis);
+	void setEmojiHint(const std::string& hint);
+
 protected:
+	void LLPanelEmojiComplete::onEmojisChanged();
 	size_t posToIndex(S32 x, S32 y) const;
 	void select(size_t emoji_idx);
 	void selectNext();
@@ -76,13 +82,14 @@ protected:
 protected:
 	static constexpr auto npos = std::numeric_limits<size_t>::max();
 
-	bool            mAutoSize = false;
+	const bool      mAutoSize = false;
+	const bool      mNoScroll = false;
 	const LLFontGL* mFont;
 	U16             mEmojiWidth = 0;
-	size_t          mMaxVisible = 0;
-	S32             mPadding = 8;
+	const size_t    mMaxVisible = 0;
+	const S32       mPadding = 8;
 	LLRect          mRenderRect;
-	LLUIImagePtr	mSelectedImage;
+	const LLUIImagePtr mSelectedImage;
 
 	LLWString       mEmojis;
 	size_t          mVisibleEmojis = 0;
-- 
cgit v1.2.3


From dbc4f20aba7fb308a0f9a7e80387a0560c21a4b8 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 30 Aug 2023 00:31:33 +0300
Subject: SL-20222 update information page link

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 810d3fddd5..6a6546ff0a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -487,7 +487,7 @@
      name="Help with avatars">
         <menu_item_call.on_click
             function="Advanced.ShowURL"
-            parameter="https://community.secondlife.com/search/?type=cms_records3&amp;tags=avatar&amp;nodes=30&amp;search_and_or=or"/>
+            parameter="https://community.secondlife.com/knowledgebase/english/controlling-your-avatars-appearance-r216/"/>
       </menu_item_call>
     </menu>
     <menu
-- 
cgit v1.2.3


From f18746a1753fc8d5338fcaeb839540a071c68b13 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 29 Aug 2023 15:31:03 +0200
Subject: SL-20209 EmojiPicker - Show 'Recent' panel instead of the floater on
 click the button

---
 indra/newview/llfloaterimsessiontab.cpp            | 299 +++++++++++++--------
 indra/newview/llfloaterimsessiontab.h              |  44 +--
 .../skins/default/xui/en/floater_im_session.xml    |  41 ++-
 3 files changed, 251 insertions(+), 133 deletions(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index bacfd8ca33..61722a823f 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -33,7 +33,6 @@
 #include "llagentcamera.h"
 #include "llavataractions.h"
 #include "llavatariconctrl.h"
-#include "llgroupiconctrl.h"
 #include "llchatentry.h"
 #include "llchathistory.h"
 #include "llchiclet.h"
@@ -43,9 +42,11 @@
 #include "llfloateremojipicker.h"
 #include "llfloaterimsession.h"
 #include "llfloaterimcontainer.h" // to replace separate IM Floaters with multifloater container
+#include "llfloaterimnearbychat.h"
+#include "llgroupiconctrl.h"
 #include "lllayoutstack.h"
+#include "llpanelemojicomplete.h"
 #include "lltoolbarview.h"
-#include "llfloaterimnearbychat.h"
 
 const F32 REFRESH_INTERVAL = 1.0f;
 const std::string ICN_GROUP("group_chat_icon");
@@ -57,7 +58,7 @@ void cb_group_do_nothing()
 }
 
 LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
-:	LLTransientDockableFloater(NULL, false, session_id),
+:	super(NULL, false, session_id),
 	mIsP2PChat(false),
 	mExpandCollapseBtn(NULL),
 	mTearOffBtn(NULL),
@@ -76,7 +77,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
 	mInputPanels(NULL),
 	mChatLayoutPanelHeight(0)
 {
-    setAutoFocus(FALSE);
+	setAutoFocus(FALSE);
 	mSession = LLIMModel::getInstance()->findIMSession(mSessionID);
 
 	mCommitCallbackRegistrar.add("IMSession.Menu.Action",
@@ -89,12 +90,12 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
 			boost::bind(&LLFloaterIMSessionTab::onIMShowModesMenuItemEnable,  this, _2));
 
 	// Right click menu handling
-    mEnableCallbackRegistrar.add("Avatar.CheckItem",  boost::bind(&LLFloaterIMSessionTab::checkContextMenuItem,	this, _2));
-    mEnableCallbackRegistrar.add("Avatar.EnableItem", boost::bind(&LLFloaterIMSessionTab::enableContextMenuItem, this, _2));
-    mCommitCallbackRegistrar.add("Avatar.DoToSelected", boost::bind(&LLFloaterIMSessionTab::doToSelected, this, _2));
-    mCommitCallbackRegistrar.add("Group.DoToSelected", boost::bind(&cb_group_do_nothing));
+	mEnableCallbackRegistrar.add("Avatar.CheckItem",  boost::bind(&LLFloaterIMSessionTab::checkContextMenuItem,	this, _2));
+	mEnableCallbackRegistrar.add("Avatar.EnableItem", boost::bind(&LLFloaterIMSessionTab::enableContextMenuItem, this, _2));
+	mCommitCallbackRegistrar.add("Avatar.DoToSelected", boost::bind(&LLFloaterIMSessionTab::doToSelected, this, _2));
+	mCommitCallbackRegistrar.add("Group.DoToSelected", boost::bind(&cb_group_do_nothing));
 
-    mMinFloaterHeight = getMinHeight();
+	mMinFloaterHeight = getMinHeight();
 }
 
 LLFloaterIMSessionTab::~LLFloaterIMSessionTab()
@@ -102,7 +103,7 @@ LLFloaterIMSessionTab::~LLFloaterIMSessionTab()
 	delete mRefreshTimer;
 }
 
-//static
+// static
 LLFloaterIMSessionTab* LLFloaterIMSessionTab::findConversation(const LLUUID& uuid)
 {
 	LLFloaterIMSessionTab* conv;
@@ -119,7 +120,7 @@ LLFloaterIMSessionTab* LLFloaterIMSessionTab::findConversation(const LLUUID& uui
 	return conv;
 };
 
-//static
+// static
 LLFloaterIMSessionTab* LLFloaterIMSessionTab::getConversation(const LLUUID& uuid)
 {
 	LLFloaterIMSessionTab* conv;
@@ -135,14 +136,16 @@ LLFloaterIMSessionTab* LLFloaterIMSessionTab::getConversation(const LLUUID& uuid
 	}
 
 	return conv;
+
 };
 
+// virtual
 void LLFloaterIMSessionTab::setVisible(BOOL visible)
 {
-	if(visible && !mHasVisibleBeenInitialized)
+	if (visible && !mHasVisibleBeenInitialized)
 	{
 		mHasVisibleBeenInitialized = true;
-		if(!gAgentCamera.cameraMouselook())
+		if (!gAgentCamera.cameraMouselook())
 		{
 			LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container")->setVisible(true);
 		}
@@ -156,27 +159,26 @@ void LLFloaterIMSessionTab::setVisible(BOOL visible)
 		mInputButtonPanel->setVisible(isTornOff());
 	}
 
-	LLTransientDockableFloater::setVisible(visible);
+	super::setVisible(visible);
 }
 
-/*virtual*/
+// virtual
 void LLFloaterIMSessionTab::setFocus(BOOL focus)
 {
-	LLTransientDockableFloater::setFocus(focus);
+	super::setFocus(focus);
 
-    //Redirect focus to input editor
-    if (focus)
+	// Redirect focus to input editor
+	if (focus)
 	{
-    	updateMessages();
+		updateMessages();
 
-        if (mInputEditor)
-        {
-    	    mInputEditor->setFocus(TRUE);
-        }
+		if (mInputEditor)
+		{
+			mInputEditor->setFocus(TRUE);
+		}
 	}
 }
 
-
 void LLFloaterIMSessionTab::addToHost(const LLUUID& session_id)
 {
 	if ((session_id.notNull() && !gIMMgr->hasSession(session_id))
@@ -221,44 +223,58 @@ void LLFloaterIMSessionTab::assignResizeLimits()
 {
 	bool is_participants_pane_collapsed = mParticipantListPanel->isCollapsed();
 
-    // disable a layoutstack's functionality when participant list panel is collapsed
+	// disable a layoutstack's functionality when participant list panel is collapsed
 	mRightPartPanel->setIgnoreReshape(is_participants_pane_collapsed);
 
-    S32 participants_pane_target_width = is_participants_pane_collapsed?
-    		0 : (mParticipantListPanel->getRect().getWidth() + mParticipantListAndHistoryStack->getPanelSpacing());
+	S32 participants_pane_target_width = is_participants_pane_collapsed?
+			0 : (mParticipantListPanel->getRect().getWidth() + mParticipantListAndHistoryStack->getPanelSpacing());
 
-    S32 new_min_width = participants_pane_target_width + mRightPartPanel->getExpandedMinDim() + mFloaterExtraWidth;
+	S32 new_min_width = participants_pane_target_width + mRightPartPanel->getExpandedMinDim() + mFloaterExtraWidth;
 
 	setResizeLimits(new_min_width, getMinHeight());
 
 	this->mParticipantListAndHistoryStack->updateLayout();
 }
 
+// virtual
 BOOL LLFloaterIMSessionTab::postBuild()
 {
 	BOOL result;
 
 	mBodyStack = getChild<LLLayoutStack>("main_stack");
-    mParticipantListAndHistoryStack = getChild<LLLayoutStack>("im_panels");
+	mParticipantListAndHistoryStack = getChild<LLLayoutStack>("im_panels");
 
 	mCloseBtn = getChild<LLButton>("close_btn");
-	mCloseBtn->setCommitCallback(boost::bind(&LLFloater::onClickClose, this));
+	mCloseBtn->setCommitCallback([this](LLUICtrl*, const LLSD&) { onClickClose(this); });
 
 	mExpandCollapseBtn = getChild<LLButton>("expand_collapse_btn");
-	mExpandCollapseBtn->setClickedCallback(boost::bind(&LLFloaterIMSessionTab::onSlide, this));
+	mExpandCollapseBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onSlide(this); });
 
 	mExpandCollapseLineBtn = getChild<LLButton>("minz_btn");
-	mExpandCollapseLineBtn->setClickedCallback(boost::bind(&LLFloaterIMSessionTab::onCollapseToLine, this));
+	mExpandCollapseLineBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onCollapseToLine(this); });
 
 	mTearOffBtn = getChild<LLButton>("tear_off_btn");
 	mTearOffBtn->setCommitCallback(boost::bind(&LLFloaterIMSessionTab::onTearOffClicked, this));
 
-	mEmojiBtn = getChild<LLButton>("emoji_panel_btn");
-	mEmojiBtn->setLabel(LLUIString(LLWString(1, 128512)));
-	mEmojiBtn->setClickedCallback(boost::bind(&LLFloaterIMSessionTab::onEmojiPanelBtnClicked, this));
+	mEmojiRecentPanelToggleBtn = getChild<LLButton>("emoji_recent_panel_toggle_btn");
+	mEmojiRecentPanelToggleBtn->setLabel(LLUIString(LLWString(1, 128512)));
+	mEmojiRecentPanelToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiRecentPanelToggleBtnClicked(this); });
+
+	mEmojiRecentPanel = getChild<LLLayoutPanel>("emoji_recent_layout_panel");
+	mEmojiRecentPanel->setVisible(false);
+
+	mEmojiRecentEmptyText = getChildView("emoji_recent_empty_text");
+	mEmojiRecentEmptyText->setVisible(false);
+
+	mEmojiRecentIconsCtrl = getChild<LLPanelEmojiComplete>("emoji_recent_icons_ctrl");
+	mEmojiRecentIconsCtrl->setCommitCallback([this](LLUICtrl*, const LLSD& value) { onRecentEmojiPicked(value); });
+	mEmojiRecentIconsCtrl->setVisible(false);
+
+	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
+	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(this); });
 
 	mGearBtn = getChild<LLButton>("gear_btn");
-    mAddBtn = getChild<LLButton>("add_btn");
+	mAddBtn = getChild<LLButton>("add_btn");
 	mVoiceButton = getChild<LLButton>("voice_call_btn");
 
 	mParticipantListPanel = getChild<LLLayoutPanel>("speakers_list_panel");
@@ -312,17 +328,17 @@ BOOL LLFloaterIMSessionTab::postBuild()
 
 	// Create the root using an ad-hoc base item
 	LLConversationItem* base_item = new LLConversationItem(mSessionID, mConversationViewModel);
-    LLFolderView::Params p(LLUICtrlFactory::getDefaultParams<LLFolderView>());
-    p.rect = LLRect(0, 0, getRect().getWidth(), 0);
-    p.parent_panel = mParticipantListPanel;
-    p.listener = base_item;
-    p.view_model = &mConversationViewModel;
-    p.root = NULL;
-    p.use_ellipses = true;
-    p.options_menu = "menu_conversation.xml";
-    p.name = "root";
+	LLFolderView::Params p(LLUICtrlFactory::getDefaultParams<LLFolderView>());
+	p.rect = LLRect(0, 0, getRect().getWidth(), 0);
+	p.parent_panel = mParticipantListPanel;
+	p.listener = base_item;
+	p.view_model = &mConversationViewModel;
+	p.root = NULL;
+	p.use_ellipses = true;
+	p.options_menu = "menu_conversation.xml";
+	p.name = "root";
 	mConversationsRoot = LLUICtrlFactory::create<LLFolderView>(p);
-    mConversationsRoot->setCallbackRegistrar(&mCommitCallbackRegistrar);
+	mConversationsRoot->setCallbackRegistrar(&mCommitCallbackRegistrar);
 	mConversationsRoot->setEnableRegistrar(&mEnableCallbackRegistrar);
 	// Attach that root to the scroller
 	mScroller->addChild(mConversationsRoot);
@@ -362,6 +378,7 @@ LLParticipantList* LLFloaterIMSessionTab::getParticipantList()
 	return dynamic_cast<LLParticipantList*>(LLFloaterIMContainer::getInstance()->getSessionModel(mSessionID));
 }
 
+// virtual
 void LLFloaterIMSessionTab::draw()
 {
 	if (mRefreshTimer->hasExpired())
@@ -386,23 +403,24 @@ void LLFloaterIMSessionTab::draw()
 		mRefreshTimer->setTimerExpirySec(REFRESH_INTERVAL);
 	}
 
-	LLTransientDockableFloater::draw();
+	super::draw();
 }
 
 void LLFloaterIMSessionTab::enableDisableCallBtn()
 {
-    if (LLVoiceClient::instanceExists() && mVoiceButton)
-    {
-        mVoiceButton->setEnabled(
-            mSessionID.notNull()
-            && mSession
-            && mSession->mSessionInitialized
-            && LLVoiceClient::getInstance()->voiceEnabled()
-            && LLVoiceClient::getInstance()->isVoiceWorking()
-            && mSession->mCallBackEnabled);
-    }
+	if (LLVoiceClient::instanceExists() && mVoiceButton)
+	{
+		mVoiceButton->setEnabled(
+			mSessionID.notNull()
+			&& mSession
+			&& mSession->mSessionInitialized
+			&& LLVoiceClient::getInstance()->voiceEnabled()
+			&& LLVoiceClient::getInstance()->isVoiceWorking()
+			&& mSession->mCallBackEnabled);
+	}
 }
 
+// virtual
 void LLFloaterIMSessionTab::onFocusReceived()
 {
 	setBackgroundOpaque(true);
@@ -412,13 +430,14 @@ void LLFloaterIMSessionTab::onFocusReceived()
 		LLIMModel::instance().sendNoUnreadMessages(mSessionID);
 	}
 
-	LLTransientDockableFloater::onFocusReceived();
+	super::onFocusReceived();
 }
 
+// virtual
 void LLFloaterIMSessionTab::onFocusLost()
 {
 	setBackgroundOpaque(false);
-	LLTransientDockableFloater::onFocusLost();
+	super::onFocusLost();
 }
 
 void LLFloaterIMSessionTab::onInputEditorClicked()
@@ -431,7 +450,17 @@ void LLFloaterIMSessionTab::onInputEditorClicked()
 	gToolBarView->flashCommand(LLCommandId("chat"), false);
 }
 
-void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self)
+void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self)
+{
+	BOOL show = !self->mEmojiRecentPanel->getVisible();
+	if (show)
+	{
+		self->onEmojiRecentPanelOpening();
+	}
+	self->mEmojiRecentPanel->setVisible(show);
+}
+
+void LLFloaterIMSessionTab::onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab* self)
 {
 	if (LLFloaterEmojiPicker* picker = LLFloaterEmojiPicker::getInstance())
 	{
@@ -452,6 +481,44 @@ void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self)
 	}
 }
 
+void LLFloaterIMSessionTab::onEmojiRecentPanelOpening()
+{
+	std::list<llwchar>& recentlyUsed = LLFloaterEmojiPicker::getRecentlyUsed();
+	if (recentlyUsed.empty())
+	{
+		mEmojiRecentEmptyText->setVisible(true);
+		mEmojiRecentIconsCtrl->setVisible(false);
+		mEmojiPickerToggleBtn->setFocus(true);
+	}
+	else
+	{
+		LLWString emojis;
+		for (llwchar emoji : recentlyUsed)
+		{
+			emojis += emoji;
+		}
+		mEmojiRecentIconsCtrl->setEmojis(emojis);
+		mEmojiRecentEmptyText->setVisible(false);
+		mEmojiRecentIconsCtrl->setVisible(true);
+		mEmojiRecentIconsCtrl->setFocus(true);
+	}
+}
+
+void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
+{
+	LLSD::String str = value.asString();
+	if (str.size())
+	{
+		LLWString wstr = utf8string_to_wstring(str);
+		if (wstr.size())
+		{
+			llwchar emoji = wstr[0];
+			LLFloaterEmojiPicker::onEmojiUsed(emoji);
+			onEmojiPicked(emoji);
+		}
+	}
+}
+
 void LLFloaterIMSessionTab::onEmojiPicked(llwchar emoji)
 {
 	mInputEditor->insertEmoji(emoji);
@@ -462,6 +529,12 @@ void LLFloaterIMSessionTab::onEmojiPickerClosed()
 	mInputEditor->setFocus(TRUE);
 }
 
+void LLFloaterIMSessionTab::closeFloater(bool app_quitting)
+{
+	LLFloaterEmojiPicker::saveState();
+	super::closeFloater(app_quitting);
+}
+
 std::string LLFloaterIMSessionTab::appendTime()
 {
 	std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
@@ -530,10 +603,10 @@ void LLFloaterIMSessionTab::buildConversationViewParticipant()
 	while (current_participant_model != end_participant_model)
 	{
 		LLConversationItem* participant_model = dynamic_cast<LLConversationItem*>(*current_participant_model);
-        if (participant_model)
-        {
-            addConversationViewParticipant(participant_model);
-        }
+		if (participant_model)
+		{
+			addConversationViewParticipant(participant_model);
+		}
 		current_participant_model++;
 	}
 }
@@ -553,10 +626,10 @@ void LLFloaterIMSessionTab::addConversationViewParticipant(LLConversationItem* p
 	// If not already present, create the participant view and attach it to the root, otherwise, just refresh it
 	if (widget)
 	{
-        if (update_view)
-        {
-            updateConversationViewParticipant(uuid); // overkill?
-        }
+		if (update_view)
+		{
+			updateConversationViewParticipant(uuid); // overkill?
+		}
 	}
 	else
 	{
@@ -606,11 +679,11 @@ void LLFloaterIMSessionTab::refreshConversation()
 		{
 			participants_uuids.push_back(widget_it->first);
 		}
-        if (widget_it->second->getViewModelItem())
-        {
-            widget_it->second->refresh();
-            widget_it->second->setVisible(TRUE);
-        }
+		if (widget_it->second->getViewModelItem())
+		{
+			widget_it->second->refresh();
+			widget_it->second->setVisible(TRUE);
+		}
 		++widget_it;
 	}
 	if (is_ad_hoc || mIsP2PChat)
@@ -666,7 +739,7 @@ void LLFloaterIMSessionTab::refreshConversation()
 // Copied from LLFloaterIMContainer::createConversationViewParticipant(). Refactor opportunity!
 LLConversationViewParticipant* LLFloaterIMSessionTab::createConversationViewParticipant(LLConversationItem* item)
 {
-    LLRect panel_rect = mParticipantListPanel->getRect();
+	LLRect panel_rect = mParticipantListPanel->getRect();
 	
 	LLConversationViewParticipant::Params params;
 	params.name = item->getDisplayName();
@@ -794,7 +867,7 @@ void LLFloaterIMSessionTab::hideAllStandardButtons()
 void LLFloaterIMSessionTab::updateHeaderAndToolbar()
 {
 	// prevent start conversation before its container
-    LLFloaterIMContainer::getInstance();
+	LLFloaterIMContainer::getInstance();
 
 	bool is_not_torn_off = !checkIfTornOff();
 	if (is_not_torn_off)
@@ -811,12 +884,12 @@ void LLFloaterIMSessionTab::updateHeaderAndToolbar()
 			&& !mIsP2PChat;
 
 	mParticipantListAndHistoryStack->collapsePanel(mParticipantListPanel, !is_participant_list_visible);
-    mParticipantListPanel->setVisible(is_participant_list_visible);
+	mParticipantListPanel->setVisible(is_participant_list_visible);
 
 	// Display collapse image (<<) if the floater is hosted
 	// or if it is torn off but has an open control panel.
 	bool is_expanded = is_not_torn_off || is_participant_list_visible;
-    
+	
 	mExpandCollapseBtn->setImageOverlay(getString(is_expanded ? "collapse_icon" : "expand_icon"));
 	mExpandCollapseBtn->setToolTip(
 			is_not_torn_off?
@@ -845,10 +918,10 @@ void LLFloaterIMSessionTab::updateHeaderAndToolbar()
  
 void LLFloaterIMSessionTab::forceReshape()
 {
-    LLRect floater_rect = getRect();
-    reshape(llmax(floater_rect.getWidth(), this->getMinWidth()),
-    		llmax(floater_rect.getHeight(), this->getMinHeight()),
-    		true);
+	LLRect floater_rect = getRect();
+	reshape(llmax(floater_rect.getWidth(), this->getMinWidth()),
+			llmax(floater_rect.getHeight(), this->getMinHeight()),
+			true);
 }
 
 
@@ -874,7 +947,7 @@ void LLFloaterIMSessionTab::processChatHistoryStyleUpdate(bool clean_messages/*
 	LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
 	if (nearby_chat)
 	{
-             nearby_chat->reloadMessages(clean_messages);
+			 nearby_chat->reloadMessages(clean_messages);
 	}
 }
 
@@ -920,15 +993,15 @@ void LLFloaterIMSessionTab::onSlide(LLFloaterIMSessionTab* self)
 	{
 		if (!self->mIsP2PChat)
 		{
-            // The state must toggle the collapsed state of the panel
-           should_be_expanded = self->mParticipantListPanel->isCollapsed();
+			// The state must toggle the collapsed state of the panel
+			should_be_expanded = self->mParticipantListPanel->isCollapsed();
 
 			// Update the expand/collapse flag of the participant list panel and save it
-            gSavedSettings.setBOOL("IMShowControlPanel", should_be_expanded);
-            self->mIsParticipantListExpanded = should_be_expanded;
-            
-            // Refresh for immediate feedback
-            self->refreshConversation();
+			gSavedSettings.setBOOL("IMShowControlPanel", should_be_expanded);
+			self->mIsParticipantListExpanded = should_be_expanded;
+
+			// Refresh for immediate feedback
+			self->refreshConversation();
 		}
 	}
 
@@ -965,12 +1038,12 @@ void LLFloaterIMSessionTab::reshapeFloater(bool collapse)
 			+ mChatLayoutPanel->getRect().getHeight() - mChatLayoutPanelHeight + 2;
 		floater_rect.mTop -= height;
 
-        setResizeLimits(getMinWidth(), floater_rect.getHeight());
+		setResizeLimits(getMinWidth(), floater_rect.getHeight());
 	}
 	else
 	{
 		floater_rect.mTop = floater_rect.mBottom + mFloaterHeight;
-        setResizeLimits(getMinWidth(), mMinFloaterHeight);
+		setResizeLimits(getMinWidth(), mMinFloaterHeight);
 	}
 
 	enableResizeCtrls(true, true, !collapse);
@@ -995,7 +1068,7 @@ void LLFloaterIMSessionTab::restoreFloater()
 		setShape(floater_rect, true);
 		mBodyStack->updateLayout();
 		mExpandCollapseLineBtn->setImageOverlay(getString("expandline_icon"));
-        setResizeLimits(getMinWidth(), mMinFloaterHeight);
+		setResizeLimits(getMinWidth(), mMinFloaterHeight);
 		setMessagePaneExpanded(true);
 		saveCollapsedState();
 		mInputEditor->enableSingleLineMode(false);
@@ -1021,8 +1094,8 @@ void LLFloaterIMSessionTab::onTearOffClicked()
 {
 	restoreFloater();
 	setFollows(isTornOff()? FOLLOWS_ALL : FOLLOWS_NONE);
-    mSaveRect = isTornOff();
-    initRectControl();
+	mSaveRect = isTornOff();
+	initRectControl();
 	LLFloater::onClickTearOff(this);
 	LLFloaterIMContainer* container = LLFloaterReg::findTypedInstance<LLFloaterIMContainer>("im_container");
 
@@ -1112,8 +1185,8 @@ bool LLFloaterIMSessionTab::checkIfTornOff()
 void LLFloaterIMSessionTab::doToSelected(const LLSD& userdata)
 {
 	// Get the list of selected items in the tab
-    std::string command = userdata.asString();
-    uuid_vec_t selected_uuids;
+	std::string command = userdata.asString();
+	uuid_vec_t selected_uuids;
 	getSelectedUUIDs(selected_uuids);
 		
 	// Perform the command (IM, profile, etc...) on the list using the general conversation container method
@@ -1125,8 +1198,8 @@ void LLFloaterIMSessionTab::doToSelected(const LLSD& userdata)
 bool LLFloaterIMSessionTab::enableContextMenuItem(const LLSD& userdata)
 {
 	// Get the list of selected items in the tab
-    std::string command = userdata.asString();
-    uuid_vec_t selected_uuids;
+	std::string command = userdata.asString();
+	uuid_vec_t selected_uuids;
 	getSelectedUUIDs(selected_uuids);
 	
 	// Perform the item enable test on the list using the general conversation container method
@@ -1137,8 +1210,8 @@ bool LLFloaterIMSessionTab::enableContextMenuItem(const LLSD& userdata)
 bool LLFloaterIMSessionTab::checkContextMenuItem(const LLSD& userdata)
 {
 	// Get the list of selected items in the tab
-    std::string command = userdata.asString();
-    uuid_vec_t selected_uuids;
+	std::string command = userdata.asString();
+	uuid_vec_t selected_uuids;
 	getSelectedUUIDs(selected_uuids);
 	
 	// Perform the item check on the list using the general conversation container method
@@ -1148,19 +1221,19 @@ bool LLFloaterIMSessionTab::checkContextMenuItem(const LLSD& userdata)
 
 void LLFloaterIMSessionTab::getSelectedUUIDs(uuid_vec_t& selected_uuids)
 {
-    const std::set<LLFolderViewItem*> selected_items = mConversationsRoot->getSelectionList();
+	const std::set<LLFolderViewItem*> selected_items = mConversationsRoot->getSelectionList();
 	
-    std::set<LLFolderViewItem*>::const_iterator it = selected_items.begin();
-    const std::set<LLFolderViewItem*>::const_iterator it_end = selected_items.end();
+	std::set<LLFolderViewItem*>::const_iterator it = selected_items.begin();
+	const std::set<LLFolderViewItem*>::const_iterator it_end = selected_items.end();
 	
-    for (; it != it_end; ++it)
-    {
-        LLConversationItem* conversation_item = static_cast<LLConversationItem *>((*it)->getViewModelItem());
-        if (conversation_item)
-        {
-            selected_uuids.push_back(conversation_item->getUUID());
-        }
-    }
+	for (; it != it_end; ++it)
+	{
+		LLConversationItem* conversation_item = static_cast<LLConversationItem *>((*it)->getViewModelItem());
+		if (conversation_item)
+		{
+			selected_uuids.push_back(conversation_item->getUUID());
+		}
+	}
 }
 
 LLConversationItem* LLFloaterIMSessionTab::getCurSelectedViewModelItem()
@@ -1168,8 +1241,8 @@ LLConversationItem* LLFloaterIMSessionTab::getCurSelectedViewModelItem()
 	LLConversationItem *conversationItem = NULL;
 
 	if(mConversationsRoot && 
-        mConversationsRoot->getCurSelectedItem() && 
-        mConversationsRoot->getCurSelectedItem()->getViewModelItem())
+		mConversationsRoot->getCurSelectedItem() && 
+		mConversationsRoot->getCurSelectedItem()->getViewModelItem())
 	{
 		conversationItem = static_cast<LLConversationItem *>(mConversationsRoot->getCurSelectedItem()->getViewModelItem()) ;
 	}
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 7babc92897..5f8ba44e48 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -41,10 +41,12 @@
 class LLPanelChatControlPanel;
 class LLChatEntry;
 class LLChatHistory;
+class LLPanelEmojiComplete;
 
 class LLFloaterIMSessionTab
 	: public LLTransientDockableFloater
 {
+	using super = LLTransientDockableFloater;
 
 public:
 	LOG_CLASS(LLFloaterIMSessionTab);
@@ -68,9 +70,8 @@ public:
 	bool isHostAttached() {return mIsHostAttached;}
 	void setHostAttached(bool is_attached) {mIsHostAttached = is_attached;}
 
-    static LLFloaterIMSessionTab* findConversation(const LLUUID& uuid);
-    static LLFloaterIMSessionTab* getConversation(const LLUUID& uuid);
-
+	static LLFloaterIMSessionTab* findConversation(const LLUUID& uuid);
+	static LLFloaterIMSessionTab* getConversation(const LLUUID& uuid);
 
 	bool isNearbyChat() {return mIsNearbyChat;}
 
@@ -80,6 +81,7 @@ public:
 	/*virtual*/ void draw();
 	/*virtual*/ void setVisible(BOOL visible);
 	/*virtual*/ void setFocus(BOOL focus);
+	/*virtual*/ void closeFloater(bool app_quitting = false);
 	
 	// Handle the left hand participant list widgets
 	void addConversationViewParticipant(LLConversationItem* item, bool update_view = true);
@@ -136,8 +138,8 @@ protected:
 	virtual void enableDisableCallBtn();
 
 	// process focus events to set a currently active session
-	/* virtual */ void onFocusLost();
 	/* virtual */ void onFocusReceived();
+	/* virtual */ void onFocusLost();
 
 	// prepare chat's params and out one message to chatHistory
 	void appendMessage(const LLChat& chat, const LLSD& args = LLSD());
@@ -152,8 +154,7 @@ protected:
 
 	bool mMessagePaneExpanded;
 	bool mIsParticipantListExpanded;
-    S32 mMinFloaterHeight;
-
+	S32 mMinFloaterHeight;
 
 	LLIMModel::LLIMSession* mSession;
 
@@ -168,33 +169,37 @@ protected:
 	LLLayoutPanel* mContentPanel;
 	LLLayoutPanel* mToolbarPanel;
 	LLLayoutPanel* mInputButtonPanel;
+	LLLayoutPanel* mEmojiRecentPanel;
+	LLView* mEmojiRecentEmptyText;
+	LLPanelEmojiComplete* mEmojiRecentIconsCtrl;
 	LLParticipantList* getParticipantList();
 	conversations_widgets_map mConversationsWidgets;
 	LLConversationViewModel mConversationViewModel;
 	LLFolderView* mConversationsRoot;
 	LLScrollContainer* mScroller;
 
-    LLChatHistory* mChatHistory;
+	LLChatHistory* mChatHistory;
 	LLChatEntry* mInputEditor;
-	LLLayoutPanel * mChatLayoutPanel;
-	LLLayoutStack * mInputPanels;
+	LLLayoutPanel* mChatLayoutPanel;
+	LLLayoutStack* mInputPanels;
 	
 	LLButton* mExpandCollapseLineBtn;
 	LLButton* mExpandCollapseBtn;
 	LLButton* mTearOffBtn;
-	LLButton* mEmojiBtn;
+	LLButton* mEmojiRecentPanelToggleBtn;
+	LLButton* mEmojiPickerToggleBtn;
 	LLButton* mCloseBtn;
 	LLButton* mGearBtn;
 	LLButton* mAddBtn;
-    LLButton* mVoiceButton;
+	LLButton* mVoiceButton;
 
 private:
 	// Handling selection and contextual menu
-    void doToSelected(const LLSD& userdata);
-    bool enableContextMenuItem(const LLSD& userdata);
-    bool checkContextMenuItem(const LLSD& userdata);
+	void doToSelected(const LLSD& userdata);
+	bool enableContextMenuItem(const LLSD& userdata);
+	bool checkContextMenuItem(const LLSD& userdata);
 	
-    void getSelectedUUIDs(uuid_vec_t& selected_uuids);
+	void getSelectedUUIDs(uuid_vec_t& selected_uuids);
 	
 	/// Refreshes the floater at a constant rate.
 	virtual void refresh() = 0;
@@ -208,13 +213,16 @@ private:
 
 	void onInputEditorClicked();
 
-	static void onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self);
+	static void onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self);
+	static void onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab* self);
+	void onEmojiRecentPanelOpening();
+	void onRecentEmojiPicked(const LLSD& value);
 	void onEmojiPicked(llwchar emoji);
 	void onEmojiPickerClosed();
 
 	bool checkIfTornOff();
-    bool mIsHostAttached;
-    bool mHasVisibleBeenInitialized;
+	bool mIsHostAttached;
+	bool mHasVisibleBeenInitialized;
 
 	LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called.
 
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index fc54710941..56965ba7bc 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -300,8 +300,8 @@
                          right="-30"
                          wrap="true" />
                         <button
-                         name="emoji_panel_btn"
-                         tool_tip="Shows/hides emoji picker"
+                         name="emoji_recent_panel_toggle_btn"
+                         tool_tip="Shows/hides recent emojis"
                          follows="right|bottom"
                          use_font_color="true"
                          font="EmojiLarge"
@@ -332,6 +332,43 @@
                     </layout_panel>
                 </layout_stack>
             </layout_panel>
+            <layout_panel
+             name="emoji_recent_layout_panel"
+             height="35"
+             auto_resize="false">
+                <text
+                 name="emoji_recent_empty_text"
+                 follows="top|left|right"
+                 layout="topleft"
+                 auto_resize="false"
+                 h_pad="20"
+                 v_pad="10"
+                 top="0"
+                 left="5"
+                 right="-60"
+                 height="30"
+                >Recently used emojis will appear here</text>
+                <emoji_complete
+                 name="emoji_recent_icons_ctrl"
+                 follows="top|left|right"
+                 layout="topleft"
+                 noscroll="true"
+                 max_emoji="20"
+                 top="0"
+                 left="5"
+                 right="-60"
+                 height="30"/>
+                <button
+                 name="emoji_picker_toggle_btn"
+                 label="More"
+                 tool_tip="Shows/hides emoji picker"
+                 follows="right|bottom"
+                 layout="topleft"
+                 bottom="-5"
+                 right="-5"
+                 height="30"
+                 width="60"/>
+            </layout_panel>
         </layout_stack>
     </view>
 </floater>
-- 
cgit v1.2.3


From 44098db8b3fd96726fec7ec4b68b258a3408dff0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 04:35:48 +0200
Subject: SL-20210 Recent Emojis - Remember emojis that were actually sent in
 the message

---
 indra/newview/llfloateremojipicker.cpp  |  1 -
 indra/newview/llfloaterimnearbychat.cpp |  2 ++
 indra/newview/llfloaterimsession.cpp    |  2 ++
 indra/newview/llfloaterimsessiontab.cpp | 16 +++++++++++++++-
 indra/newview/llfloaterimsessiontab.h   |  2 ++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 95ea9fc478..d24f627cdf 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -669,7 +669,6 @@ void LLFloaterEmojiPicker::onEmojiMouseUp(LLUICtrl* ctrl)
     {
         if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
         {
-            onEmojiUsed(icon->getEmoji());
             if (mEmojiPickCallback)
             {
                 mEmojiPickCallback(icon->getEmoji());
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 4d9d5de30d..40bdf14deb 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -591,6 +591,8 @@ void LLFloaterIMNearbyChat::sendChat( EChatType type )
 			S32 channel = 0;
 			stripChannelNumber(text, &channel);
 			
+			updateUsedEmojis(text);
+
 			std::string utf8text = wstring_to_utf8str(text);
 			// Try to trigger a gesture, if not chat to a script.
 			std::string utf8_revised_text;
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index ee9dc35283..ed2a2807b5 100644
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -249,6 +249,8 @@ void LLFloaterIMSession::sendMsgFromInputEditor()
 			LLWStringUtil::replaceChar(text,182,'\n'); // Convert paragraph symbols back into newlines.
 			if(!text.empty())
 			{
+				updateUsedEmojis(text);
+
 				// Truncate and convert to UTF8 for transport
 				std::string utf8_text = wstring_to_utf8str(text);
 
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 61722a823f..f840dbd9c2 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -38,6 +38,7 @@
 #include "llchiclet.h"
 #include "llchicletbar.h"
 #include "lldraghandle.h"
+#include "llemojidictionary.h"
 #include "llfloaterreg.h"
 #include "llfloateremojipicker.h"
 #include "llfloaterimsession.h"
@@ -513,7 +514,6 @@ void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
 		if (wstr.size())
 		{
 			llwchar emoji = wstr[0];
-			LLFloaterEmojiPicker::onEmojiUsed(emoji);
 			onEmojiPicked(emoji);
 		}
 	}
@@ -576,6 +576,20 @@ void LLFloaterIMSessionTab::appendMessage(const LLChat& chat, const LLSD& args)
 	mChatHistory->appendMessage(chat, chat_args);
 }
 
+void LLFloaterIMSessionTab::updateUsedEmojis(LLWString text)
+{
+	LLEmojiDictionary* dictionary = LLEmojiDictionary::getInstance();
+	llassert_always(dictionary);
+
+	for (llwchar& c : text)
+	{
+		if (dictionary->isEmoji(c))
+		{
+			LLFloaterEmojiPicker::onEmojiUsed(c);
+		}
+	}
+}
+
 static LLTrace::BlockTimerStatHandle FTM_BUILD_CONVERSATION_VIEW_PARTICIPANT("Build Conversation View");
 void LLFloaterIMSessionTab::buildConversationViewParticipant()
 {
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 5f8ba44e48..d21f611172 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -147,6 +147,8 @@ protected:
 	std::string appendTime();
 	void assignResizeLimits();
 
+	void updateUsedEmojis(LLWString text);
+
 	S32  mFloaterExtraWidth;
 
 	bool mIsNearbyChat;
-- 
cgit v1.2.3


From 0d721149fb71fdf6e5b4912836f70b9447062079 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 14:21:49 +0200
Subject: SL-20212 EmojiPicker - Turning the text field grey when it loses
 focus

---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 56965ba7bc..d4d6d3b66b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -291,6 +291,7 @@
                          height="20"    
                          is_expandable="true"
                          text_tentative_color="TextFgTentativeColor"
+                         bg_writeable_color="ScriptBackground"
                          name="chat_editor"
                          max_length="1023"
                          spellcheck="true"
-- 
cgit v1.2.3


From ea9a3c6fbbad01c94b109a1b4322c67e1bed3b24 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 19:17:46 +0200
Subject: SL-20226 Object Profile Floater Stays As Inactive Transparency When
 Active

---
 indra/newview/llfloatersidepanelcontainer.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index dd7ce40e97..5404d54eca 100644
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -67,14 +67,14 @@ void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
 		if (parent == this )
 		{
 			LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
-			if ( panel_appearance )
+			if (panel_appearance)
 			{
 				LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
 				if (edit_wearable_ptr)
 				{
 					edit_wearable_ptr->onClose();
 				}
-				if(!app_quitting)
+				if (!app_quitting)
 				{
 					panel_appearance->showOutfitsInventoryPanel();
 				}
@@ -93,11 +93,16 @@ void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
 LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_name, const LLSD& params)
 {
 	LLView* view = findChildView(panel_name, true);
-	if (!view) return NULL;
+	if (!view)
+		return NULL;
 
 	if (!getVisible())
 	{
-	openFloater();
+		openFloater();
+	}
+	else if (!hasFocus())
+	{
+		setFocus(TRUE);
 	}
 
 	LLPanel* panel = NULL;
-- 
cgit v1.2.3


From 488b51b863c7902ed9f58179f664a1779ad148fb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 1 Sep 2023 00:04:20 +0300
Subject: MacOS build fix

---
 indra/llcommon/lldictionary.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h
index 3e86767d7e..18664e340e 100644
--- a/indra/llcommon/lldictionary.h
+++ b/indra/llcommon/lldictionary.h
@@ -87,7 +87,7 @@ protected:
 	}
 	void addEntry(Index index, Entry *entry)
 	{
-		if (!insert(value_type(index, entry)).second)
+		if (!this->emplace(index, entry).second) 
 		{
 			LL_ERRS() << "Dictionary entry already added (attempted to add duplicate entry)" << LL_ENDL;
 		}
-- 
cgit v1.2.3


From ce4ff7b5a29c8bd4305215225783151546a34a6c Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 16:57:36 +0200
Subject: SL-19664 Crash in LLAppViewer::initStrings - make the error message
 more informative

---
 indra/newview/llappviewer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 7d78d2743c..c5553a722d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2989,7 +2989,10 @@ void LLAppViewer::initStrings()
 	{
 		// initial check to make sure files are there failed
 		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
-		LL_ERRS() << "Viewer failed to find localization and UI files. Please reinstall viewer from  https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
+		LL_ERRS() << "Viewer failed to find localization and UI files"
+			<< " (strings_path_full = '" << strings_path_full << "')."
+			<< " Please reinstall viewer from https://secondlife.com/support/downloads"
+			<< " and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
 	}
 	LLTransUtil::parseStrings(strings_file, default_trans_args);
 	LLTransUtil::parseLanguageStrings("language_settings.xml");
-- 
cgit v1.2.3


From f7beaa49af4a475fb11d61a88d504d8539876294 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 30 Aug 2023 16:16:26 +0200
Subject: SL-18366 Crash in LLCullResult::assertDrawMapsEmpty - make the error
 message more informative

---
 indra/newview/llspatialpartition.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 17c834326c..afcf566974 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -4421,7 +4421,8 @@ void LLCullResult::assertDrawMapsEmpty()
 	{
 		if (mRenderMapSize[i] != 0)
 		{
-			LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!" << LL_ENDL;
+			LL_ERRS() << "Stale LLDrawInfo's in LLCullResult!"
+				<< " (mRenderMapSize[" << i << "] = " << mRenderMapSize[i] << ")" << LL_ENDL;
 		}
 	}
 }
-- 
cgit v1.2.3


From 1660cac80d4eb97812dd488e0c5020542a26f10c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 31 Aug 2023 22:31:11 +0300
Subject: SL-20243 Make viewer notice 403 from release-notes URL and handle it

---
 indra/newview/llstartup.cpp | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 1b0a814c45..5b41571eb1 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2419,6 +2419,34 @@ void login_callback(S32 option, void *userdata)
 	}
 }
 
+void release_notes_coro(const std::string url)
+{
+    if (url.empty())
+    {
+        return;
+    }
+
+    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
+    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
+        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("releaseNotesCoro", httpPolicy));
+    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
+    LLCore::HttpOptions::ptr_t httpOpts = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions);
+
+    httpOpts->setHeadersOnly(true); // only making sure it isn't 404 or something like that
+
+    LLSD result = httpAdapter->getAndSuspend(httpRequest, url, httpOpts);
+
+    LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+    LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
+
+    if (!status)
+    {
+        return;
+    }
+
+    LLWeb::loadURLInternal(url);
+}
+
 /**
 * Check if user is running a new version of the viewer.
 * Display the Release Notes if it's not overriden by the "UpdaterShowReleaseNotes" setting.
@@ -2451,7 +2479,8 @@ void show_release_notes_if_required()
             LLEventPumps::instance().obtain("relnotes").listen(
                 "showrelnotes",
                 [](const LLSD& url) {
-                LLWeb::loadURLInternal(url.asString());
+                    LLCoros::instance().launch("releaseNotesCoro",
+                    boost::bind(&release_notes_coro, url.asString()));
                 return false;
             });
         }
@@ -2459,7 +2488,9 @@ void show_release_notes_if_required()
 #endif // LL_RELEASE_FOR_DOWNLOAD
         {
             LLSD info(LLAppViewer::instance()->getViewerInfo());
-            LLWeb::loadURLInternal(info["VIEWER_RELEASE_NOTES_URL"]);
+            std::string url = info["VIEWER_RELEASE_NOTES_URL"].asString();
+            LLCoros::instance().launch("releaseNotesCoro",
+                                       boost::bind(&release_notes_coro, url));
         }
         release_notes_shown = true;
     }
-- 
cgit v1.2.3


From 0abaf6099824e431d873b6efbd5c3673b87755af Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 1 Sep 2023 19:53:05 +0200
Subject: SL-19664 Crash in LLAppViewer::initStrings(2985) - log extended info

---
 indra/newview/llappviewer.cpp | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c5553a722d..823dd04fe8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -36,6 +36,7 @@
 #include "llenvironment.h"
 #include "llerrorcontrol.h"
 #include "lleventtimer.h"
+#include "llfile.h"
 #include "llviewertexturelist.h"
 #include "llgroupmgr.h"
 #include "llagent.h"
@@ -2987,10 +2988,31 @@ void LLAppViewer::initStrings()
 	std::string strings_path_full = gDirUtilp->findSkinnedFilenameBaseLang(LLDir::XUI, strings_file);
 	if (strings_path_full.empty() || !LLFile::isfile(strings_path_full))
 	{
+		if (strings_path_full.empty())
+		{
+			LL_WARNS() << "The file '" << strings_file << "' is not found" << LL_ENDL;
+		}
+		else
+		{
+			llstat st;
+			int rc = LLFile::stat(strings_path_full, &st);
+			if (rc != 0)
+			{
+				LL_WARNS() << "The file '" << strings_path_full << "' failed to get status. Error code: " << rc << LL_ENDL;
+			}
+			else if (S_ISDIR(st.st_mode))
+			{
+				LL_WARNS() << "The filename '" << strings_path_full << "' is a directory name" << LL_ENDL;
+			}
+			else
+			{
+				LL_WARNS() << "The filename '" << strings_path_full << "' doesn't seem to be a regular file name" << LL_ENDL;
+			}
+		}
+
 		// initial check to make sure files are there failed
 		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
-		LL_ERRS() << "Viewer failed to find localization and UI files"
-			<< " (strings_path_full = '" << strings_path_full << "')."
+		LL_ERRS() << "Viewer failed to find localization and UI files."
 			<< " Please reinstall viewer from https://secondlife.com/support/downloads"
 			<< " and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
 	}
-- 
cgit v1.2.3


From 0968e96462565f6a93dd2e2029122d5ad7023731 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sat, 2 Sep 2023 12:35:35 +0200
Subject: SL-20236 BugSplat Crash in LLVertexBuffer::validateRange(708)

---
 indra/newview/llvopartgroup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index 51cf5f20c6..02f5313db9 100644
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -607,7 +607,7 @@ void LLVOPartGroup::getGeometry(const LLViewerPart& part,
 		up.setCross3(right, at);
 		up.normalize3fast();
 
-		if (part.mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK)
+		if (part.mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK && !part.mVelocity.isExactlyZero())
 		{
 			LLVector4a normvel;
 			normvel.load3(part.mVelocity.mV);
-- 
cgit v1.2.3


From aea271f51dec4daa6f09994e6ce00b322a7d154e Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Mon, 4 Sep 2023 15:12:15 +0300
Subject: DRTWVR-588 xcode buildfix

---
 indra/newview/llpaneleditwearable.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index a1d305789f..78b0bbf117 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -1462,6 +1462,9 @@ LLPanel* LLPanelEditWearable::getPanel(LLWearableType::EType type)
 
                 case LLWearableType::WT_PHYSICS:
                         return mPanelPhysics;
+
+                default:
+                        return NULL;
         }
 
         return NULL;
-- 
cgit v1.2.3


From b5f8a9348d5a93d373b29fd79c1000cc48a79436 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sat, 2 Sep 2023 13:41:21 +0200
Subject: Fix spelling error in source files

---
 indra/newview/llpaneleditwearable.cpp              | 26 +++++++++++-----------
 indra/newview/llpaneleditwearable.h                | 12 +++++-----
 .../skins/default/xui/en/panel_edit_shape.xml      |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 78b0bbf117..24ce8f9c93 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -663,7 +663,7 @@ void LLPanelEditWearable::updateMetricLayout(BOOL new_value)
         LLUIString current_metric, replacment_metric;
         current_metric = new_value ? mMeters : mFeet;
         replacment_metric = new_value ? mFeet : mMeters;
-        mHeigthValue.setArg( "[METRIC1]", current_metric.getString() );
+        mHeightValue.setArg( "[METRIC1]", current_metric.getString() );
         mReplacementMetricUrl.setArg( "[URL_METRIC2]", std::string("[secondlife:///app/metricsystem ") + replacment_metric.getString() + std::string("]"));
 }
 
@@ -671,11 +671,11 @@ void LLPanelEditWearable::updateAvatarHeightLabel()
 {
         mTxtAvatarHeight->setText(LLStringUtil::null);
         LLStyle::Params param;
-        param.color = mAvatarHeigthLabelColor;
-        mTxtAvatarHeight->appendText(mHeigth, false, param);
-        param.color = mAvatarHeigthValueLabelColor;
-        mTxtAvatarHeight->appendText(mHeigthValue, false, param);
-        param.color = mAvatarHeigthLabelColor; // using mAvatarHeigthLabelColor for '/' separator
+        param.color = mAvatarHeightLabelColor;
+        mTxtAvatarHeight->appendText(mHeight, false, param);
+        param.color = mAvatarHeightValueLabelColor;
+        mTxtAvatarHeight->appendText(mHeightValue, false, param);
+        param.color = mAvatarHeightLabelColor; // using mAvatarHeightLabelColor for '/' separator
         mTxtAvatarHeight->appendText(" / ", false, param);
         mTxtAvatarHeight->appendText(this->mReplacementMetricUrl, false, param);
 }
@@ -815,14 +815,14 @@ BOOL LLPanelEditWearable::postBuild()
         // init all strings
         mMeters         = mPanelShape->getString("meters");
         mFeet           = mPanelShape->getString("feet");
-        mHeigth         = mPanelShape->getString("height") + " ";
-        mHeigthValue    = "[HEIGHT] [METRIC1]";
+        mHeight         = mPanelShape->getString("height") + " ";
+        mHeightValue    = "[HEIGHT] [METRIC1]";
         mReplacementMetricUrl   = "[URL_METRIC2]";
 
-        std::string color = mPanelShape->getString("heigth_label_color");
-        mAvatarHeigthLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
-        color = mPanelShape->getString("heigth_value_label_color");
-        mAvatarHeigthValueLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
+        std::string color = mPanelShape->getString("height_label_color");
+        mAvatarHeightLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
+        color = mPanelShape->getString("height_value_label_color");
+        mAvatarHeightValueLabelColor = LLUIColorTable::instance().getColor(color, LLColor4::green);
         gSavedSettings.getControl("HeightUnits")->getSignal()->connect(boost::bind(&LLPanelEditWearable::changeHeightUnits, this, _2));
         updateMetricLayout(gSavedSettings.getBOOL("HeightUnits"));
 
@@ -1352,7 +1352,7 @@ void LLPanelEditWearable::updateTypeSpecificControls(LLWearableType::EType type)
                 }
 
                 std::string avatar_height_str = llformat("%.2f", new_size);
-                mHeigthValue.setArg("[HEIGHT]", avatar_height_str);
+                mHeightValue.setArg("[HEIGHT]", avatar_height_str);
                 updateAvatarHeightLabel();
         }
 
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
index 43d6a3595f..5a40e945c2 100644
--- a/indra/newview/llpaneleditwearable.h
+++ b/indra/newview/llpaneleditwearable.h
@@ -135,14 +135,14 @@ private:
 	// localized and parameterized strings that used to build avatar_height_label
 	std::string mMeters;
 	std::string mFeet;
-	std::string mHeigth;
-	LLUIString  mHeigthValue;
+	std::string mHeight;
+	LLUIString  mHeightValue;
 	LLUIString  mReplacementMetricUrl;
 
-	// color for mHeigth string
-	LLUIColor mAvatarHeigthLabelColor;
-	// color for mHeigthValue string
-	LLUIColor mAvatarHeigthValueLabelColor;
+	// color for mHeight string
+	LLUIColor mAvatarHeightLabelColor;
+	// color for mHeightValue string
+	LLUIColor mAvatarHeightValueLabelColor;
 
 	// This text editor reference will change each time we edit a new wearable - 
 	// it will be grabbed from the currently visible panel
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index d295f5fe4a..cdeb918256 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -11,8 +11,8 @@
      <string name="meters">Meters</string>
      <string name="feet">Feet</string>
      <string name="height">Height:</string>
-     <string name="heigth_label_color" translate="false">White_50</string>
-     <string name="heigth_value_label_color" translate="false">White</string>
+     <string name="height_label_color" translate="false">White_50</string>
+     <string name="height_value_label_color" translate="false">White</string>
      <text
          follows="top|left|right"
          font="SansSerifSmallBold"
-- 
cgit v1.2.3


From 1a89ff73ac210f596887443013857a8ed88a9a00 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Mon, 4 Sep 2023 16:04:41 +0300
Subject: DRTWVR-588 xcode buildfix (for TC)

---
 indra/newview/llpaneleditwearable.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 24ce8f9c93..acc9f1ce0b 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -1466,8 +1466,6 @@ LLPanel* LLPanelEditWearable::getPanel(LLWearableType::EType type)
                 default:
                         return NULL;
         }
-
-        return NULL;
 }
 
 void LLPanelEditWearable::getSortedParams(value_map_t &sorted_params, const std::string &edit_group)
-- 
cgit v1.2.3


From f059ace6f79cd2866fab7027ca22188c806799f8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 29 Aug 2023 01:57:44 +0300
Subject: SL-20205 Clipping of label "Water"

---
 indra/llui/lltextbase.cpp                            |  8 +++++++-
 .../default/xui/en/panel_region_environment.xml      | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 26a38bd541..b6d27a3211 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1550,7 +1550,13 @@ S32 LLTextBase::getLeftOffset(S32 width)
 	case LLFontGL::HCENTER:
 		return mHPad + llmax(0, (mVisibleTextRect.getWidth() - width - mHPad) / 2);
 	case LLFontGL::RIGHT:
-		return mVisibleTextRect.getWidth() - width;
+        {
+            // Font's rendering rounds string size, if value gets rounded
+            // down last symbol might not have enough space to render,
+            // compensate by adding an extra pixel as padding
+            const S32 right_padding = 1;
+            return llmax(mHPad, mVisibleTextRect.getWidth() - width - right_padding);
+        }
 	default:
 		return mHPad;
 	}
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index edf1e1efd4..0b3639f779 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -259,7 +259,7 @@
                                 follows="left|top"
                                 layout="topleft"
                                 height="24"
-                                width="52"
+                                width="53"
                                 left_delta="2"
                                 top_pad="1"
                                 halign="right"
@@ -271,7 +271,7 @@
                                 follows="left|top"
                                 enabled="false"
                                 top_delta="3"
-                                left_pad="21"
+                                left_pad="20"
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt1"
@@ -305,7 +305,7 @@
                                 follows="left|top"
                                 layout="topleft"
                                 height="24"
-                                width="52"
+                                width="53"
                                 left_delta="2"
                                 top_pad="1"
                                 halign="right"
@@ -317,7 +317,7 @@
                                 follows="left|top"
                                 enabled="false"
                                 top_delta="3"
-                                left_pad="21"
+                                left_pad="20"
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt2"
@@ -351,7 +351,7 @@
                                 follows="left|top"
                                 layout="topleft"
                                 height="25"
-                                width="52"
+                                width="53"
                                 left_delta="2"
                                 top_pad="1"
                                 halign="right"
@@ -363,7 +363,7 @@
                                 follows="left|top"
                                 enabled="false"
                                 top_delta="3"
-                                left_pad="21"
+                                left_pad="20"
                                 height="20"
                                 layout="topleft"
                                 name="edt_invname_alt3"
@@ -460,7 +460,7 @@
                            follows="left|top"
                            layout="topleft"
                            height="12"
-                           width="52"
+                           width="53"
                            left_delta="2"
                            top_pad="2"
                            halign="right"
@@ -477,7 +477,7 @@
                             mouse_opaque="false"
                             visible="true"
                            top_delta="-3"
-                           left_pad="2"/>
+                           left_pad="1"/>
                         <line_editor
                            follows="left|top"
                            enabled="false"
@@ -516,7 +516,7 @@
                            follows="left|top"
                            layout="topleft"
                            height="12"
-                           width="52"
+                           width="53"
                            left_delta="2"
                            top_pad="2"
                            halign="right"
@@ -533,7 +533,7 @@
                            mouse_opaque="false"
                            visible="true"
                            top_delta="-3"
-                           left_pad="2"/>
+                           left_pad="1"/>
                         <line_editor
                                 follows="left|top"
                                 enabled="false"
-- 
cgit v1.2.3


From 77014892e61d2a737160b5db6351442f568bc4f6 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 27 Jul 2023 11:14:15 +0200
Subject: SL-18399 'DisableCameraConstraints' debug setting is not working on
 RC

---
 indra/newview/llagentcamera.cpp | 179 ++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 88 deletions(-)

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index d2fe570069..098ff8fea9 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -100,6 +100,12 @@ const F32 GROUND_TO_AIR_CAMERA_TRANSITION_START_TIME = 0.5f;
 
 const F32 OBJECT_EXTENTS_PADDING = 0.5f;
 
+static bool isDisableCameraConstraints()
+{
+	static LLCachedControl<bool> sDisableCameraConstraints(gSavedSettings, "DisableCameraConstraints", false);
+	return sDisableCameraConstraints;
+}
+
 // The agent instance.
 LLAgentCamera gAgentCamera;
 
@@ -570,9 +576,9 @@ BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
 {
 	BOOL soft_limit = FALSE; // is the bounding box to be treated literally (volumes) or as an approximation (avatars)
 
-	if (!mFocusObject || mFocusObject->isDead() || 
+	if (!mFocusObject || mFocusObject->isDead() ||
 		mFocusObject->isMesh() ||
-		gSavedSettings.getBOOL("DisableCameraConstraints"))
+		isDisableCameraConstraints())
 	{
 		obj_min_distance = 0.f;
 		return TRUE;
@@ -742,39 +748,44 @@ F32 LLAgentCamera::getCameraZoomFraction(bool get_third_person)
 		// already [0,1]
 		return mHUDTargetZoom;
 	}
-	else if (get_third_person || (mFocusOnAvatar && cameraThirdPerson()))
+
+	if (isDisableCameraConstraints())
+	{
+		return mCameraZoomFraction;
+	}
+
+	if (get_third_person || (mFocusOnAvatar && cameraThirdPerson()))
 	{
 		return clamp_rescale(mCameraZoomFraction, MIN_ZOOM_FRACTION, MAX_ZOOM_FRACTION, 1.f, 0.f);
 	}
-	else if (cameraCustomizeAvatar())
+
+	if (cameraCustomizeAvatar())
 	{
 		F32 distance = (F32)mCameraFocusOffsetTarget.magVec();
 		return clamp_rescale(distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM, 1.f, 0.f );
 	}
-	else
-	{
-		F32 min_zoom;
-		F32 max_zoom = getCameraMaxZoomDistance();
 
-		F32 distance = (F32)mCameraFocusOffsetTarget.magVec();
-		if (mFocusObject.notNull())
+	F32 min_zoom;
+	F32 max_zoom = getCameraMaxZoomDistance();
+
+	F32 distance = (F32)mCameraFocusOffsetTarget.magVec();
+	if (mFocusObject.notNull())
+	{
+		if (mFocusObject->isAvatar())
 		{
-			if (mFocusObject->isAvatar())
-			{
-				min_zoom = AVATAR_MIN_ZOOM;
-			}
-			else
-			{
-				min_zoom = OBJECT_MIN_ZOOM;
-			}
+			min_zoom = AVATAR_MIN_ZOOM;
 		}
 		else
 		{
-			min_zoom = LAND_MIN_ZOOM;
+			min_zoom = OBJECT_MIN_ZOOM;
 		}
-
-		return clamp_rescale(distance, min_zoom, max_zoom, 1.f, 0.f);
 	}
+	else
+	{
+		min_zoom = LAND_MIN_ZOOM;
+	}
+
+	return clamp_rescale(distance, min_zoom, max_zoom, 1.f, 0.f);
 }
 
 void LLAgentCamera::setCameraZoomFraction(F32 fraction)
@@ -787,6 +798,10 @@ void LLAgentCamera::setCameraZoomFraction(F32 fraction)
 	{
 		mHUDTargetZoom = fraction;
 	}
+	else if (isDisableCameraConstraints())
+	{
+		mCameraZoomFraction = fraction;
+	}
 	else if (mFocusOnAvatar && cameraThirdPerson())
 	{
 		mCameraZoomFraction = rescale(fraction, 0.f, 1.f, MAX_ZOOM_FRACTION, MIN_ZOOM_FRACTION);
@@ -821,6 +836,7 @@ void LLAgentCamera::setCameraZoomFraction(F32 fraction)
 		camera_offset_dir.normalize();
 		mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 1.f, max_zoom, min_zoom);
 	}
+
 	startCameraAnimation();
 }
 
@@ -925,49 +941,40 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction)
 		return;
 	}
 
-
-	LLVector3d	camera_offset_unit(mCameraFocusOffsetTarget);
-	F32 min_zoom = LAND_MIN_ZOOM;
+	LLVector3d camera_offset_unit(mCameraFocusOffsetTarget);
 	F32 current_distance = (F32)camera_offset_unit.normalize();
 	F32 new_distance = current_distance * fraction;
 
-	// Don't move through focus point
-	if (mFocusObject)
+	// Unless camera is unlocked
+	if (!isDisableCameraConstraints())
 	{
-		LLVector3 camera_offset_dir((F32)camera_offset_unit.mdV[VX], (F32)camera_offset_unit.mdV[VY], (F32)camera_offset_unit.mdV[VZ]);
+		F32 min_zoom = LAND_MIN_ZOOM;
 
-		if (mFocusObject->isAvatar())
-		{
-			calcCameraMinDistance(min_zoom);
-		}
-		else
+		// Don't move through focus point
+		if (mFocusObject)
 		{
-			min_zoom = OBJECT_MIN_ZOOM;
-		}
-	}
+			LLVector3 camera_offset_dir((F32)camera_offset_unit.mdV[VX], (F32)camera_offset_unit.mdV[VY], (F32)camera_offset_unit.mdV[VZ]);
 
-	new_distance = llmax(new_distance, min_zoom); 
-
-	F32 max_distance = getCameraMaxZoomDistance();
+			if (mFocusObject->isAvatar())
+			{
+				calcCameraMinDistance(min_zoom);
+			}
+			else
+			{
+				min_zoom = OBJECT_MIN_ZOOM;
+			}
+		}
 
-    max_distance = llmin(max_distance, current_distance * 4.f); //Scaled max relative to current distance.  MAINT-3154
+		new_distance = llmax(new_distance, min_zoom);
 
-	if (new_distance > max_distance)
-	{
-		new_distance = max_distance;
+		F32 max_distance = getCameraMaxZoomDistance();
+		max_distance = llmin(max_distance, current_distance * 4.f); //Scaled max relative to current distance.  MAINT-3154
+		new_distance = llmin(new_distance, max_distance);
 
-		/*
-		// Unless camera is unlocked
-		if (!LLViewerCamera::sDisableCameraConstraints)
+		if (cameraCustomizeAvatar())
 		{
-			return;
+			new_distance = llclamp(new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM);
 		}
-		*/
-	}
-
-	if(cameraCustomizeAvatar())
-	{
-		new_distance = llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
 	}
 
 	mCameraFocusOffsetTarget = new_distance * camera_offset_unit;
@@ -990,53 +997,52 @@ void LLAgentCamera::cameraOrbitIn(const F32 meters)
 			changeCameraToMouselook(FALSE);
 		}
 
-		mCameraZoomFraction = llclamp(mCameraZoomFraction, MIN_ZOOM_FRACTION, MAX_ZOOM_FRACTION);
+		if (!isDisableCameraConstraints())
+		{
+			mCameraZoomFraction = llclamp(mCameraZoomFraction, MIN_ZOOM_FRACTION, MAX_ZOOM_FRACTION);
+		}
 	}
 	else
 	{
 		LLVector3d	camera_offset_unit(mCameraFocusOffsetTarget);
 		F32 current_distance = (F32)camera_offset_unit.normalize();
 		F32 new_distance = current_distance - meters;
-		F32 min_zoom = LAND_MIN_ZOOM;
-		
-		// Don't move through focus point
-		if (mFocusObject.notNull())
+
+		// Unless camera is unlocked
+		if (!isDisableCameraConstraints())
 		{
-			if (mFocusObject->isAvatar())
-			{
-				min_zoom = AVATAR_MIN_ZOOM;
-			}
-			else
+			F32 min_zoom = LAND_MIN_ZOOM;
+
+			// Don't move through focus point
+			if (mFocusObject.notNull())
 			{
-				min_zoom = OBJECT_MIN_ZOOM;
+				if (mFocusObject->isAvatar())
+				{
+					min_zoom = AVATAR_MIN_ZOOM;
+				}
+				else
+				{
+					min_zoom = OBJECT_MIN_ZOOM;
+				}
 			}
-		}
 
-		new_distance = llmax(new_distance, min_zoom);
+			new_distance = llmax(new_distance, min_zoom);
 
-		F32 max_distance = getCameraMaxZoomDistance();
+			F32 max_distance = getCameraMaxZoomDistance();
+			new_distance = llmin(new_distance, max_distance);
 
-		if (new_distance > max_distance)
-		{
-			// Unless camera is unlocked
-			if (!gSavedSettings.getBOOL("DisableCameraConstraints"))
+			if (CAMERA_MODE_CUSTOMIZE_AVATAR == getCameraMode())
 			{
-				return;
+				new_distance = llclamp(new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM);
 			}
 		}
 
-		if( CAMERA_MODE_CUSTOMIZE_AVATAR == getCameraMode() )
-		{
-			new_distance = llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
-		}
-
 		// Compute new camera offset
 		mCameraFocusOffsetTarget = new_distance * camera_offset_unit;
 		cameraZoomIn(1.f);
 	}
 }
 
-
 //-----------------------------------------------------------------------------
 // cameraPanIn()
 //-----------------------------------------------------------------------------
@@ -1835,7 +1841,8 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 				local_camera_offset = gAgent.getFrameAgent().rotateToAbsolute( local_camera_offset );
 			}
 
-			if (!mCameraCollidePlane.isExactlyZero() && (!isAgentAvatarValid() || !gAgentAvatarp->isSitting()))
+			if (!isDisableCameraConstraints() && !mCameraCollidePlane.isExactlyZero() &&
+				(!isAgentAvatarValid() || !gAgentAvatarp->isSitting()))
 			{
 				LLVector3 plane_normal;
 				plane_normal.setVec(mCameraCollidePlane.mV);
@@ -1954,7 +1961,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 		camera_position_global = focusPosGlobal + mCameraFocusOffset;
 	}
 
-	if (!gSavedSettings.getBOOL("DisableCameraConstraints") && !gAgent.isGodlike())
+	if (!isDisableCameraConstraints() && !gAgent.isGodlike())
 	{
 		LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromPosGlobal(camera_position_global);
 		bool constrain = true;
@@ -2118,17 +2125,13 @@ F32 LLAgentCamera::getCameraMinOffGround()
 	{
 		return 0.f;
 	}
-	else
+
+	if (isDisableCameraConstraints())
 	{
-		if (gSavedSettings.getBOOL("DisableCameraConstraints"))
-		{
-			return -1000.f;
-		}
-		else
-		{
-			return 0.5f;
-		}
+		return -1000.f;
 	}
+
+	return 0.5f;
 }
 
 
-- 
cgit v1.2.3


From 7b54f077b48740c69559c0a2089b6133ed8eb605 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 5 Sep 2023 01:22:15 +0200
Subject: SL-19887 Water cuts avatar's name bubble (update)

---
 indra/newview/llvoavatar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 2bb032ed1a..4fd1d74644 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3627,7 +3627,7 @@ LLVector3 LLVOAvatar::idleCalcNameTagPosition(const LLVector3 &root_pos_last)
 		{
 			name_position[VZ] = water_height;
 		}
-		else // both camera and HUD are below watermark
+		else if (mNameText) // both camera and HUD are below watermark
 		{
 			F32 name_world_height = mNameText->getWorldHeight();
 			F32 max_z_position = water_height - name_world_height;
-- 
cgit v1.2.3


From a04f44b7fc76bdaa022642d6e01c72e5996eb989 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 4 Sep 2023 19:20:43 +0200
Subject: Fix emoji category filter not working correctly

---
 indra/newview/llfloateremojipicker.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index d24f627cdf..eea9c685b3 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -534,9 +534,10 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
         for (const LLEmojiGroup& group : groups)
         {
             // List all categories in group
-            for (const std::string& category : group.Categories)
+            for (std::string category : group.Categories)
             {
                 // List all emojis in category
+                LLStringUtil::toLower(category);
                 const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
                 if (item != category2Descr.end())
                 {
@@ -548,9 +549,10 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
     else
     {
         // List all categories in the selected group
-        for (const std::string& category : groups[sSelectedGroupIndex].Categories)
+        for (std::string category : groups[sSelectedGroupIndex].Categories)
         {
             // List all emojis in category
+            LLStringUtil::toLower(category);
             const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
             if (item != category2Descr.end())
             {
-- 
cgit v1.2.3


From d8cc5688eff5b540f8653a1bc39e0644b1da8d03 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 6 Sep 2023 17:51:44 +0300
Subject: SL-20209 MacOS buildfix

---
 indra/newview/llpanelemojicomplete.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 3456de4044..02104efbcb 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -70,7 +70,7 @@ public:
 	void setEmojiHint(const std::string& hint);
 
 protected:
-	void LLPanelEmojiComplete::onEmojisChanged();
+	void onEmojisChanged();
 	size_t posToIndex(S32 x, S32 y) const;
 	void select(size_t emoji_idx);
 	void selectNext();
-- 
cgit v1.2.3


From c30208d598d43779cea7b5de50c44d4b21b16487 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 8 Sep 2023 01:02:06 +0200
Subject: SL-19951 Organize emoji categories in groups (fix for German)

---
 indra/llui/llemojidictionary.cpp       | 3 ++-
 indra/newview/llfloateremojipicker.cpp | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index cdcf5a93d6..89758f538b 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -204,7 +204,8 @@ void LLEmojiDictionary::loadTranslations()
     {
         const LLSD& sd = *it;
         const std::string& name = sd["Name"].asStringRef();
-        const std::string& category = sd["Category"].asStringRef();
+        std::string category = sd["Category"].asString();
+        LLStringUtil::toLower(category);
         if (!name.empty() && !category.empty())
         {
             mTranslations[name] = category;
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index eea9c685b3..d24f627cdf 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -534,10 +534,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
         for (const LLEmojiGroup& group : groups)
         {
             // List all categories in group
-            for (std::string category : group.Categories)
+            for (const std::string& category : group.Categories)
             {
                 // List all emojis in category
-                LLStringUtil::toLower(category);
                 const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
                 if (item != category2Descr.end())
                 {
@@ -549,10 +548,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
     else
     {
         // List all categories in the selected group
-        for (std::string category : groups[sSelectedGroupIndex].Categories)
+        for (const std::string& category : groups[sSelectedGroupIndex].Categories)
         {
             // List all emojis in category
-            LLStringUtil::toLower(category);
             const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
             if (item != category2Descr.end())
             {
-- 
cgit v1.2.3


From 29a3295c82fb65143f8eea7e27c61436a19b4272 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 8 Sep 2023 12:19:21 +0200
Subject: SL-19951 EmojiPicker - preserve original character case for German
 categories

---
 indra/llui/llemojidictionary.cpp       | 18 ++++++------------
 indra/newview/llfloateremojipicker.cpp |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index 89758f538b..1ee97ea2d2 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -204,8 +204,7 @@ void LLEmojiDictionary::loadTranslations()
     {
         const LLSD& sd = *it;
         const std::string& name = sd["Name"].asStringRef();
-        std::string category = sd["Category"].asString();
-        LLStringUtil::toLower(category);
+        const std::string& category = sd["Category"].asStringRef();
         if (!name.empty() && !category.empty())
         {
             mTranslations[name] = category;
@@ -373,22 +372,17 @@ llwchar LLEmojiDictionary::loadIcon(const LLSD& sd)
     return (1 == icon.size()) ? icon[0] : L'\0';
 }
 
-static inline std::list<std::string> loadStrings(const LLSD& sd, const std::string key)
-{
-    auto toLower = [](std::string& str) { LLStringUtil::toLower(str); };
-    return llsd_array_to_list<std::string>(sd[key], toLower);
-}
-
 std::list<std::string> LLEmojiDictionary::loadCategories(const LLSD& sd)
 {
-    static const std::string categoriesKey("Categories");
-    return loadStrings(sd, categoriesKey);
+    static const std::string key("Categories");
+    return llsd_array_to_list<std::string>(sd[key]);
 }
 
 std::list<std::string> LLEmojiDictionary::loadShortCodes(const LLSD& sd)
 {
-    static const std::string shortCodesKey("ShortCodes");
-    return loadStrings(sd, shortCodesKey);
+    static const std::string key("ShortCodes");
+    auto toLower = [](std::string& str) { LLStringUtil::toLower(str); };
+    return llsd_array_to_list<std::string>(sd[key], toLower);
 }
 
 void LLEmojiDictionary::translateCategories(std::list<std::string>& categories)
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index d24f627cdf..1169100336 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -461,7 +461,7 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
         bool showDivider = true;
         bool mixedFolder = maxRows;
         LLEmojiGridRow* row = nullptr;
-        if (!mixedFolder)
+        if (!mixedFolder && !isupper(category.front()))
         {
             LLStringUtil::capitalize(category);
         }
-- 
cgit v1.2.3


From 87f496cf7c1c71510e4cb995661f8da5691746da Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 12 Sep 2023 15:01:56 +0300
Subject:  SL-20173 show notification when file is empty

---
 indra/llimage/llimagedimensionsinfo.cpp              |  7 ++++---
 indra/newview/lllocalbitmaps.cpp                     |  7 ++++++-
 indra/newview/skins/default/xui/en/notifications.xml | 10 +---------
 indra/newview/skins/default/xui/en/strings.xml       |  2 ++
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/llimage/llimagedimensionsinfo.cpp b/indra/llimage/llimagedimensionsinfo.cpp
index 5756ddb32b..9dd69ff132 100644
--- a/indra/llimage/llimagedimensionsinfo.cpp
+++ b/indra/llimage/llimagedimensionsinfo.cpp
@@ -50,6 +50,7 @@ bool LLImageDimensionsInfo::load(const std::string& src_filename,U32 codec)
 
 	if (file_size == 0)
 	{
+        mWarning = "texture_load_empty_file";
 		setLastError("File is empty",src_filename);
 		return false;
 	}
@@ -90,7 +91,7 @@ bool LLImageDimensionsInfo::getImageDimensionsBmp()
 	if (signature[0] != 'B' || signature[1] != 'M')
 	{
 		LL_WARNS() << "Not a BMP" << LL_ENDL;
-        mWarning = "IncorrectFormat";
+        mWarning = "texture_load_format_error";
 		return false;
 	}
 
@@ -141,7 +142,7 @@ bool LLImageDimensionsInfo::getImageDimensionsPng()
 	if (memcmp(signature, png_magic, PNG_MAGIC_SIZE) != 0)
 	{
 		LL_WARNS() << "Not a PNG" << LL_ENDL;
-        mWarning = "IncorrectFormat";
+        mWarning = "texture_load_format_error";
 		return false;
 	}
 
@@ -185,7 +186,7 @@ bool LLImageDimensionsInfo::getImageDimensionsJpeg()
 	if (memcmp(signature, jpeg_magic, JPEG_MAGIC_SIZE) != 0)
 	{
 		LL_WARNS() << "Not a JPEG" << LL_ENDL;
-        mWarning = "IncorrectFormat";
+        mWarning = "texture_load_format_error";
 		return false;
 	}
 	fseek(fp, 0, SEEK_SET); // go back to start of the file
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 72ef365a6d..f435506cff 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -984,7 +984,11 @@ bool LLLocalBitmapMgr::checkTextureDimensions(std::string filename)
 	{
         LLSD args;
         args["NAME"] = gDirUtilp->getBaseFileName(filename);
-        LLNotificationsUtil::add(image_info.getWarningName(), args);
+        if (!image_info.getWarningName().empty())
+        {
+            args["REASON"] = LLTrans::getString(image_info.getWarningName());
+        }
+        LLNotificationsUtil::add("CannotUploadTexture", args);
 		return false;
 	}
 
@@ -1000,6 +1004,7 @@ bool LLLocalBitmapMgr::checkTextureDimensions(std::string filename)
 
 		LLSD notif_args;
 		notif_args["REASON"] = mImageLoadError;
+        notif_args["NAME"] = gDirUtilp->getBaseFileName(filename);
 		LLNotificationsUtil::add("CannotUploadTexture", notif_args);
 
 		return false;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a4b73879b8..8f79794006 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9102,7 +9102,7 @@ You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME]
    icon="alertmodal.tga"
    name="CannotUploadTexture"
    type="alertmodal">
-Unable to upload texture.
+Unable to upload texture: &apos;[NAME]&apos;
 [REASON]   
   <tag>fail</tag>  
   </notification>
@@ -11987,12 +11987,4 @@ Would you like to save them first?
        yestext="Yes"/>
   </notification>
 
-  <notification
-   icon="notifytip.tga"
-   name="IncorrectFormat"
-   priority="high"
-   type="notifytip">
-Unable to upload &apos;[NAME]&apos; due to the following reason: incorrect image format.
-  </notification>
-
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0b19ad1473..a23af740fe 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3932,6 +3932,8 @@ Abuse Report</string>
 
   <string name="DefaultMimeType">none/none</string>
   <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string>
+  <string name="texture_load_format_error">Incorrect image format.</string>
+  <string name="texture_load_empty_file">File is empty.</string>
   <string name="outfit_photo_load_dimensions_error">Max outfit photo size is [WIDTH]*[HEIGHT]. Please resize or use another image</string>
   <string name="outfit_photo_select_dimensions_error">Max outfit photo size is [WIDTH]*[HEIGHT]. Please select another texture</string>
   <string name="outfit_photo_verify_dimensions_error">Cannot verify photo dimensions. Please wait until photo size is displayed in picker</string>
-- 
cgit v1.2.3


From 6ea31793449031f5438f61b40f43d631d2f4766a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 13 Sep 2023 01:32:54 +0300
Subject: SL-20272 Animesh characters animate at 1 frame per second without
 clear reason

Animesh already subtracts complexity cost from the region. It's fine to
slow it down when it's far away, on low fps or when there is a bunch of
non-impostored avatars around. But slowing part of the region's
experience down point blank and permanently is just not pretty.
---
 indra/newview/llvoavatar.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 4fd1d74644..10fe08b34b 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3732,6 +3732,10 @@ bool LLVOAvatar::isVisuallyMuted()
         else if (isInMuteList())
         {
             muted = true;
+        }
+        else if (mIsControlAvatar)
+        {
+            muted = isTooSlow();
         }
 		else 
 		{
-- 
cgit v1.2.3


From 0e135d2a2c1119592a2b7ca70acd95711241de16 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 13 Sep 2023 18:19:50 +0200
Subject: SL-20247 Keep the focus on the chat field as emojis in the offboard
 floater are clicked

---
 indra/newview/llfloaterimsessiontab.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index f840dbd9c2..d46780fa81 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -522,6 +522,7 @@ void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
 void LLFloaterIMSessionTab::onEmojiPicked(llwchar emoji)
 {
 	mInputEditor->insertEmoji(emoji);
+	mInputEditor->setFocus(TRUE);
 }
 
 void LLFloaterIMSessionTab::onEmojiPickerClosed()
-- 
cgit v1.2.3


From 2b96b06669df6ba4be88b8645127b7b9d09632ed Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 15 Sep 2023 01:37:56 +0200
Subject: SL-20279 BugSplat Crash #1327171: gl_debug_callback(111)

---
 indra/llrender/llgl.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index cfc9ce735d..44f7667d2c 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -93,6 +93,17 @@ void APIENTRY gl_debug_callback(GLenum source,
         return;
     }
 
+    if (gGLManager.mIsDisabled &&
+        severity == GL_DEBUG_SEVERITY_HIGH_ARB &&
+        source == GL_DEBUG_SOURCE_API_ARB &&
+        type == GL_DEBUG_TYPE_ERROR_ARB &&
+        id == GL_INVALID_VALUE)
+    {
+        // Suppress messages about deleting already deleted objects called from LLViewerWindow::stopGL()
+        // "GL_INVALID_VALUE error generated. Handle does not refer to an object generated by OpenGL."
+        return;
+    }
+
 	if (severity == GL_DEBUG_SEVERITY_HIGH_ARB)
 	{
 		LL_WARNS() << "----- GL ERROR --------" << LL_ENDL;
@@ -106,7 +117,8 @@ void APIENTRY gl_debug_callback(GLenum source,
 	LL_WARNS() << "Severity: " << std::hex << severity << LL_ENDL;
 	LL_WARNS() << "Message: " << message << LL_ENDL;
 	LL_WARNS() << "-----------------------" << LL_ENDL;
-	if (severity == GL_DEBUG_SEVERITY_HIGH_ARB)
+	// No needs to halt when is called from LLViewerWindow::stopGL()
+	if (severity == GL_DEBUG_SEVERITY_HIGH_ARB && !gGLManager.mIsDisabled)
 	{
 		LL_ERRS() << "Halting on GL Error" << LL_ENDL;
 	}
-- 
cgit v1.2.3


From 37246b99f698f53194c3d60b471e190af79a45fe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 15 Sep 2023 01:22:27 +0300
Subject: SL-17135 Apr process creation crash

looks like pool regularly gets corrupted, try using separate pool
---
 indra/llcommon/llapr.cpp     |  8 +++++++-
 indra/llcommon/llprocess.cpp | 19 ++++++++++++++++---
 indra/llcommon/llprocess.h   |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
index 435531f86f..69466df2d1 100644
--- a/indra/llcommon/llapr.cpp
+++ b/indra/llcommon/llapr.cpp
@@ -38,6 +38,12 @@ const S32 FULL_VOLATILE_APR_POOL = 1024 ; //number of references to LLVolatileAP
 
 bool gAPRInitialized = false;
 
+int abortfunc(int retcode)
+{
+    LL_WARNS("APR") << "Allocation failure in apr pool with code " << (S32)retcode << LL_ENDL;
+    return 0;
+}
+
 void ll_init_apr()
 {
 	// Initialize APR and create the global pool
@@ -45,7 +51,7 @@ void ll_init_apr()
 	
 	if (!gAPRPoolp)
 	{
-		apr_pool_create(&gAPRPoolp, NULL);
+		apr_pool_create_ex(&gAPRPoolp, NULL, abortfunc, NULL);
 	}
 
 	if(!LLAPRFile::sAPRFilePoolp)
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 97a38ea992..0d65762284 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -529,6 +529,7 @@ LLProcess::LLProcess(const LLSDOrParams& params):
 	// preserve existing semantics, we promise that mAttached defaults to the
 	// same setting as mAutokill.
 	mAttached(params.attached.isProvided()? params.attached : params.autokill),
+    mPool(NULL),
 	mPipes(NSLOTS)
 {
 	// Hmm, when you construct a ptr_vector with a size, it merely reserves
@@ -549,8 +550,14 @@ LLProcess::LLProcess(const LLSDOrParams& params):
 
 	mPostend = params.postend;
 
+    apr_pool_create(&mPool, gAPRPoolp);
+    if (!mPool)
+    {
+        LLTHROW(LLProcessError(STRINGIZE("failed to create apr pool")));
+    }
+
 	apr_procattr_t *procattr = NULL;
-	chkapr(apr_procattr_create(&procattr, gAPRPoolp));
+	chkapr(apr_procattr_create(&procattr, mPool));
 
 	// IQA-490, CHOP-900: On Windows, ask APR to jump through hoops to
 	// constrain the set of handles passed to the child process. Before we
@@ -689,14 +696,14 @@ LLProcess::LLProcess(const LLSDOrParams& params):
 	// one. Hand-expand chkapr() macro so we can fill in the actual command
 	// string instead of the variable names.
 	if (ll_apr_warn_status(apr_proc_create(&mProcess, argv[0], &argv[0], NULL, procattr,
-										   gAPRPoolp)))
+										   mPool)))
 	{
 		LLTHROW(LLProcessError(STRINGIZE(params << " failed")));
 	}
 
 	// arrange to call status_callback()
 	apr_proc_other_child_register(&mProcess, &LLProcess::status_callback, this, mProcess.in,
-								  gAPRPoolp);
+                                  mPool);
 	// and make sure we poll it once per "mainloop" tick
 	sProcessListener.addPoll(*this);
 	mStatus.mState = RUNNING;
@@ -815,6 +822,12 @@ LLProcess::~LLProcess()
 	{
 		kill("destructor");
 	}
+
+    if (mPool)
+    {
+        apr_pool_destroy(mPool);
+        mPool = NULL;
+    }
 }
 
 bool LLProcess::kill(const std::string& who)
diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h
index e3386ad88e..0842f2eb07 100644
--- a/indra/llcommon/llprocess.h
+++ b/indra/llcommon/llprocess.h
@@ -568,6 +568,7 @@ private:
 	// explicitly want this ptr_vector to be able to store NULLs
 	typedef boost::ptr_vector< boost::nullable<BasePipe> > PipeVector;
 	PipeVector mPipes;
+    apr_pool_t* mPool;
 };
 
 /// for logging
-- 
cgit v1.2.3


From 771d409b08eb6073f87aee25a95c242d8178d705 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sat, 16 Sep 2023 16:09:25 +0200
Subject: SL-20211 EmojiPicker - Move the filter field to the top of the
 floater

---
 indra/newview/llfloateremojipicker.cpp              | 14 ++++++++------
 indra/newview/llfloateremojipicker.h                |  1 +
 .../skins/default/xui/en/floater_emoji_picker.xml   | 21 ++++++++++++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 1169100336..1608a4f19c 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -193,7 +193,7 @@ public:
 
         F32 centerX = 0.5f * iconWidth;
         F32 centerY = 0.5f * clientHeight;
-        drawIcon(centerX, centerY, iconWidth);
+        drawIcon(centerX, centerY - 1, iconWidth);
 
         static LLColor4 defaultColor(0.75f, 0.75f, 0.75f, 1.0f);
         LLColor4 textColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", defaultColor);
@@ -291,6 +291,8 @@ BOOL LLFloaterEmojiPicker::postBuild()
     mPreview->setVisible(FALSE);
     addChild(mPreview);
 
+    mDummy = getChild<LLTextBox>("Dummy");
+
     mGroups = getChild<LLPanel>("Groups");
     mBadge = getChild<LLPanel>("Badge");
 
@@ -318,8 +320,9 @@ void LLFloaterEmojiPicker::dirtyRect()
     if (!mFilter)
         return;
 
-    const S32 PADDING = 4;
-    LLRect rect(PADDING, mFilter->getRect().mTop, getRect().getWidth() - PADDING * 2, PADDING);
+    const S32 HPADDING = 4;
+    const S32 VOFFSET = 12;
+    LLRect rect(HPADDING, mDummy->getRect().mTop + 6, getRect().getWidth() - HPADDING, VOFFSET);
     if (mPreview->getRect() != rect)
     {
         mPreview->setRect(rect);
@@ -596,7 +599,7 @@ void LLFloaterEmojiPicker::onFilterChanged()
 
 void LLFloaterEmojiPicker::onGridMouseEnter()
 {
-    mFilter->setVisible(FALSE);
+    mDummy->setVisible(FALSE);
     mPreview->setEmoji(nullptr);
     mPreview->setVisible(TRUE);
 }
@@ -604,8 +607,7 @@ void LLFloaterEmojiPicker::onGridMouseEnter()
 void LLFloaterEmojiPicker::onGridMouseLeave()
 {
     mPreview->setVisible(FALSE);
-    mFilter->setVisible(TRUE);
-    mFilter->setFocus(TRUE);
+    mDummy->setVisible(TRUE);
 }
 
 void LLFloaterEmojiPicker::onGroupButtonMouseEnter(LLUICtrl* ctrl)
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index decee41721..cfb3da3acc 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -86,6 +86,7 @@ private:
     class LLScrollContainer* mEmojiScroll { nullptr };
     class LLScrollingPanelList* mEmojiGrid { nullptr };
     class LLEmojiPreviewPanel* mPreview { nullptr };
+    class LLTextBox* mDummy { nullptr };
 
     pick_callback_t mEmojiPickCallback;
     close_callback_t mFloaterCloseCallback;
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 6c440de573..d6774be65c 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -15,9 +15,9 @@
   <filter_editor
       name="Filter"
       label="Start typing to filter"
-      layout="bottomleft"
-      follows="bottom|left|right"
-      bottom="14"
+      layout="topleft"
+      follows="top|left|right"
+      top="27"
       left="10"
       height="23"
       width="230" />
@@ -25,9 +25,9 @@
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
-      top="25"
+      top="50"
       left="0"
-      height="325"
+      height="300"
       width="250">
     <scrolling_panel_list
         name="EmojiGrid"
@@ -59,4 +59,15 @@
       width="20"
       />
   </panel>
+  <text
+      name="Dummy"
+      type="string"
+      layout="bottomleft"
+      follows="bottom|left|right"
+      halign="center"
+      valign="center"
+      bottom="14"
+      left="10"
+      height="23"
+      width="230">No emoji selected</text>
 </floater>
-- 
cgit v1.2.3


From a3b6b8cb72413ad14f73d5bc4c02e791084f62a1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 20 Sep 2023 01:23:21 +0300
Subject: SL-20299 Fix username overlap with the date of the toast

---
 .../skins/default/xui/en/panel_instant_message.xml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 2e5d650902..11f05d186c 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -7,7 +7,7 @@
  left="0"
  name="im_panel"
  top="0"
- width="305">
+ width="310">
     <string
      name="message_max_lines_count">
         6
@@ -24,7 +24,7 @@
      mouse_opaque="false"
      name="im_header"
      top="5"
-     width="295">
+     width="300">
         <avatar_icon
          follows="right"
          height="18"
@@ -65,11 +65,11 @@
          name="user_name"
          parse_urls="false"
          text_color="White"
-         top="8"
+         top="7"
          translate="false"
          use_ellipses="true"
-         value="TestString PleaseIgnore"
-         width="205" />
+         value="TestString PleaseIgnore (testing plsignore)"
+         width="172" />
 	 <!-- TIME STAMP -->
         <text
         font="SansSerifSmall"
@@ -79,9 +79,9 @@
 	 halign="right"
          right="-5"
          name="time_box"
-         top="8"
-         value="23:30"
-         width="50" />
+         top="7"
+         value="2022/09/23 23:30"
+         width="96" />
     </panel>
     <text
         font="SansSerifSmall"
@@ -94,7 +94,7 @@
      top="33"
      use_ellipses="true"
      value=""
-     width="285"
+     width="290"
      word_wrap="true"
      max_length="350" />
 </panel>
-- 
cgit v1.2.3


From e3096da94bd0a9223d6936c5f2ba011b1922298d Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 20 Sep 2023 00:08:31 +0200
Subject: SL-20280 BugSplat Crash in LLVertexBuffer::setBuffer()

---
 indra/llrender/llvertexbuffer.cpp | 59 ---------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index be3e6ddff0..937b8c74ff 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -2181,65 +2181,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
 	//set up pointers if the data mask is different ...
 	bool setup = (sLastMask != data_mask);
 
-	if (gDebugGL && data_mask != 0)
-	{ //make sure data requirements are fulfilled
-		LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr;
-		if (shader)
-		{
-			U32 required_mask = 0;
-			for (U32 i = 0; i < LLVertexBuffer::TYPE_TEXTURE_INDEX; ++i)
-			{
-				if (shader->getAttribLocation(i) > -1)
-				{
-					U32 required = 1 << i;
-					if ((data_mask & required) == 0)
-					{
-						LL_WARNS() << "Missing attribute: " << LLShaderMgr::instance()->mReservedAttribs[i] << LL_ENDL;
-					}
-
-					required_mask |= required;
-				}
-			}
-
-			if ((data_mask & required_mask) != required_mask)
-			{
-				
-				U32 unsatisfied_mask = (required_mask & ~data_mask);
-
-                for (U32 i = 0; i < TYPE_MAX; i++)
-                {
-                    U32 unsatisfied_flag = unsatisfied_mask & (1 << i);
-                    switch (unsatisfied_flag)
-                    {
-                        case 0: break;
-                        case MAP_VERTEX: LL_INFOS() << "Missing vert pos" << LL_ENDL; break;
-                        case MAP_NORMAL: LL_INFOS() << "Missing normals" << LL_ENDL; break;
-                        case MAP_TEXCOORD0: LL_INFOS() << "Missing TC 0" << LL_ENDL; break;
-                        case MAP_TEXCOORD1: LL_INFOS() << "Missing TC 1" << LL_ENDL; break;
-                        case MAP_TEXCOORD2: LL_INFOS() << "Missing TC 2" << LL_ENDL; break;
-                        case MAP_TEXCOORD3: LL_INFOS() << "Missing TC 3" << LL_ENDL; break;
-                        case MAP_COLOR: LL_INFOS() << "Missing vert color" << LL_ENDL; break;
-                        case MAP_EMISSIVE: LL_INFOS() << "Missing emissive" << LL_ENDL; break;
-                        case MAP_TANGENT: LL_INFOS() << "Missing tangent" << LL_ENDL; break;
-                        case MAP_WEIGHT: LL_INFOS() << "Missing weight" << LL_ENDL; break;
-                        case MAP_WEIGHT4: LL_INFOS() << "Missing weightx4" << LL_ENDL; break;
-                        case MAP_CLOTHWEIGHT: LL_INFOS() << "Missing clothweight" << LL_ENDL; break;
-                        case MAP_TEXTURE_INDEX: LL_INFOS() << "Missing tex index" << LL_ENDL; break;
-                        default: LL_INFOS() << "Missing who effin knows: " << unsatisfied_flag << LL_ENDL;
-                    }
-                }
-
-                // TYPE_INDEX is beyond TYPE_MAX, so check for it individually
-                if (unsatisfied_mask & (1 << TYPE_INDEX))
-                {
-                   LL_INFOS() << "Missing indices" << LL_ENDL;
-                }
-
-				LL_ERRS() << "Shader consumption mismatches data provision." << LL_ENDL;
-			}
-		}
-	}
-
 	if (useVBOs())
 	{
 		if (mGLArray)
-- 
cgit v1.2.3


From d72b43f1a90d271ac6d0b0a398a6f906afb3468c Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 21 Sep 2023 01:07:56 +0200
Subject: SL-20287 The 'search_history.txt' file in the user profile is always
 empty

---
 indra/newview/llsearchhistory.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/indra/newview/llsearchhistory.cpp b/indra/newview/llsearchhistory.cpp
index 449e0080f0..66e377cb8d 100644
--- a/indra/newview/llsearchhistory.cpp
+++ b/indra/newview/llsearchhistory.cpp
@@ -75,6 +75,17 @@ bool LLSearchHistory::save()
 {
 	// build filename for each user
 	std::string resolved_filename = getHistoryFilePath();
+
+    // delete the file if it is empty or contains only empty entries
+    if (std::find_if(mSearchHistory.begin(), mSearchHistory.end(), [](const LLSearchHistoryItem& x)
+        {
+            return !x.search_query.empty();
+        }) == mSearchHistory.end())
+    {
+        remove(resolved_filename.c_str());
+        return true;
+    }
+
 	// open a file for writing
 	llofstream file(resolved_filename.c_str());
 	if (!file.is_open())
-- 
cgit v1.2.3


From c2b2598c046e65cb9e003a851d449a3a017e6ac1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 21 Sep 2023 03:29:46 +0300
Subject: SL-20319 Crash at removeMutedAVsLights

Merge conflict? This was fixed in SL-17752 but somehow reverted without
a commit
---
 indra/newview/pipeline.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index bbff6c889f..f01a015713 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1778,17 +1778,23 @@ void LLPipeline::unlinkDrawable(LLDrawable *drawable)
 void LLPipeline::removeMutedAVsLights(LLVOAvatar* muted_avatar)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE;
-	for (light_set_t::iterator iter = gPipeline.mNearbyLights.begin();
-		 iter != gPipeline.mNearbyLights.end(); iter++)
-	{
-        const LLViewerObject *vobj = iter->drawable->getVObj();
-        if (vobj && vobj->getAvatar()
-            && vobj->isAttachment() && vobj->getAvatar() == muted_avatar)
-		{
-			gPipeline.mLights.erase(iter->drawable);
-			gPipeline.mNearbyLights.erase(iter);
-		}
-	}
+    light_set_t::iterator iter = gPipeline.mNearbyLights.begin();
+    while (iter != gPipeline.mNearbyLights.end())
+    {
+        const LLViewerObject* vobj = iter->drawable->getVObj();
+        if (vobj
+            && vobj->getAvatar()
+            && vobj->isAttachment()
+            && vobj->getAvatar() == muted_avatar)
+        {
+            gPipeline.mLights.erase(iter->drawable);
+            iter = gPipeline.mNearbyLights.erase(iter);
+        }
+        else
+        {
+            iter++;
+        }
+    }
 }
 
 U32 LLPipeline::addObject(LLViewerObject *vobj)
-- 
cgit v1.2.3


From 9de22c0eb325e1bf1fd17020a9c6d61e5a162b3a Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 21 Sep 2023 23:58:29 +0200
Subject: SL-20292 The row of recent emojis should scroll

---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d4d6d3b66b..d62fecc249 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -353,7 +353,6 @@
                  name="emoji_recent_icons_ctrl"
                  follows="top|left|right"
                  layout="topleft"
-                 noscroll="true"
                  max_emoji="20"
                  top="0"
                  left="5"
-- 
cgit v1.2.3


From c40f63911c1fad5ea5a18894f530892ddb87c8ea Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 22 Sep 2023 01:19:42 +0200
Subject: SL-20294 The row of recent emojis displays the recently sent emoji
 only after clicking the collapsing smiley button

---
 indra/newview/llfloateremojipicker.cpp  | 12 +++++
 indra/newview/llfloateremojipicker.h    |  1 +
 indra/newview/llfloaterimsessiontab.cpp | 82 ++++++++++++++++++++-------------
 indra/newview/llfloaterimsessiontab.h   |  2 +-
 4 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 1608a4f19c..10013c907d 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -771,6 +771,18 @@ void LLFloaterEmojiPicker::onEmojiUsed(llwchar emoji)
         sFrequentlyUsed.push_back(std::make_pair(emoji, 1));
 }
 
+// static
+void LLFloaterEmojiPicker::onRecentlyUsedChanged()
+{
+    if (sSelectedGroupIndex)
+        return;
+
+    if (LLFloaterEmojiPicker* picker = getInstance())
+    {
+        picker->fillEmojis();
+    }
+}
+
 // static
 void LLFloaterEmojiPicker::loadState()
 {
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index cfb3da3acc..b8e3190bf3 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -56,6 +56,7 @@ public:
 
     static std::list<llwchar>& getRecentlyUsed();
     static void onEmojiUsed(llwchar emoji);
+    static void onRecentlyUsedChanged();
     static void loadState();
     static void saveState();
 
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index d46780fa81..7a0de78ac5 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -456,7 +456,7 @@ void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessio
 	BOOL show = !self->mEmojiRecentPanel->getVisible();
 	if (show)
 	{
-		self->onEmojiRecentPanelOpening();
+		self->initEmojiRecentPanel(true);
 	}
 	self->mEmojiRecentPanel->setVisible(show);
 }
@@ -482,27 +482,33 @@ void LLFloaterIMSessionTab::onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab*
 	}
 }
 
-void LLFloaterIMSessionTab::onEmojiRecentPanelOpening()
-{
-	std::list<llwchar>& recentlyUsed = LLFloaterEmojiPicker::getRecentlyUsed();
-	if (recentlyUsed.empty())
-	{
-		mEmojiRecentEmptyText->setVisible(true);
-		mEmojiRecentIconsCtrl->setVisible(false);
-		mEmojiPickerToggleBtn->setFocus(true);
-	}
-	else
-	{
-		LLWString emojis;
-		for (llwchar emoji : recentlyUsed)
-		{
-			emojis += emoji;
-		}
-		mEmojiRecentIconsCtrl->setEmojis(emojis);
-		mEmojiRecentEmptyText->setVisible(false);
-		mEmojiRecentIconsCtrl->setVisible(true);
-		mEmojiRecentIconsCtrl->setFocus(true);
-	}
+void LLFloaterIMSessionTab::initEmojiRecentPanel(bool moveFocus)
+{
+    std::list<llwchar>& recentlyUsed = LLFloaterEmojiPicker::getRecentlyUsed();
+    if (recentlyUsed.empty())
+    {
+        mEmojiRecentEmptyText->setVisible(true);
+        mEmojiRecentIconsCtrl->setVisible(false);
+        if (moveFocus)
+        {
+            mEmojiPickerToggleBtn->setFocus(true);
+        }
+    }
+    else
+    {
+        LLWString emojis;
+        for (llwchar emoji : recentlyUsed)
+        {
+            emojis += emoji;
+        }
+        mEmojiRecentIconsCtrl->setEmojis(emojis);
+        mEmojiRecentEmptyText->setVisible(false);
+        mEmojiRecentIconsCtrl->setVisible(true);
+        if (moveFocus)
+        {
+            mEmojiRecentIconsCtrl->setFocus(true);
+        }
+    }
 }
 
 void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
@@ -514,7 +520,7 @@ void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
 		if (wstr.size())
 		{
 			llwchar emoji = wstr[0];
-			onEmojiPicked(emoji);
+			mInputEditor->insertEmoji(emoji);
 		}
 	}
 }
@@ -579,16 +585,28 @@ void LLFloaterIMSessionTab::appendMessage(const LLChat& chat, const LLSD& args)
 
 void LLFloaterIMSessionTab::updateUsedEmojis(LLWString text)
 {
-	LLEmojiDictionary* dictionary = LLEmojiDictionary::getInstance();
-	llassert_always(dictionary);
+    LLEmojiDictionary* dictionary = LLEmojiDictionary::getInstance();
+    llassert_always(dictionary);
 
-	for (llwchar& c : text)
-	{
-		if (dictionary->isEmoji(c))
-		{
-			LLFloaterEmojiPicker::onEmojiUsed(c);
-		}
-	}
+    bool emojiSent = false;
+    for (llwchar& c : text)
+    {
+        if (dictionary->isEmoji(c))
+        {
+            LLFloaterEmojiPicker::onEmojiUsed(c);
+            emojiSent = true;
+        }
+    }
+
+    if (!emojiSent)
+        return;
+
+    LLFloaterEmojiPicker::onRecentlyUsedChanged();
+
+    if (mEmojiRecentPanel->getVisible())
+    {
+        initEmojiRecentPanel(false);
+    }
 }
 
 static LLTrace::BlockTimerStatHandle FTM_BUILD_CONVERSATION_VIEW_PARTICIPANT("Build Conversation View");
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index d21f611172..0ff3d0b38c 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -217,7 +217,7 @@ private:
 
 	static void onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self);
 	static void onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab* self);
-	void onEmojiRecentPanelOpening();
+	void initEmojiRecentPanel(bool moveFocus);
 	void onRecentEmojiPicked(const LLSD& value);
 	void onEmojiPicked(llwchar emoji);
 	void onEmojiPickerClosed();
-- 
cgit v1.2.3


From c3321645c8d3bd33ca0a147b97c9022fc7f09e93 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 25 Sep 2023 20:18:59 +0200
Subject: SL-20335 Disable ERROR # diffuseColor4fv : ASSERT (shader != NULL)

---
 indra/newview/lldrawpoolground.cpp | 6 +++---
 indra/newview/llvosky.cpp          | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/indra/newview/lldrawpoolground.cpp b/indra/newview/lldrawpoolground.cpp
index 5b74264dab..77de386040 100644
--- a/indra/newview/lldrawpoolground.cpp
+++ b/indra/newview/lldrawpoolground.cpp
@@ -53,11 +53,11 @@ void LLDrawPoolGround::prerender()
 
 void LLDrawPoolGround::render(S32 pass)
 {
-	if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround"))
+	if (mDrawFace.empty() || !LLGLSLShader::sCurBoundShaderPtr || !gSavedSettings.getBOOL("RenderGround"))
 	{
 		return;
-	}	
-	
+	}
+
 	LLGLSPipelineDepthTestSkyBox gls_skybox(true, false);
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 909588367b..cb2f8b6e18 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -767,7 +767,10 @@ bool LLVOSky::updateSky()
         mForceUpdate = FALSE;
 
         mForceUpdateThrottle.setTimerExpirySec(UPDATE_EXPRY);
-        gPipeline.markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+        if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_GROUND))
+        {
+            gPipeline.markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+        }
 
         if (mDrawable.notNull() && mDrawable->getFace(0) && !mDrawable->getFace(0)->getVertexBuffer())
         {
-- 
cgit v1.2.3


From d551244bbe4763d4ac06a71cbeef93a889b3089e Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 26 Sep 2023 11:46:48 +0200
Subject: SL-20292 Recent emojis panel: reduce spaces between controls

---
 .../skins/default/xui/en/floater_im_session.xml    | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d62fecc249..fa65842c28 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -238,7 +238,7 @@
                 </layout_stack>
             </layout_panel>
             <layout_panel
-             height="35"
+             height="30"
              auto_resize="false"
              name="chat_layout_panel">
                 <layout_stack
@@ -249,7 +249,7 @@
                  name="input_panels"
                  top="0"
                  bottom="-1"
-                 left="0"
+                 left="1"
                  right="-1">
                     <layout_panel
                      name="input_editor_layout_panel">
@@ -260,7 +260,7 @@
                          default_icon_name="Generic_Person"
                          layout="topleft"
                          left="3"
-                         bottom="-9"
+                         bottom="-4"
                          visible="false"
                          width="20" />
                         <group_icon
@@ -270,7 +270,7 @@
                          default_icon_name="Generic_Group"
                          layout="topleft"
                          left="3"
-                         bottom="-9"
+                         bottom="-4"
                          visible="false"
                          width="20" />
                         <icon
@@ -279,7 +279,7 @@
                          image_name="Nearby_chat_icon"
                          layout="topleft"
                          left="3"
-                         bottom="-9"
+                         bottom="-4"
                          name="nearby_chat_icon"
                          visible="false"
                          width="20"/>
@@ -296,7 +296,7 @@
                          max_length="1023"
                          spellcheck="true"
                          tab_group="3"
-                         bottom="-8"
+                         bottom="-3"
                          left_pad="5"
                          right="-30"
                          wrap="true" />
@@ -309,7 +309,7 @@
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
-                         bottom="-7"
+                         bottom="-2"
                          right="-1"
                          height="25"
                          width="25"/>
@@ -335,7 +335,7 @@
             </layout_panel>
             <layout_panel
              name="emoji_recent_layout_panel"
-             height="35"
+             height="30"
              auto_resize="false">
                 <text
                  name="emoji_recent_empty_text"
@@ -345,8 +345,8 @@
                  h_pad="20"
                  v_pad="10"
                  top="0"
-                 left="5"
-                 right="-60"
+                 left="1"
+                 right="-65"
                  height="30"
                 >Recently used emojis will appear here</text>
                 <emoji_complete
@@ -355,8 +355,8 @@
                  layout="topleft"
                  max_emoji="20"
                  top="0"
-                 left="5"
-                 right="-60"
+                 left="1"
+                 right="-65"
                  height="30"/>
                 <button
                  name="emoji_picker_toggle_btn"
@@ -365,8 +365,8 @@
                  follows="right|bottom"
                  layout="topleft"
                  bottom="-5"
-                 right="-5"
-                 height="30"
+                 right="-3"
+                 height="20"
                  width="60"/>
             </layout_panel>
         </layout_stack>
-- 
cgit v1.2.3


From 8e173de3096a8bf79e0fa0aa5c5bd6a696dc20f8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 27 Sep 2023 11:53:23 +0200
Subject: SL-20345 Avoid of ASSERT (\!mRootVolp) in
 LLControlAvatar::~LLControlAvatar()

---
 indra/newview/llcontrolavatar.cpp | 1 +
 indra/newview/llviewerobject.cpp  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 91031034c6..af493fec16 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -379,6 +379,7 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
 
 void LLControlAvatar::markDead()
 {
+    mRootVolp = NULL;
     super::markDead();
     mControlAVBridge = NULL;
 }
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f47f0b4572..1a02e9ddd0 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3178,7 +3178,6 @@ void LLViewerObject::unlinkControlAvatar()
         if (mControlAvatar)
         {
             mControlAvatar->markForDeath();
-			mControlAvatar->mRootVolp = NULL;
             mControlAvatar = NULL;
         }
     }
-- 
cgit v1.2.3


From 0acf91559868de2929c7104cf5f11a5f7e3ce2f1 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 27 Sep 2023 12:23:15 +0200
Subject: SL-20346 Avoid of ASSERT (pos.isFinite()) in drawBoxOutline()

---
 indra/newview/llspatialpartition.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 17c834326c..7721e20738 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -1300,17 +1300,8 @@ void drawBox(const LLVector4a& c, const LLVector4a& r)
 
 void drawBoxOutline(const LLVector3& pos, const LLVector3& size)
 {
-
-	llassert(pos.isFinite());
-	llassert(size.isFinite());
-
-	llassert(!llisnan(pos.mV[0]));
-	llassert(!llisnan(pos.mV[1]));
-	llassert(!llisnan(pos.mV[2]));
-
-	llassert(!llisnan(size.mV[0]));
-	llassert(!llisnan(size.mV[1]));
-	llassert(!llisnan(size.mV[2]));
+    if (!pos.isFinite() || !size.isFinite())
+        return;
 
 	LLVector3 v1 = size.scaledVec(LLVector3( 1, 1,1));
 	LLVector3 v2 = size.scaledVec(LLVector3(-1, 1,1));
-- 
cgit v1.2.3


From ee07a128b16ca824bfede96cb3acd7716900a8e7 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 28 Sep 2023 15:37:32 +0200
Subject: SL-20361 Avoid of ASSERT (false) in check_rigged_group()

---
 indra/newview/llspatialpartition.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 7721e20738..532da98e86 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -1616,6 +1616,7 @@ void pushVertsColorCoded(LLSpatialGroup* group, U32 mask)
 //  - a linked rigged drawable face has the wrong draw order index
 bool check_rigged_group(LLDrawable* drawable)
 {
+#if 0
     if (drawable->isState(LLDrawable::RIGGED))
     {
         LLSpatialGroup* group = drawable->getSpatialGroup();
@@ -1663,7 +1664,7 @@ bool check_rigged_group(LLDrawable* drawable)
             }
         }
     }
-
+#endif
     return true;
 }
 
-- 
cgit v1.2.3


From cd32a40195ea5b42084853c56628746fe84095d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 29 Sep 2023 00:41:47 +0300
Subject: SL-20366 Crash at setTETextureCore

---
 indra/newview/llviewerobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 1a02e9ddd0..fa21e36f3e 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4933,7 +4933,7 @@ void LLViewerObject::setTEImage(const U8 te, LLViewerTexture *imagep)
 S32 LLViewerObject::setTETextureCore(const U8 te, LLViewerTexture *image)
 {
 	LLUUID old_image_id = getTE(te)->getID();
-	const LLUUID& uuid = image->getID();
+	const LLUUID& uuid = image ? image->getID() : LLUUID::null;
 	S32 retval = 0;
 	if (uuid != getTE(te)->getID() ||
 		uuid == LLUUID::null)
-- 
cgit v1.2.3


From 72fbd0898cc8c541ffefacda2ec3465e89ba0bc4 Mon Sep 17 00:00:00 2001
From: nat-goodspeed <nat@lindenlab.com>
Date: Thu, 28 Sep 2023 21:33:20 -0400
Subject: SL-20031: Update viewer-manager to v3.0-83fb46a. (#331)

Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
---
 autobuild.xml | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 9785884a40..7181d91579 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2701,13 +2701,29 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8b091b1f13348eedadf66d7d81cb6bc1</string>
+              <string>6db9317ed29ccb00c2f75758f4aa2d4cd8784f46</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/116621/1003286/viewer_manager-3.0.580913-darwin64-580913.tar.bz2</string>
+              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-83fb46a/viewer_manager-3.0-83fb46a-darwin64-83fb46a.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>426d3b30681b747056027ca21136ae56b188cd47</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-83fb46a/viewer_manager-3.0-83fb46a-linux64-83fb46a.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>linux64</string>
+          </map>
           <key>windows</key>
           <map>
             <key>archive</key>
@@ -2720,13 +2736,27 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>name</key>
             <string>windows</string>
           </map>
+          <key>windows64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>fe8e9ee00f53f11a7417a7bcf1db069e25dace5d</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-83fb46a/viewer_manager-3.0-83fb46a-windows64-83fb46a.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>windows64</string>
+          </map>
         </map>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/vmp-standalone</string>
         <key>source_type</key>
         <string>hg</string>
         <key>version</key>
-        <string>3.0.580913</string>
+        <string>3.0-83fb46a</string>
       </map>
       <key>vlc-bin</key>
       <map>
-- 
cgit v1.2.3


From 78f5dbd95f1295af14093807ca125b92e6f5a9d3 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 25 Sep 2023 12:29:51 +0200
Subject: SL-20244 On-screen animesh characters that start pelvis offset
 animations disappear when root goes off-screen

---
 indra/newview/lldrawable.cpp         | 13 -------------
 indra/newview/llspatialpartition.cpp | 37 ++++++++++++++++++++++++++++++++++++
 indra/newview/llspatialpartition.h   |  5 ++++-
 indra/newview/llvovolume.cpp         | 22 ---------------------
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index bb4174d3b6..d8be4c3bd5 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -763,19 +763,6 @@ void LLDrawable::movePartition()
 	if (part)
 	{
 		part->move(this, getSpatialGroup());
-
-		// SL-18251 "On-screen animesh characters using pelvis offset animations
-		// disappear when root goes off-screen"
-		//
-		// Update extents of the root node when Control Avatar changes it's bounds
-		if (mRenderType == LLPipeline::RENDER_TYPE_CONTROL_AV && isRoot())
-		{
-			LLControlAvatar* controlAvatar = dynamic_cast<LLControlAvatar*>(getVObj().get());
-			if (controlAvatar && controlAvatar->mControlAVBridge)
-			{
-				((LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0))->setState(LLViewerOctreeGroup::DIRTY);
-			}
-		}
 	}
 }
 
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 532da98e86..a3d8986c20 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -847,6 +847,43 @@ void LLSpatialGroup::handleChildAddition(const OctreeNode* parent, OctreeNode* c
 	assert_states_valid(this);
 }
 
+//virtual
+void LLSpatialGroup::rebound()
+{
+    if (!isDirty())
+        return;
+
+    super::rebound();
+
+    if (mSpatialPartition->mDrawableType == LLPipeline::RENDER_TYPE_CONTROL_AV)
+    {
+        llassert(mSpatialPartition->mPartitionType == LLViewerRegion::PARTITION_CONTROL_AV);
+
+        LLSpatialBridge* bridge = getSpatialPartition()->asBridge();
+        if (bridge &&
+            bridge->mDrawable &&
+            bridge->mDrawable->getVObj() &&
+            bridge->mDrawable->getVObj()->isRoot())
+        {
+            LLControlAvatar* controlAvatar = bridge->mDrawable->getVObj()->getControlAvatar();
+            if (controlAvatar &&
+                controlAvatar->mDrawable &&
+                controlAvatar->mControlAVBridge)
+            {
+                llassert(controlAvatar->mControlAVBridge->mOctree);
+
+                LLSpatialGroup* root = (LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0);
+                if (this == root)
+                {
+                    const LLVector4a* addingExtents = controlAvatar->mDrawable->getSpatialExtents();
+                    const LLXformMatrix* currentTransform = bridge->mDrawable->getXform();
+                    expandExtents(addingExtents, *currentTransform);
+                }
+            }
+        }
+    }
+}
+
 void LLSpatialGroup::destroyGL(bool keep_occlusion) 
 {
 	setState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::IMAGE_DIRTY);
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index cdb591083c..b5ac867b3e 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -205,6 +205,7 @@ public:
 LL_ALIGN_PREFIX(64)
 class LLSpatialGroup : public LLOcclusionCullingGroup
 {
+	using super = LLOcclusionCullingGroup;
 	friend class LLSpatialPartition;
 	friend class LLOctreeStateCheck;
 public:
@@ -322,6 +323,9 @@ public:
 	virtual void handleDestruction(const TreeNode* node);
 	virtual void handleChildAddition(const OctreeNode* parent, OctreeNode* child);
 
+	// LLViewerOctreeGroup
+	virtual void rebound();
+
 public:
 	LL_ALIGN_16(LLVector4a mViewAngle);
 	LL_ALIGN_16(LLVector4a mLastUpdateViewAngle);
@@ -703,7 +707,6 @@ class LLControlAVBridge : public LLVolumeBridge
 	using super = LLVolumeBridge;
 public:
 	LLControlAVBridge(LLDrawable* drawablep, LLViewerRegion* regionp);
-	virtual void updateSpatialExtents();
 };
 
 class LLHUDBridge : public LLVolumeBridge
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4ddba872f1..c7054102fd 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5110,28 +5110,6 @@ LLControlAVBridge::LLControlAVBridge(LLDrawable* drawablep, LLViewerRegion* regi
 	mPartitionType = LLViewerRegion::PARTITION_CONTROL_AV;
 }
 
-void LLControlAVBridge::updateSpatialExtents()
-{
-	LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWABLE
-
-	LLControlAvatar* controlAvatar = getVObj()->getControlAvatar();
-
-	LLSpatialGroup* root = (LLSpatialGroup*)mOctree->getListener(0);
-
-	bool rootWasDirty = root->isDirty();
-
-	super::updateSpatialExtents(); // root becomes non-dirty here
-
-	// SL-18251 "On-screen animesh characters using pelvis offset animations
-	// disappear when root goes off-screen"
-	//
-	// Expand extents to include Control Avatar placed outside of the bounds
-	if (controlAvatar && (rootWasDirty || controlAvatar->mPlaying))
-	{
-		root->expandExtents(controlAvatar->mDrawable->getSpatialExtents(), *mDrawable->getXform());
-	}
-}
-
 bool can_batch_texture(LLFace* facep)
 {
 	if (facep->getTextureEntry()->getBumpmap())
-- 
cgit v1.2.3


From 317041be0dca02cf0667abad472db51fd7e69ded Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 2 Oct 2023 09:35:50 +0200
Subject: SL-20356 Allow menu navigation by tabbing around emoji menu

---
 indra/llui/llview.cpp                                       | 2 +-
 indra/newview/skins/default/xui/en/floater_emoji_picker.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 8716e6b338..a8eada59b2 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -514,7 +514,7 @@ BOOL LLView::focusNext(LLView::child_list_t & result)
 		{
 			next = result.rbegin();
 		}
-		if((*next)->isCtrl())
+		if ((*next)->isCtrl() && ((LLUICtrl*)*next)->hasTabStop())
 		{
 			LLUICtrl * ctrl = static_cast<LLUICtrl*>(*next);
 			ctrl->setFocus(TRUE);
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index d6774be65c..e15c304851 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -54,6 +54,7 @@
       background_visible="true"
       background_opaque="true"
       bg_opaque_color="FrogGreen"
+      tab_stop="false"
       bottom="0"
       height="2"
       width="20"
-- 
cgit v1.2.3


From f36f50462e226308424d57298aa29c4dccfef6e2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 2 Oct 2023 14:08:31 +0200
Subject: SL-20387 Show Emoji Completion floater at the beginning of the
 shortcode

---
 indra/llui/llemojihelper.cpp |  3 ++-
 indra/llui/lltexteditor.cpp  | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index fb660a9e5b..1d7744cb55 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -37,7 +37,7 @@
 //
 
 constexpr char DEFAULT_EMOJI_HELPER_FLOATER[] = "emoji_complete";
-constexpr S32 HELPER_FLOATER_OFFSET_X = 20;
+constexpr S32 HELPER_FLOATER_OFFSET_X = 0;
 constexpr S32 HELPER_FLOATER_OFFSET_Y = 0;
 
 // ============================================================================
@@ -113,6 +113,7 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
 	rct.setLeftTopAndSize(floater_x - HELPER_FLOATER_OFFSET_X, floater_y - HELPER_FLOATER_OFFSET_Y + rct.getHeight(), rct.getWidth(), rct.getHeight());
 	pHelperFloater->setRect(rct);
 	pHelperFloater->openFloater(LLSD().with("hint", short_code));
+    gFloaterView->adjustToFitScreen(pHelperFloater, FALSE);
 }
 
 void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p)
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 95d8b666ab..4467496146 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1169,12 +1169,15 @@ void LLTextEditor::addChar(llwchar wc)
 
 	if (!mReadOnly && mShowEmojiHelper)
 	{
-		LLWString wtext(getWText()); S32 shortCodePos;
+		S32 shortCodePos;
+		LLWString wtext(getWText());
 		if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
 		{
-			const LLRect cursorRect = getLocalRectFromDocIndex(mCursorPos - 1);
-			const LLWString shortCode = wtext.substr(shortCodePos, mCursorPos - shortCodePos);
-			LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, wstring_to_utf8str(shortCode), std::bind(&LLTextEditor::handleEmojiCommit, this, std::placeholders::_1));
+			const LLRect cursorRect(getLocalRectFromDocIndex(shortCodePos));
+			const LLWString wpart(wtext.substr(shortCodePos, mCursorPos - shortCodePos));
+			const std::string part(wstring_to_utf8str(wpart));
+			auto cb = [this](llwchar emoji) { handleEmojiCommit(emoji); };
+			LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, part, cb);
 		}
 	}
 
-- 
cgit v1.2.3


From 988278b8c380fc72df1001bb0e5bf38c0a1a655a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 2 Oct 2023 15:54:22 +0300
Subject: SL-20358 restore focus after opening recent emoji panel

---
 indra/newview/llfloaterimsessiontab.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 7a0de78ac5..a44303f72c 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -453,12 +453,19 @@ void LLFloaterIMSessionTab::onInputEditorClicked()
 
 void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self)
 {
+    bool restore_focus = (gFocusMgr.getLastKeyboardFocus() == self->mInputEditor);
+
 	BOOL show = !self->mEmojiRecentPanel->getVisible();
 	if (show)
 	{
-		self->initEmojiRecentPanel(true);
+        self->initEmojiRecentPanel(!restore_focus);
 	}
 	self->mEmojiRecentPanel->setVisible(show);
+
+    if (restore_focus)
+    {
+        self->mInputEditor->setFocus(true);
+    }
 }
 
 void LLFloaterIMSessionTab::onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab* self)
-- 
cgit v1.2.3


From c3adae2a5ff3912ffb741b84a5d098d078da062b Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 2 Oct 2023 15:09:39 +0200
Subject: SL-20391 Show Emoji Completion floater after backspacing a character

---
 indra/llui/lltexteditor.cpp | 53 ++++++++++++++++++++++++++-------------------
 indra/llui/lltexteditor.h   |  1 +
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 4467496146..7aef056e5a 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1022,7 +1022,7 @@ S32 LLTextEditor::remove(S32 pos, S32 length, bool group_with_next_op)
 	// store text segments
 	getSegmentsInRange(segments_to_remove, pos, pos + length, false);
 	
-	if(pos <= end_pos)
+	if (pos <= end_pos)
 	{
 		removedChar = execute( new TextCmdRemove( pos, group_with_next_op, end_pos - pos, segments_to_remove ) );
 	}
@@ -1046,11 +1046,12 @@ S32 LLTextEditor::overwriteChar(S32 pos, llwchar wc)
 // a pseudo-tab (up to for spaces in a row)
 void LLTextEditor::removeCharOrTab()
 {
-	if( !getEnabled() )
+	if (!getEnabled())
 	{
 		return;
 	}
-	if( mCursorPos > 0 )
+
+	if (mCursorPos > 0)
 	{
 		S32 chars_to_remove = 1;
 
@@ -1062,14 +1063,14 @@ void LLTextEditor::removeCharOrTab()
 			if (offset > 0)
 			{
 				chars_to_remove = offset % SPACES_PER_TAB;
-				if( chars_to_remove == 0 )
+				if (chars_to_remove == 0)
 				{
 					chars_to_remove = SPACES_PER_TAB;
 				}
 
-				for( S32 i = 0; i < chars_to_remove; i++ )
+				for (S32 i = 0; i < chars_to_remove; i++)
 				{
-					if (text[ mCursorPos - i - 1] != ' ')
+					if (text[mCursorPos - i - 1] != ' ')
 					{
 						// Fewer than a full tab's worth of spaces, so
 						// just delete a single character.
@@ -1083,8 +1084,10 @@ void LLTextEditor::removeCharOrTab()
 		for (S32 i = 0; i < chars_to_remove; i++)
 		{
 			setCursorPos(mCursorPos - 1);
-			remove( mCursorPos, 1, FALSE );
+			remove(mCursorPos, 1, false);
 		}
+
+		tryToShowEmojiHelper();
 	}
 	else
 	{
@@ -1095,7 +1098,7 @@ void LLTextEditor::removeCharOrTab()
 // Remove a single character from the text
 S32 LLTextEditor::removeChar(S32 pos)
 {
-	return remove( pos, 1, FALSE );
+	return remove(pos, 1, false);
 }
 
 void LLTextEditor::removeChar()
@@ -1104,10 +1107,12 @@ void LLTextEditor::removeChar()
 	{
 		return;
 	}
+
 	if (mCursorPos > 0)
 	{
 		setCursorPos(mCursorPos - 1);
 		removeChar(mCursorPos);
+		tryToShowEmojiHelper();
 	}
 	else
 	{
@@ -1166,20 +1171,7 @@ void LLTextEditor::addChar(llwchar wc)
 	}
 
 	setCursorPos(mCursorPos + addChar( mCursorPos, wc ));
-
-	if (!mReadOnly && mShowEmojiHelper)
-	{
-		S32 shortCodePos;
-		LLWString wtext(getWText());
-		if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
-		{
-			const LLRect cursorRect(getLocalRectFromDocIndex(shortCodePos));
-			const LLWString wpart(wtext.substr(shortCodePos, mCursorPos - shortCodePos));
-			const std::string part(wstring_to_utf8str(wpart));
-			auto cb = [this](llwchar emoji) { handleEmojiCommit(emoji); };
-			LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, part, cb);
-		}
-	}
+	tryToShowEmojiHelper();
 
 	if (!mReadOnly && mAutoreplaceCallback != NULL)
 	{
@@ -1199,6 +1191,23 @@ void LLTextEditor::addChar(llwchar wc)
 	}
 }
 
+void LLTextEditor::tryToShowEmojiHelper()
+{
+    if (mReadOnly || !mShowEmojiHelper)
+        return;
+
+    S32 shortCodePos;
+    LLWString wtext(getWText());
+    if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
+    {
+        const LLRect cursorRect(getLocalRectFromDocIndex(shortCodePos));
+        const LLWString wpart(wtext.substr(shortCodePos, mCursorPos - shortCodePos));
+        const std::string part(wstring_to_utf8str(wpart));
+        auto cb = [this](llwchar emoji) { handleEmojiCommit(emoji); };
+        LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, part, cb);
+    }
+}
+
 void LLTextEditor::addLineBreakChar(BOOL group_together)
 {
 	if( !getEnabled() )
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index f830732cb8..7a96e17899 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -255,6 +255,7 @@ protected:
 	S32				insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment);
 	S32				remove(S32 pos, S32 length, bool group_with_next_op);
 
+	void			tryToShowEmojiHelper();
 	void			focusLostHelper();
 	void			updateAllowingLanguageInput();
 	BOOL			hasPreeditString() const;
-- 
cgit v1.2.3


From be655fef7f1f5717df73dedf84e84b73d246a0ec Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 3 Oct 2023 13:54:07 +0200
Subject: :x

---
 indra/llrender/llfontgl.cpp                        |   4 +-
 indra/llrender/llfontgl.h                          |   4 +-
 indra/llui/llemojihelper.cpp                       |   9 +-
 indra/newview/llpanelemojicomplete.cpp             | 181 ++++++++++++++++-----
 indra/newview/llpanelemojicomplete.h               |  13 +-
 .../default/xui/en/floater_emoji_complete.xml      |  18 +-
 .../default/xui/en/widgets/emoji_complete.xml      |   3 +-
 7 files changed, 165 insertions(+), 67 deletions(-)

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 165d83992b..3e8185de77 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -423,7 +423,7 @@ S32 LLFontGL::render(const LLWString &text, S32 begin_offset, F32 x, F32 y, cons
 	return render(text, begin_offset, x, y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
 }
 
-S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels,  F32* right_x, BOOL use_ellipses, BOOL use_color) const
+S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_ellipses, BOOL use_color) const
 {
 	return render(utf8str_to_wstring(text), begin_offset, x, y, color, halign, valign, style, shadow, max_chars, max_pixels, right_x, use_ellipses, use_color);
 }
@@ -488,7 +488,7 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars) const
 	return getWidthF32(wchars, 0, S32_MAX);
 }
 
-F32 LLFontGL::getWidthF32(const std::string& utf8text, S32 begin_offset, S32 max_chars ) const
+F32 LLFontGL::getWidthF32(const std::string& utf8text, S32 begin_offset, S32 max_chars) const
 {
 	LLWString wtext = utf8str_to_wstring(utf8text);
 	return getWidthF32(wtext.c_str(), begin_offset, max_chars);
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 4d4f564033..c56dd96e00 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -135,12 +135,12 @@ public:
 
 	S32 getWidth(const std::string& utf8text) const;
 	S32 getWidth(const llwchar* wchars) const;
-	S32 getWidth(const std::string& utf8text, S32 offset, S32 max_chars ) const;
+	S32 getWidth(const std::string& utf8text, S32 offset, S32 max_chars) const;
 	S32 getWidth(const llwchar* wchars, S32 offset, S32 max_chars) const;
 
 	F32 getWidthF32(const std::string& utf8text) const;
 	F32 getWidthF32(const llwchar* wchars) const;
-	F32 getWidthF32(const std::string& text, S32 offset, S32 max_chars ) const;
+	F32 getWidthF32(const std::string& text, S32 offset, S32 max_chars) const;
 	F32 getWidthF32(const llwchar* wchars, S32 offset, S32 max_chars, bool no_padding = false) const;
 
 	// The following are called often, frequently with large buffers, so do not use a string interface
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 1d7744cb55..9411f7cac5 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -109,11 +109,12 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
 	}
 
 	LLFloater* pHelperFloater = mHelperHandle.get();
-	LLRect rct = pHelperFloater->getRect();
-	rct.setLeftTopAndSize(floater_x - HELPER_FLOATER_OFFSET_X, floater_y - HELPER_FLOATER_OFFSET_Y + rct.getHeight(), rct.getWidth(), rct.getHeight());
-	pHelperFloater->setRect(rct);
+	LLRect rect = pHelperFloater->getRect();
+	S32 left = floater_x - HELPER_FLOATER_OFFSET_X;
+	S32 top = floater_y - HELPER_FLOATER_OFFSET_Y + rect.getHeight();
+	rect.setLeftTopAndSize(left, top, rect.getWidth(), rect.getHeight());
+	pHelperFloater->setRect(rect);
 	pHelperFloater->openFloater(LLSD().with("hint", short_code));
-    gFloaterView->adjustToFitScreen(pHelperFloater, FALSE);
 }
 
 void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p)
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 8fc84c0387..732531691b 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -32,6 +32,7 @@
 #include "lluictrlfactory.h"
 
 constexpr U32 MIN_MOUSE_MOVE_DELTA = 4;
+constexpr U32 MIN_SHORT_CODE_WIDTH = 100;
 
 // ============================================================================
 // LLPanelEmojiComplete
@@ -42,6 +43,7 @@ static LLDefaultChildRegistry::Register<LLPanelEmojiComplete> r("emoji_complete"
 LLPanelEmojiComplete::Params::Params()
 	: autosize("autosize")
 	, noscroll("noscroll")
+	, vertical("vertical")
 	, max_emoji("max_emoji")
 	, padding("padding")
 	, selected_image("selected_image")
@@ -52,11 +54,13 @@ LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p
 	: LLUICtrl(p)
 	, mAutoSize(p.autosize)
 	, mNoScroll(p.noscroll)
+	, mVertical(p.vertical)
 	, mMaxVisible(p.max_emoji)
 	, mPadding(p.padding)
 	, mSelectedImage(p.selected_image)
+	, mIconFont(LLFontGL::getFontEmojiHuge())
+	, mTextFont(LLFontGL::getFontSansSerifBig())
 {
-	setFont(p.font);
 }
 
 LLPanelEmojiComplete::~LLPanelEmojiComplete()
@@ -65,29 +69,61 @@ LLPanelEmojiComplete::~LLPanelEmojiComplete()
 
 void LLPanelEmojiComplete::draw()
 {
-	if (!mEmojis.empty())
-	{
-		const S32 centerY = mRenderRect.getCenterY();
-		const size_t firstVisibleIdx = mScrollPos, lastVisibleIdx = llmin(mScrollPos + mVisibleEmojis, mEmojis.size()) - 1;
-
-		if (mCurSelected >= firstVisibleIdx && mCurSelected <= lastVisibleIdx)
-		{
-			const S32 emoji_left = mRenderRect.mLeft + (mCurSelected - firstVisibleIdx) * mEmojiWidth;
-			const S32 emoji_height = mFont->getLineHeight() + mPadding;
-			mSelectedImage->draw(emoji_left, centerY - emoji_height / 2, mEmojiWidth, emoji_height);
-		}
-
-		U32 left = mRenderRect.mLeft + mPadding;
-		for (U32 curIdx = firstVisibleIdx; curIdx <= lastVisibleIdx; curIdx++)
-		{
-			mFont->render(
-				mEmojis, curIdx,
-				left, centerY,
-				LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::DROP_SHADOW_SOFT,
-				1, S32_MAX, nullptr, false, true);
-			left += mEmojiWidth;
-		}
-	}
+    if (mEmojis.empty())
+        return;
+
+    const size_t firstVisibleIdx = mScrollPos;
+    const size_t lastVisibleIdx = llmin(mScrollPos + mVisibleEmojis, mEmojis.size()) - 1;
+
+    if (mCurSelected >= firstVisibleIdx && mCurSelected <= lastVisibleIdx)
+    {
+        S32 x, y, width, height;
+        if (mVertical)
+        {
+            x = mRenderRect.mLeft;
+            y = mRenderRect.mTop - (mCurSelected - firstVisibleIdx + 1) * mEmojiHeight;
+            width = mRenderRect.getWidth();
+            height = mEmojiHeight;
+        }
+        else
+        {
+            x = mRenderRect.mLeft + (mCurSelected - firstVisibleIdx) * mEmojiWidth;
+            y = mRenderRect.mBottom;
+            width = mEmojiWidth;
+            height = mRenderRect.getHeight();
+        }
+        mSelectedImage->draw(x, y, width, height);
+    }
+
+    S32 iconCenterX = mRenderRect.mLeft + mEmojiWidth / 2;
+    S32 iconCenterY = mRenderRect.mTop - mEmojiHeight / 2;
+    S32 textLeft = mVertical ? mRenderRect.mLeft + mEmojiWidth + mPadding : 0;
+    S32 textWidth = mVertical ? getRect().getWidth() - textLeft - mPadding : 0;
+
+    for (U32 curIdx = firstVisibleIdx; curIdx <= lastVisibleIdx; curIdx++)
+    {
+        mIconFont->render(mEmojis, curIdx, iconCenterX, iconCenterY,
+            LLColor4::white, LLFontGL::HCENTER, LLFontGL::VCENTER, LLFontGL::NORMAL,
+            LLFontGL::DROP_SHADOW_SOFT, 1, S32_MAX, nullptr, false, true);
+        if (mVertical)
+        {
+            llwchar emoji = mEmojis[curIdx];
+            auto& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
+            auto it = emoji2descr.find(emoji);
+            if (it != emoji2descr.end())
+            {
+                const std::string& shortCode = it->second->ShortCodes.front();
+                mTextFont->renderUTF8(shortCode, 0, textLeft, iconCenterY, LLColor4::white,
+                    LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
+                    shortCode.size(), textWidth, NULL, FALSE, FALSE);
+            }
+            iconCenterY -= mEmojiHeight;
+        }
+        else
+        {
+            iconCenterX += mEmojiWidth;
+        }
+    }
 }
 
 BOOL LLPanelEmojiComplete::handleHover(S32 x, S32 y, MASK mask)
@@ -182,18 +218,49 @@ void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 	llwchar curEmoji = (mCurSelected < mEmojis.size()) ? mEmojis.at(mCurSelected) : 0;
 
 	mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint);
-	size_t curEmojiIdx = (curEmoji) ? mEmojis.find(curEmoji) : std::string::npos;
+	size_t curEmojiIdx = curEmoji ? mEmojis.find(curEmoji) : std::string::npos;
 	mCurSelected = (std::string::npos != curEmojiIdx) ? curEmojiIdx : 0;
 
 	onEmojisChanged();
 }
 
+U32 LLPanelEmojiComplete::getMaxShortCodeWidth() const
+{
+    U32 max_width = 0;
+    auto& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
+    for (llwchar emoji : mEmojis)
+    {
+        auto it = emoji2descr.find(emoji);
+        if (it != emoji2descr.end())
+        {
+            const std::string& shortCode = it->second->ShortCodes.front();
+            S32 width = mTextFont->getWidth(shortCode);
+            if (width > max_width)
+            {
+                max_width = width;
+            }
+        }
+    }
+    return max_width;
+}
+
 void LLPanelEmojiComplete::onEmojisChanged()
 {
 	if (mAutoSize)
 	{
 		mVisibleEmojis = std::min(mEmojis.size(), mMaxVisible);
-		reshape(mVisibleEmojis * mEmojiWidth, getRect().getHeight(), false);
+        if (mVertical)
+        {
+            U32 maxShortCodeWidth = getMaxShortCodeWidth();
+            U32 shortCodeWidth = std::max(maxShortCodeWidth, MIN_SHORT_CODE_WIDTH);
+            S32 width = mEmojiWidth + shortCodeWidth + mPadding * 2;
+            reshape(width, mVisibleEmojis * mEmojiHeight, false);
+        }
+        else
+        {
+            S32 height = getRect().getHeight();
+            reshape(mVisibleEmojis * mEmojiWidth, height, false);
+        }
 	}
 	else
 	{
@@ -207,7 +274,8 @@ size_t LLPanelEmojiComplete::posToIndex(S32 x, S32 y) const
 {
 	if (mRenderRect.pointInRect(x, y))
 	{
-		return mScrollPos + llmin((size_t)x / mEmojiWidth, mEmojis.size() - 1);
+		U32 pos = mVertical ? (U32)(mRenderRect.mTop - y) / mEmojiHeight : x / mEmojiWidth;
+		return mScrollPos + llmin((size_t)pos, mEmojis.size() - 1);
 	}
 	return npos;
 }
@@ -228,21 +296,32 @@ void LLPanelEmojiComplete::selectPrevious()
 	select(mCurSelected - 1 >= 0 ? mCurSelected - 1 : mEmojis.size() - 1);
 }
 
-void LLPanelEmojiComplete::setFont(const LLFontGL* fontp)
-{
-	mFont = fontp;
-	updateConstraints();
-}
-
 void LLPanelEmojiComplete::updateConstraints()
 {
-	const S32 ctrlWidth = getLocalRect().getWidth();
-
-	mEmojiWidth = mFont->getWidthF32(u8"\U0001F431") + mPadding * 2;
-	mVisibleEmojis = ctrlWidth / mEmojiWidth;
-	mRenderRect = getLocalRect().stretch((ctrlWidth - mVisibleEmojis * mEmojiWidth) / -2, 0);
-
-	updateScrollPos();
+    mRenderRect = getLocalRect();
+    S32 ctrlWidth = mRenderRect.getWidth();
+    S32 ctrlHeight = mRenderRect.getHeight();
+
+    mEmojiHeight = mIconFont->getLineHeight() + mPadding * 2;
+    mEmojiWidth = mIconFont->getWidthF32(u8"\U0001F431") + mPadding * 2;
+    if (mVertical)
+    {
+        mVisibleEmojis = ctrlHeight / mEmojiHeight;
+        mRenderRect.mBottom = mRenderRect.mTop - mVisibleEmojis * mEmojiHeight;
+    }
+    else
+    {
+        mVisibleEmojis = ctrlWidth / mEmojiWidth;
+        S32 padding = (ctrlWidth - mVisibleEmojis * mEmojiWidth) / 2;
+        mRenderRect.mLeft += padding;
+        mRenderRect.mRight -= padding;
+        if (mEmojiHeight > ctrlHeight)
+        {
+            mEmojiHeight = ctrlHeight;
+        }
+    }
+
+    updateScrollPos();
 }
 
 void LLPanelEmojiComplete::updateScrollPos()
@@ -302,11 +381,23 @@ BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_pare
 
 void LLFloaterEmojiComplete::onOpen(const LLSD& key)
 {
-	mEmojiCtrl->setEmojiHint(key["hint"].asString());
-	if (0 == mEmojiCtrl->getEmojiCount())
-	{
-		LLEmojiHelper::instance().hideHelper();
-	}
+    mEmojiCtrl->setEmojiHint(key["hint"].asString());
+    if (0 == mEmojiCtrl->getEmojiCount())
+    {
+        LLEmojiHelper::instance().hideHelper();
+        return;
+    }
+
+    if (mEmojiCtrl->isAutoSize())
+    {
+        LLRect outer_rect = getRect();
+        const LLRect& inner_rect = mEmojiCtrl->getRect();
+        outer_rect.mTop = outer_rect.mBottom + inner_rect.mBottom * 2 + inner_rect.getHeight();
+        outer_rect.mRight = outer_rect.mLeft + inner_rect.mLeft * 2 + inner_rect.getWidth();
+        setRect(outer_rect);
+    }
+
+    gFloaterView->adjustToFitScreen(this, FALSE);
 }
 
 BOOL LLFloaterEmojiComplete::postBuild()
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 02104efbcb..20d3413765 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -41,6 +41,7 @@ public:
 	{
 		Optional<bool>       autosize;
 		Optional<bool>       noscroll;
+		Optional<bool>       vertical;
 		Optional<S32>        max_emoji,
 		                     padding;
 
@@ -68,6 +69,8 @@ public:
 	size_t getEmojiCount() const { return mEmojis.size(); }
 	void setEmojis(const LLWString& emojis);
 	void setEmojiHint(const std::string& hint);
+	bool isAutoSize() const { return mAutoSize; }
+	U32 getMaxShortCodeWidth() const;
 
 protected:
 	void onEmojisChanged();
@@ -75,7 +78,6 @@ protected:
 	void select(size_t emoji_idx);
 	void selectNext();
 	void selectPrevious();
-	void setFont(const LLFontGL* fontp);
 	void updateConstraints();
 	void updateScrollPos();
 
@@ -84,14 +86,17 @@ protected:
 
 	const bool      mAutoSize = false;
 	const bool      mNoScroll = false;
-	const LLFontGL* mFont;
-	U16             mEmojiWidth = 0;
+	const bool      mVertical = false;
 	const size_t    mMaxVisible = 0;
 	const S32       mPadding = 8;
-	LLRect          mRenderRect;
 	const LLUIImagePtr mSelectedImage;
+	const LLFontGL* mIconFont;
+	const LLFontGL* mTextFont;
 
 	LLWString       mEmojis;
+	LLRect          mRenderRect;
+	U16             mEmojiWidth = 0;
+	U16             mEmojiHeight = 0;
 	size_t          mVisibleEmojis = 0;
 	size_t          mFirstVisible = 0;
 	size_t          mScrollPos = 0;
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
index e9ea8f4de7..207a8af118 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ name="emoji_complete"
+ single_instance="true"
+ layout="topleft"
  can_close="false"
  can_dock="false"
  can_drag_on_left="false"
@@ -7,22 +10,21 @@
  can_resize="false"
  can_tear_off="false"
  header_height="0"
- layout="topleft"
  legacy_header_height="0"
- height="40"
- single_instance="true"
  width="240"
+ height="40"
  >
 	<emoji_complete
-	 autosize="true"
-	 height="30"
+	 name="emoji_complete_ctrl"
 	 follows="top|left"
 	 layout="topleft"
-	 left="5"
+	 autosize="true"
+	 vertical="true"
 	 max_emoji="7"
-	 name="emoji_complete_ctrl"
-	 top="5"
 	 width="230"
+	 height="30"
+	 left="5"
+	 top="5"
 	 >
 	</emoji_complete>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
index 370f1d174e..f9db441815 100644
--- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <emoji_complete
   autosize="false"
-  font="EmojiHuge"
   hover_image="ListItem_Over"
+  selected_image="ListItem_Select"
   max_emoji="7"
   padding="8"
-  selected_image="ListItem_Select"
   >
 </emoji_complete>
-- 
cgit v1.2.3


From 66aee79e3e9ca9b45e7c61d843caadb8469580e5 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 4 Oct 2023 02:29:17 +0200
Subject: SL-20348 Focus should be in the chat bar when the Conversations
 floater is opened

---
 indra/newview/llfloaterimcontainer.cpp  | 3 +++
 indra/newview/llfloaterimsessiontab.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 2720b7fcf7..011ad67011 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -289,6 +289,9 @@ void LLFloaterIMContainer::onOpen(const LLSD& key)
 	LLMultiFloater::onOpen(key);
 	reSelectConversation();
 	assignResizeLimits();
+
+	LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(mSelectedSession);
+	session_floater->onOpen(key);
 }
 
 // virtual
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index a44303f72c..c188bbdce9 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -1127,6 +1127,8 @@ void LLFloaterIMSessionTab::onOpen(const LLSD& key)
 	}
 
 	mInputButtonPanel->setVisible(isTornOff());
+
+	setFocus(TRUE);
 }
 
 
-- 
cgit v1.2.3


From 45d11733e80707f1783a7ef54706249b2267c714 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 4 Oct 2023 02:29:17 +0200
Subject: SL-20348 Focus should be in the chat bar when the Conversations
 floater is opened

---
 indra/newview/llfloaterimcontainer.cpp  | 3 +++
 indra/newview/llfloaterimsessiontab.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 2720b7fcf7..011ad67011 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -289,6 +289,9 @@ void LLFloaterIMContainer::onOpen(const LLSD& key)
 	LLMultiFloater::onOpen(key);
 	reSelectConversation();
 	assignResizeLimits();
+
+	LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(mSelectedSession);
+	session_floater->onOpen(key);
 }
 
 // virtual
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index af4e7f5aff..0b0dce29fb 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -986,6 +986,8 @@ void LLFloaterIMSessionTab::onOpen(const LLSD& key)
 	}
 
 	mInputButtonPanel->setVisible(isTornOff());
+
+	setFocus(TRUE);
 }
 
 
-- 
cgit v1.2.3


From 9f8763cae1ccb3577a2cd148ffc5cee564a2df65 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 4 Oct 2023 22:30:48 +0200
Subject: SL-20402 Emoji Completion floater - use vertical scrollbar when
 needed

---
 indra/llui/llscrollbar.cpp                         |   6 +-
 indra/newview/llpanelemojicomplete.cpp             | 449 +++++++++++++--------
 indra/newview/llpanelemojicomplete.h               | 125 +++---
 .../default/xui/en/floater_emoji_complete.xml      |   6 +-
 .../skins/default/xui/en/floater_im_session.xml    |   2 +-
 .../default/xui/en/widgets/emoji_complete.xml      |   2 +-
 6 files changed, 350 insertions(+), 240 deletions(-)

diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index fde6de4921..d5d0d97b55 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -475,13 +475,15 @@ void LLScrollbar::reshape(S32 width, S32 height, BOOL called_from_parent)
 	{
 		up_button->reshape(up_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, mThickness));
 		down_button->reshape(down_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, mThickness));
-		up_button->setOrigin(up_button->getRect().mLeft, getRect().getHeight() - up_button->getRect().getHeight());
+		up_button->setOrigin(0, getRect().getHeight() - up_button->getRect().getHeight());
+		down_button->setOrigin(0, 0);
 	}
 	else
 	{
 		up_button->reshape(llmin(getRect().getWidth() / 2, mThickness), up_button->getRect().getHeight());
 		down_button->reshape(llmin(getRect().getWidth() / 2, mThickness), down_button->getRect().getHeight());
-		down_button->setOrigin(getRect().getWidth() - down_button->getRect().getWidth(), down_button->getRect().mBottom);
+		up_button->setOrigin(0, 0);
+		down_button->setOrigin(getRect().getWidth() - down_button->getRect().getWidth(), 0);
 	}
 	updateThumbRect();
 }
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 732531691b..b03f16899e 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -29,10 +29,12 @@
 #include "llemojidictionary.h"
 #include "llemojihelper.h"
 #include "llpanelemojicomplete.h"
+#include "llscrollbar.h"
 #include "lluictrlfactory.h"
 
 constexpr U32 MIN_MOUSE_MOVE_DELTA = 4;
 constexpr U32 MIN_SHORT_CODE_WIDTH = 100;
+constexpr U32 DEF_PADDING = 8;
 
 // ============================================================================
 // LLPanelEmojiComplete
@@ -41,26 +43,35 @@ constexpr U32 MIN_SHORT_CODE_WIDTH = 100;
 static LLDefaultChildRegistry::Register<LLPanelEmojiComplete> r("emoji_complete");
 
 LLPanelEmojiComplete::Params::Params()
-	: autosize("autosize")
-	, noscroll("noscroll")
-	, vertical("vertical")
-	, max_emoji("max_emoji")
-	, padding("padding")
-	, selected_image("selected_image")
+    : autosize("autosize")
+    , noscroll("noscroll")
+    , vertical("vertical")
+    , max_visible("max_visible")
+    , padding("padding", DEF_PADDING)
+    , selected_image("selected_image")
 {
 }
 
 LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p)
-	: LLUICtrl(p)
-	, mAutoSize(p.autosize)
-	, mNoScroll(p.noscroll)
-	, mVertical(p.vertical)
-	, mMaxVisible(p.max_emoji)
-	, mPadding(p.padding)
-	, mSelectedImage(p.selected_image)
-	, mIconFont(LLFontGL::getFontEmojiHuge())
-	, mTextFont(LLFontGL::getFontSansSerifBig())
+    : LLUICtrl(p)
+    , mAutoSize(p.autosize)
+    , mNoScroll(p.noscroll)
+    , mVertical(p.vertical)
+    , mMaxVisible(p.max_visible)
+    , mPadding(p.padding)
+    , mSelectedImage(p.selected_image)
+    , mIconFont(LLFontGL::getFontEmojiHuge())
+    , mTextFont(LLFontGL::getFontSansSerifBig())
+    , mScrollbar(nullptr)
 {
+    if (mVertical)
+    {
+        LLScrollbar::Params sbparams;
+        sbparams.orientation(LLScrollbar::VERTICAL);
+        sbparams.change_callback([this](S32 index, LLScrollbar*) { onScrollbarChange(index); });
+        mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
+        addChild(mScrollbar);
+    }
 }
 
 LLPanelEmojiComplete::~LLPanelEmojiComplete()
@@ -69,13 +80,15 @@ LLPanelEmojiComplete::~LLPanelEmojiComplete()
 
 void LLPanelEmojiComplete::draw()
 {
+    LLUICtrl::draw();
+
     if (mEmojis.empty())
         return;
 
     const size_t firstVisibleIdx = mScrollPos;
-    const size_t lastVisibleIdx = llmin(mScrollPos + mVisibleEmojis, mEmojis.size()) - 1;
+    const size_t lastVisibleIdx = llmin(mScrollPos + mVisibleEmojis, mTotalEmojis);
 
-    if (mCurSelected >= firstVisibleIdx && mCurSelected <= lastVisibleIdx)
+    if (mCurSelected >= firstVisibleIdx && mCurSelected < lastVisibleIdx)
     {
         S32 x, y, width, height;
         if (mVertical)
@@ -100,7 +113,7 @@ void LLPanelEmojiComplete::draw()
     S32 textLeft = mVertical ? mRenderRect.mLeft + mEmojiWidth + mPadding : 0;
     S32 textWidth = mVertical ? getRect().getWidth() - textLeft - mPadding : 0;
 
-    for (U32 curIdx = firstVisibleIdx; curIdx <= lastVisibleIdx; curIdx++)
+    for (U32 curIdx = firstVisibleIdx; curIdx < lastVisibleIdx; curIdx++)
     {
         mIconFont->render(mEmojis, curIdx, iconCenterX, iconCenterY,
             LLColor4::white, LLFontGL::HCENTER, LLFontGL::VCENTER, LLFontGL::NORMAL,
@@ -128,100 +141,154 @@ void LLPanelEmojiComplete::draw()
 
 BOOL LLPanelEmojiComplete::handleHover(S32 x, S32 y, MASK mask)
 {
-	LLVector2 curHover(x, y);
-	if ((mLastHover - curHover).lengthSquared() > MIN_MOUSE_MOVE_DELTA)
-	{
-		mCurSelected = posToIndex(x, y);
-		mLastHover = curHover;
-	}
-
-	return TRUE;
+    if (mScrollbar && mScrollbar->getVisible() && childrenHandleHover(x, y, mask))
+        return TRUE;
+
+    LLVector2 curHover(x, y);
+    if ((mLastHover - curHover).lengthSquared() > MIN_MOUSE_MOVE_DELTA)
+    {
+        size_t index = posToIndex(x, y);
+        if (index < mTotalEmojis)
+            mCurSelected = index;
+        mLastHover = curHover;
+    }
+
+    return TRUE;
 }
 
 BOOL LLPanelEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	bool handled = false;
-	if (MASK_NONE == mask)
-	{
-		switch (key)
-		{
-			case KEY_LEFT:
-			case KEY_UP:
-				selectPrevious();
-				handled = true;
-				break;
-			case KEY_RIGHT:
-			case KEY_DOWN:
-				selectNext();
-				handled = true;
-				break;
-			case KEY_RETURN:
-				if (!mEmojis.empty())
-				{
-					onCommit();
-					handled = true;
-				}
-				break;
-		}
-	}
-
-	if (handled)
-	{
-		return TRUE;
-	}
-	return LLUICtrl::handleKey(key, mask, called_from_parent);
+    bool handled = false;
+    if (mTotalEmojis && MASK_NONE == mask)
+    {
+        switch (key)
+        {
+        case KEY_HOME:
+            select(0);
+            handled = true;
+            break;
+
+        case KEY_END:
+            select(mTotalEmojis - 1);
+            handled = true;
+            break;
+
+        case KEY_PAGE_DOWN:
+            select(mCurSelected + mVisibleEmojis - 1);
+            handled = true;
+            break;
+
+        case KEY_PAGE_UP:
+            select(mCurSelected - llmin(mCurSelected, mVisibleEmojis + 1));
+            handled = true;
+            break;
+
+        case KEY_LEFT:
+        case KEY_UP:
+            selectPrevious();
+            handled = true;
+            break;
+
+        case KEY_RIGHT:
+        case KEY_DOWN:
+            selectNext();
+            handled = true;
+            break;
+
+        case KEY_RETURN:
+            onCommit();
+            handled = true;
+            break;
+        }
+    }
+
+    if (handled)
+    {
+        return TRUE;
+    }
+
+    return LLUICtrl::handleKey(key, mask, called_from_parent);
 }
 
 BOOL LLPanelEmojiComplete::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	mCurSelected = posToIndex(x, y);
-	mLastHover = LLVector2(x, y);
+    if (mScrollbar && mScrollbar->getVisible() && childrenHandleMouseDown(x, y, mask))
+        return TRUE;
+
+    mCurSelected = posToIndex(x, y);
+    mLastHover = LLVector2(x, y);
 
-	return TRUE;
+    return TRUE;
 }
 
 BOOL LLPanelEmojiComplete::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-	mCurSelected = posToIndex(x, y);
-	onCommit();
+    if (mScrollbar && mScrollbar->getVisible() && childrenHandleMouseUp(x, y, mask))
+        return TRUE;
+
+    mCurSelected = posToIndex(x, y);
+    onCommit();
+
+    return TRUE;
+}
+
+BOOL LLPanelEmojiComplete::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+    if (mNoScroll)
+        return FALSE;
 
-	return TRUE;
+    if (mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel(x, y, clicks))
+    {
+        mCurSelected = posToIndex(x, y);
+        return TRUE;
+    }
+
+    if (mTotalEmojis > mVisibleEmojis)
+    {
+        mScrollPos = llclamp<size_t>(mScrollPos + clicks, 0, mTotalEmojis - mVisibleEmojis);
+        mCurSelected = posToIndex(x, y);
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 void LLPanelEmojiComplete::onCommit()
 {
-	if (mCurSelected < mEmojis.size())
-	{
-		LLWString wstr;
-		wstr.push_back(mEmojis.at(mCurSelected));
-		setValue(wstring_to_utf8str(wstr));
-		LLUICtrl::onCommit();
-	}
+    if (mCurSelected < mTotalEmojis)
+    {
+        LLWString wstr;
+        wstr.push_back(mEmojis.at(mCurSelected));
+        setValue(wstring_to_utf8str(wstr));
+        LLUICtrl::onCommit();
+    }
 }
 
 void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-	LLUICtrl::reshape(width, height, called_from_parent);
-	updateConstraints();
+    LLUICtrl::reshape(width, height, called_from_parent);
+    updateConstraints();
 }
 
 void LLPanelEmojiComplete::setEmojis(const LLWString& emojis)
 {
-	mEmojis = emojis;
-	mCurSelected = 0;
+    mEmojis = emojis;
+    mTotalEmojis = mEmojis.size();
+    mCurSelected = 0;
 
-	onEmojisChanged();
+    onEmojisChanged();
 }
 
 void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 {
-	llwchar curEmoji = (mCurSelected < mEmojis.size()) ? mEmojis.at(mCurSelected) : 0;
+    llwchar curEmoji = mCurSelected < mTotalEmojis ? mEmojis.at(mCurSelected) : 0;
 
-	mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint);
-	size_t curEmojiIdx = curEmoji ? mEmojis.find(curEmoji) : std::string::npos;
-	mCurSelected = (std::string::npos != curEmojiIdx) ? curEmojiIdx : 0;
+    mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint);
+    mTotalEmojis = mEmojis.size();
+    size_t curEmojiIdx = curEmoji ? mEmojis.find(curEmoji) : std::string::npos;
+    mCurSelected = std::string::npos != curEmojiIdx ? curEmojiIdx : 0;
 
-	onEmojisChanged();
+    onEmojisChanged();
 }
 
 U32 LLPanelEmojiComplete::getMaxShortCodeWidth() const
@@ -246,79 +313,104 @@ U32 LLPanelEmojiComplete::getMaxShortCodeWidth() const
 
 void LLPanelEmojiComplete::onEmojisChanged()
 {
-	if (mAutoSize)
-	{
-		mVisibleEmojis = std::min(mEmojis.size(), mMaxVisible);
+    if (mAutoSize)
+    {
+        S32 width, height;
+        mVisibleEmojis = llmin(mTotalEmojis, mMaxVisible);
         if (mVertical)
         {
             U32 maxShortCodeWidth = getMaxShortCodeWidth();
-            U32 shortCodeWidth = std::max(maxShortCodeWidth, MIN_SHORT_CODE_WIDTH);
-            S32 width = mEmojiWidth + shortCodeWidth + mPadding * 2;
-            reshape(width, mVisibleEmojis * mEmojiHeight, false);
+            U32 shortCodeWidth = llmax(maxShortCodeWidth, MIN_SHORT_CODE_WIDTH);
+            width = mEmojiWidth + shortCodeWidth + mPadding * 2;
+            if (!mNoScroll && mVisibleEmojis < mTotalEmojis)
+            {
+                width += mScrollbar->getThickness();
+            }
+            height = mVisibleEmojis * mEmojiHeight;
         }
         else
         {
-            S32 height = getRect().getHeight();
-            reshape(mVisibleEmojis * mEmojiWidth, height, false);
+            width = mVisibleEmojis * mEmojiWidth;
+            height = getRect().getHeight();
         }
-	}
-	else
-	{
-		updateConstraints();
-	}
+        LLUICtrl::reshape(width, height, false);
+    }
+    else
+    {
+        mVisibleEmojis = mVertical ? getRect().getHeight() / mEmojiHeight : getRect().getWidth() / mEmojiWidth;
+    }
 
-	mScrollPos = llmin(mScrollPos, mEmojis.size());
+    updateConstraints();
+}
+
+void LLPanelEmojiComplete::onScrollbarChange(S32 index)
+{
+    mScrollPos = llclamp<size_t>(index, 0, mTotalEmojis - mVisibleEmojis);
 }
 
 size_t LLPanelEmojiComplete::posToIndex(S32 x, S32 y) const
 {
-	if (mRenderRect.pointInRect(x, y))
-	{
-		U32 pos = mVertical ? (U32)(mRenderRect.mTop - y) / mEmojiHeight : x / mEmojiWidth;
-		return mScrollPos + llmin((size_t)pos, mEmojis.size() - 1);
-	}
-	return npos;
+    if (mRenderRect.pointInRect(x, y))
+    {
+        U32 pos = mVertical ? (U32)(mRenderRect.mTop - y) / mEmojiHeight : x / mEmojiWidth;
+        return llmin(mScrollPos + pos, mTotalEmojis - 1);
+    }
+    return std::string::npos;
 }
 
 void LLPanelEmojiComplete::select(size_t emoji_idx)
 {
-	mCurSelected = llclamp<size_t>(emoji_idx, 0, mEmojis.size());
-	updateScrollPos();
+    mCurSelected = llclamp<size_t>(emoji_idx, 0, mTotalEmojis - 1);
+
+    updateScrollPos();
 }
 
 void LLPanelEmojiComplete::selectNext()
 {
-	select(mCurSelected + 1 < mEmojis.size() ? mCurSelected + 1 : 0);
+    if (!mTotalEmojis)
+        return;
+
+    mCurSelected = (mCurSelected < mTotalEmojis - 1) ? mCurSelected + 1 : 0;
+
+    updateScrollPos();
 }
 
 void LLPanelEmojiComplete::selectPrevious()
 {
-	select(mCurSelected - 1 >= 0 ? mCurSelected - 1 : mEmojis.size() - 1);
+    if (!mTotalEmojis)
+        return;
+
+    mCurSelected = (mCurSelected && mCurSelected < mTotalEmojis) ? mCurSelected - 1 : mTotalEmojis - 1;
+
+    updateScrollPos();
 }
 
 void LLPanelEmojiComplete::updateConstraints()
 {
     mRenderRect = getLocalRect();
-    S32 ctrlWidth = mRenderRect.getWidth();
-    S32 ctrlHeight = mRenderRect.getHeight();
 
-    mEmojiHeight = mIconFont->getLineHeight() + mPadding * 2;
     mEmojiWidth = mIconFont->getWidthF32(u8"\U0001F431") + mPadding * 2;
     if (mVertical)
     {
-        mVisibleEmojis = ctrlHeight / mEmojiHeight;
-        mRenderRect.mBottom = mRenderRect.mTop - mVisibleEmojis * mEmojiHeight;
+        mEmojiHeight = mIconFont->getLineHeight() + mPadding * 2;
+        if (!mNoScroll && mVisibleEmojis < mTotalEmojis)
+        {
+            mRenderRect.mRight -= mScrollbar->getThickness();
+            mScrollbar->setDocSize(mTotalEmojis);
+            mScrollbar->setPageSize(mVisibleEmojis);
+            mScrollbar->setOrigin(mRenderRect.mRight, 0);
+            mScrollbar->reshape(mScrollbar->getThickness(), mRenderRect.mTop, TRUE);
+            mScrollbar->setVisible(TRUE);
+        }
+        else
+        {
+            mScrollbar->setVisible(FALSE);
+        }
     }
     else
     {
-        mVisibleEmojis = ctrlWidth / mEmojiWidth;
-        S32 padding = (ctrlWidth - mVisibleEmojis * mEmojiWidth) / 2;
-        mRenderRect.mLeft += padding;
-        mRenderRect.mRight -= padding;
-        if (mEmojiHeight > ctrlHeight)
-        {
-            mEmojiHeight = ctrlHeight;
-        }
+        mEmojiHeight = mRenderRect.getHeight();
+        mRenderRect.stretch((mRenderRect.getWidth() - mVisibleEmojis * mEmojiWidth) / -2, 0);
     }
 
     updateScrollPos();
@@ -326,23 +418,27 @@ void LLPanelEmojiComplete::updateConstraints()
 
 void LLPanelEmojiComplete::updateScrollPos()
 {
-	const size_t cntEmoji = mEmojis.size();
-	if (mNoScroll || 0 == cntEmoji || cntEmoji < mVisibleEmojis || 0 == mCurSelected)
-	{
-		mScrollPos = 0;
-		if (mCurSelected >= mVisibleEmojis)
-		{
-			mCurSelected = mVisibleEmojis ? mVisibleEmojis - 1 : 0;
-		}
-	}
-	else if (cntEmoji - 1 == mCurSelected)
-	{
-		mScrollPos = mCurSelected - mVisibleEmojis + 1;
-	}
-	else
-	{
-		mScrollPos = mCurSelected - ((float)mCurSelected / (cntEmoji - 2) * (mVisibleEmojis - 2));
-	}
+    if (mNoScroll || 0 == mTotalEmojis || mTotalEmojis < mVisibleEmojis || 0 == mCurSelected)
+    {
+        mScrollPos = 0;
+        if (mCurSelected >= mVisibleEmojis)
+        {
+            mCurSelected = mVisibleEmojis ? mVisibleEmojis - 1 : 0;
+        }
+    }
+    else if (mTotalEmojis - 1 == mCurSelected)
+    {
+        mScrollPos = mTotalEmojis - mVisibleEmojis;
+    }
+    else
+    {
+        mScrollPos = mCurSelected - ((float)mCurSelected / (mTotalEmojis - 2) * (mVisibleEmojis - 2));
+    }
+
+    if (mScrollbar && mScrollbar->getVisible())
+    {
+        mScrollbar->setDocPos(mScrollPos);
+    }
 }
 
 // ============================================================================
@@ -350,33 +446,33 @@ void LLPanelEmojiComplete::updateScrollPos()
 //
 
 LLFloaterEmojiComplete::LLFloaterEmojiComplete(const LLSD& sdKey)
-	: LLFloater(sdKey)
+    : LLFloater(sdKey)
 {
-	// This floater should hover on top of our dependent (with the dependent having the focus)
-	setFocusStealsFrontmost(false);
-	setAutoFocus(false);
-	setBackgroundVisible(false);
-	setIsChrome(true);
+    // This floater should hover on top of our dependent (with the dependent having the focus)
+    setFocusStealsFrontmost(false);
+    setAutoFocus(false);
+    setBackgroundVisible(false);
+    setIsChrome(true);
 }
 
 BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	bool handled = false;
-	if (MASK_NONE == mask)
-	{
-		switch (key)
-		{
-			case KEY_ESCAPE:
-				LLEmojiHelper::instance().hideHelper();
-				handled = true;
-				break;
-		}
-	}
-
-	if (handled)
-		return TRUE;
-
-	return LLFloater::handleKey(key, mask, called_from_parent);
+    bool handled = false;
+    if (MASK_NONE == mask)
+    {
+        switch (key)
+        {
+            case KEY_ESCAPE:
+                LLEmojiHelper::instance().hideHelper();
+                handled = true;
+                break;
+        }
+    }
+
+    if (handled)
+        return TRUE;
+
+    return LLFloater::handleKey(key, mask, called_from_parent);
 }
 
 void LLFloaterEmojiComplete::onOpen(const LLSD& key)
@@ -402,30 +498,33 @@ void LLFloaterEmojiComplete::onOpen(const LLSD& key)
 
 BOOL LLFloaterEmojiComplete::postBuild()
 {
-	mEmojiCtrl = findChild<LLPanelEmojiComplete>("emoji_complete_ctrl");
-	mEmojiCtrl->setCommitCallback(
-		std::bind([&](const LLSD& sdValue)
-		{
-			setValue(sdValue);
-			onCommit();
-		}, std::placeholders::_2));
-	mEmojiCtrlHorz = getRect().getWidth() - mEmojiCtrl->getRect().getWidth();
-
-	return LLFloater::postBuild();
+    mEmojiCtrl = findChild<LLPanelEmojiComplete>("emoji_complete_ctrl");
+    mEmojiCtrl->setCommitCallback(
+        [this](LLUICtrl* ctrl, const LLSD& param)
+        {
+            setValue(param);
+            onCommit();
+        });
+
+    mEmojiCtrlHorz = getRect().getWidth() - mEmojiCtrl->getRect().getWidth();
+    mEmojiCtrlVert = getRect().getHeight() - mEmojiCtrl->getRect().getHeight();
+
+    return LLFloater::postBuild();
 }
 
 void LLFloaterEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-	if (!called_from_parent)
-	{
-		LLRect rctFloater = getRect(), rctCtrl = mEmojiCtrl->getRect();
-		rctFloater.mRight = rctFloater.mLeft + rctCtrl.getWidth() + mEmojiCtrlHorz;
-		setRect(rctFloater);
-
-		return;
-	}
-
-	LLFloater::reshape(width, height, called_from_parent);
+    if (called_from_parent)
+    {
+        LLFloater::reshape(width, height, called_from_parent);
+    }
+    else
+    {
+        LLRect outer(getRect()), inner(mEmojiCtrl->getRect());
+        outer.mRight = outer.mLeft + inner.getWidth() + mEmojiCtrlHorz;
+        outer.mTop = outer.mBottom + inner.getHeight() + mEmojiCtrlVert;
+        setRect(outer);
+    }
 }
 
 // ============================================================================
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 20d3413765..1af923bda2 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -29,79 +29,83 @@
 #include "llfloater.h"
 #include "lluictrl.h"
 
+class LLScrollbar;
+
 // ============================================================================
 // LLPanelEmojiComplete
 //
 
 class LLPanelEmojiComplete : public LLUICtrl
 {
-	friend class LLUICtrlFactory;
+    friend class LLUICtrlFactory;
 public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<bool>       autosize;
-		Optional<bool>       noscroll;
-		Optional<bool>       vertical;
-		Optional<S32>        max_emoji,
-		                     padding;
+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+    {
+        Optional<bool>       autosize;
+        Optional<bool>       noscroll;
+        Optional<bool>       vertical;
+        Optional<S32>        max_visible,
+                             padding;
 
-		Optional<LLUIImage*> selected_image;
+        Optional<LLUIImage*> selected_image;
 
-		Params();
-	};
+        Params();
+    };
 
 protected:
-	LLPanelEmojiComplete(const LLPanelEmojiComplete::Params&);
+    LLPanelEmojiComplete(const LLPanelEmojiComplete::Params&);
 
 public:
-	virtual ~LLPanelEmojiComplete();
+    virtual ~LLPanelEmojiComplete();
 
-	void draw() override;
-	BOOL handleHover(S32 x, S32 y, MASK mask) override;
-	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
-	BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
-	BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
-	void onCommit() override;
-	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
+    void draw() override;
+    BOOL handleHover(S32 x, S32 y, MASK mask) override;
+    BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
+    BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
+    BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
+    BOOL handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+    void onCommit() override;
+    void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 public:
-	const LLWString& getEmojis() const { return mEmojis; }
-	size_t getEmojiCount() const { return mEmojis.size(); }
-	void setEmojis(const LLWString& emojis);
-	void setEmojiHint(const std::string& hint);
-	bool isAutoSize() const { return mAutoSize; }
-	U32 getMaxShortCodeWidth() const;
+    const LLWString& getEmojis() const { return mEmojis; }
+    size_t getEmojiCount() const { return mEmojis.size(); }
+    void setEmojis(const LLWString& emojis);
+    void setEmojiHint(const std::string& hint);
+    bool isAutoSize() const { return mAutoSize; }
+    U32 getMaxShortCodeWidth() const;
 
 protected:
-	void onEmojisChanged();
-	size_t posToIndex(S32 x, S32 y) const;
-	void select(size_t emoji_idx);
-	void selectNext();
-	void selectPrevious();
-	void updateConstraints();
-	void updateScrollPos();
+    void onEmojisChanged();
+    void onScrollbarChange(S32 index);
+    size_t posToIndex(S32 x, S32 y) const;
+    void select(size_t emoji_idx);
+    void selectNext();
+    void selectPrevious();
+    void updateConstraints();
+    void updateScrollPos();
 
 protected:
-	static constexpr auto npos = std::numeric_limits<size_t>::max();
-
-	const bool      mAutoSize = false;
-	const bool      mNoScroll = false;
-	const bool      mVertical = false;
-	const size_t    mMaxVisible = 0;
-	const S32       mPadding = 8;
-	const LLUIImagePtr mSelectedImage;
-	const LLFontGL* mIconFont;
-	const LLFontGL* mTextFont;
-
-	LLWString       mEmojis;
-	LLRect          mRenderRect;
-	U16             mEmojiWidth = 0;
-	U16             mEmojiHeight = 0;
-	size_t          mVisibleEmojis = 0;
-	size_t          mFirstVisible = 0;
-	size_t          mScrollPos = 0;
-	size_t          mCurSelected = 0;
-	LLVector2       mLastHover;
+    const bool      mAutoSize;
+    const bool      mNoScroll;
+    const bool      mVertical;
+    const size_t    mMaxVisible;
+    const S32       mPadding;
+    const LLUIImagePtr mSelectedImage;
+    const LLFontGL* mIconFont;
+    const LLFontGL* mTextFont;
+
+    LLWString       mEmojis;
+    LLScrollbar*    mScrollbar;
+    LLRect          mRenderRect;
+    U16             mEmojiWidth = 0;
+    U16             mEmojiHeight = 0;
+    size_t          mTotalEmojis = 0;
+    size_t          mVisibleEmojis = 0;
+    size_t          mFirstVisible = 0;
+    size_t          mScrollPos = 0;
+    size_t          mCurSelected = 0;
+    LLVector2       mLastHover;
 };
 
 // ============================================================================
@@ -111,17 +115,18 @@ protected:
 class LLFloaterEmojiComplete : public LLFloater
 {
 public:
-	LLFloaterEmojiComplete(const LLSD& sdKey);
+    LLFloaterEmojiComplete(const LLSD& sdKey);
 
 public:
-	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
-	void onOpen(const LLSD& key) override;
-	BOOL postBuild() override;
-	void reshape(S32 width, S32 height, BOOL called_from_parent) override;
+    BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
+    void onOpen(const LLSD& key) override;
+    BOOL postBuild() override;
+    void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 protected:
-	LLPanelEmojiComplete* mEmojiCtrl = nullptr;
-	S32                   mEmojiCtrlHorz = 0;
+    LLPanelEmojiComplete* mEmojiCtrl = nullptr;
+    S32 mEmojiCtrlHorz = 0;
+    S32 mEmojiCtrlVert = 0;
 };
 
 // ============================================================================
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
index 207a8af118..d290d647e8 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
@@ -3,6 +3,8 @@
  name="emoji_complete"
  single_instance="true"
  layout="topleft"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
  can_close="false"
  can_dock="false"
  can_drag_on_left="false"
@@ -11,6 +13,7 @@
  can_tear_off="false"
  header_height="0"
  legacy_header_height="0"
+ show_title="false"
  width="240"
  height="40"
  >
@@ -20,7 +23,8 @@
 	 layout="topleft"
 	 autosize="true"
 	 vertical="true"
-	 max_emoji="7"
+	 max_visible="7"
+	 padding="4"
 	 width="230"
 	 height="30"
 	 left="5"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index fa65842c28..eb5d88bba6 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -353,7 +353,7 @@
                  name="emoji_recent_icons_ctrl"
                  follows="top|left|right"
                  layout="topleft"
-                 max_emoji="20"
+                 max_visible="20"
                  top="0"
                  left="1"
                  right="-65"
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
index f9db441815..6cc8d7118f 100644
--- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -3,7 +3,7 @@
   autosize="false"
   hover_image="ListItem_Over"
   selected_image="ListItem_Select"
-  max_emoji="7"
+  max_visible="7"
   padding="8"
   >
 </emoji_complete>
-- 
cgit v1.2.3


From 98214577c36d9c8dd0e13c7b678a399b35450bd3 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 5 Oct 2023 11:28:54 +0200
Subject: SL-20390 Emoji Completion floater - ignore symbols in shortcodes when
 searching by pattern

---
 indra/llui/llemojidictionary.cpp       | 64 ++++++++++++++++++++++++++++++
 indra/llui/llemojidictionary.h         | 20 ++++++++++
 indra/newview/llpanelemojicomplete.cpp | 72 ++++++++++++++++++++--------------
 indra/newview/llpanelemojicomplete.h   |  4 +-
 4 files changed, 128 insertions(+), 32 deletions(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index 1ee97ea2d2..bf7e53701d 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -143,6 +143,70 @@ LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
     return result;
 }
 
+void LLEmojiDictionary::findByShortCode(std::vector<LLEmojiSearchResult>& result, const std::string& needle) const
+{
+    result.clear();
+
+    if (needle.empty() || needle.front() != ':')
+        return;
+
+    auto search = [needle](std::size_t& begin, std::size_t& end, const std::string& shortCode) -> bool
+        {
+            begin = 0;
+            end = 1;
+            std::size_t index = 1;
+            // Search for begin
+            char d = tolower(needle[index++]);
+            while (end < shortCode.size())
+            {
+                char s = tolower(shortCode[end++]);
+                if (s == d)
+                {
+                    begin = end - 1;
+                    break;
+                }
+            }
+            if (!begin)
+                return false;
+            // Search for end
+            d = tolower(needle[index++]);
+            while (end < shortCode.size() && index <= needle.size())
+            {
+                char s = tolower(shortCode[end++]);
+                if (s == d)
+                {
+                    if (index == needle.size())
+                        return true;
+                    d = tolower(needle[index++]);
+                    continue;
+                }
+                switch (s)
+                {
+                case L'-':
+                case L'_':
+                case L'+':
+                    continue;
+                }
+                break;
+            }
+            return false;
+        };
+
+    for (const LLEmojiDescriptor& d : mEmojis)
+    {
+        if (d.ShortCodes.empty())
+            continue;
+        const std::string& shortCode = d.ShortCodes.front();
+        if (shortCode.size() < needle.size() || shortCode.front() != needle.front())
+            continue;
+        std::size_t begin, end;
+        if (search(begin, end, shortCode))
+        {
+            result.emplace_back(d.Character, shortCode, begin, end);
+        }
+    }
+}
+
 const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromEmoji(llwchar emoji) const
 {
     const auto it = mEmoji2Descr.find(emoji);
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index f6442684a7..66b564b70a 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -52,6 +52,25 @@ struct LLEmojiGroup
     std::list<std::string> Categories;
 };
 
+// ============================================================================
+// LLEmojiSearchResult class
+//
+
+struct LLEmojiSearchResult
+{
+    llwchar Character;
+    std::string String;
+    std::size_t Begin, End;
+
+    LLEmojiSearchResult(llwchar character, const std::string& string, std::size_t begin, std::size_t end)
+        : Character(character)
+        , String(string)
+        , Begin(begin)
+        , End(end)
+    {
+    }
+};
+
 // ============================================================================
 // LLEmojiDictionary class
 //
@@ -70,6 +89,7 @@ public:
 
     static void initClass();
     LLWString findMatchingEmojis(const std::string& needle) const;
+    void findByShortCode(std::vector<LLEmojiSearchResult>& result, const std::string& needle) const;
     const LLEmojiDescriptor* getDescriptorFromEmoji(llwchar emoji) const;
     const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
     std::string getNameFromEmoji(llwchar ch) const;
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index b03f16899e..22cac8ad88 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -82,7 +82,7 @@ void LLPanelEmojiComplete::draw()
 {
     LLUICtrl::draw();
 
-    if (mEmojis.empty())
+    if (!mTotalEmojis)
         return;
 
     const size_t firstVisibleIdx = mScrollPos;
@@ -115,21 +115,16 @@ void LLPanelEmojiComplete::draw()
 
     for (U32 curIdx = firstVisibleIdx; curIdx < lastVisibleIdx; curIdx++)
     {
-        mIconFont->render(mEmojis, curIdx, iconCenterX, iconCenterY,
+        LLWString text(1, mEmojis[curIdx].Character);
+        mIconFont->render(text, 0, iconCenterX, iconCenterY,
             LLColor4::white, LLFontGL::HCENTER, LLFontGL::VCENTER, LLFontGL::NORMAL,
             LLFontGL::DROP_SHADOW_SOFT, 1, S32_MAX, nullptr, false, true);
         if (mVertical)
         {
-            llwchar emoji = mEmojis[curIdx];
-            auto& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
-            auto it = emoji2descr.find(emoji);
-            if (it != emoji2descr.end())
-            {
-                const std::string& shortCode = it->second->ShortCodes.front();
-                mTextFont->renderUTF8(shortCode, 0, textLeft, iconCenterY, LLColor4::white,
-                    LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                    shortCode.size(), textWidth, NULL, FALSE, FALSE);
-            }
+            const std::string& shortCode = mEmojis[curIdx].String;
+            mTextFont->renderUTF8(shortCode, 0, textLeft, iconCenterY, LLColor4::white,
+                LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
+                shortCode.size(), textWidth, NULL, FALSE, FALSE);
             iconCenterY -= mEmojiHeight;
         }
         else
@@ -257,9 +252,8 @@ void LLPanelEmojiComplete::onCommit()
 {
     if (mCurSelected < mTotalEmojis)
     {
-        LLWString wstr;
-        wstr.push_back(mEmojis.at(mCurSelected));
-        setValue(wstring_to_utf8str(wstr));
+        LLSD value(wstring_to_utf8str(LLWString(1, mEmojis[mCurSelected].Character)));
+        setValue(value);
         LLUICtrl::onCommit();
     }
 }
@@ -272,7 +266,23 @@ void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_paren
 
 void LLPanelEmojiComplete::setEmojis(const LLWString& emojis)
 {
-    mEmojis = emojis;
+    mEmojis.clear();
+
+    auto& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
+    for (const llwchar& emoji : emojis)
+    {
+        std::string shortCode;
+        if (mVertical)
+        {
+            auto it = emoji2descr.find(emoji);
+            if (it != emoji2descr.end() && !it->second->ShortCodes.empty())
+            {
+                shortCode = it->second->ShortCodes.front();
+            }
+        }
+        mEmojis.emplace_back(emoji, shortCode, 0, 0);
+    }
+
     mTotalEmojis = mEmojis.size();
     mCurSelected = 0;
 
@@ -281,12 +291,20 @@ void LLPanelEmojiComplete::setEmojis(const LLWString& emojis)
 
 void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 {
-    llwchar curEmoji = mCurSelected < mTotalEmojis ? mEmojis.at(mCurSelected) : 0;
+    llwchar curEmoji = mCurSelected < mTotalEmojis ? mEmojis[mCurSelected].Character : 0;
 
-    mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint);
+    LLEmojiDictionary::instance().findByShortCode(mEmojis, hint);
     mTotalEmojis = mEmojis.size();
-    size_t curEmojiIdx = curEmoji ? mEmojis.find(curEmoji) : std::string::npos;
-    mCurSelected = std::string::npos != curEmojiIdx ? curEmojiIdx : 0;
+
+    mCurSelected = 0;
+    for (size_t i = 1; i < mTotalEmojis; ++i)
+    {
+        if (mEmojis[i].Character == curEmoji)
+        {
+            mCurSelected = i;
+            break;
+        }
+    }
 
     onEmojisChanged();
 }
@@ -294,18 +312,12 @@ void LLPanelEmojiComplete::setEmojiHint(const std::string& hint)
 U32 LLPanelEmojiComplete::getMaxShortCodeWidth() const
 {
     U32 max_width = 0;
-    auto& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
-    for (llwchar emoji : mEmojis)
+    for (const LLEmojiSearchResult& result : mEmojis)
     {
-        auto it = emoji2descr.find(emoji);
-        if (it != emoji2descr.end())
+        S32 width = mTextFont->getWidth(result.String);
+        if (width > max_width)
         {
-            const std::string& shortCode = it->second->ShortCodes.front();
-            S32 width = mTextFont->getWidth(shortCode);
-            if (width > max_width)
-            {
-                max_width = width;
-            }
+            max_width = width;
         }
     }
     return max_width;
diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h
index 1af923bda2..36a965202e 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -26,6 +26,7 @@
 
 #pragma once
 
+#include "llemojidictionary.h"
 #include "llfloater.h"
 #include "lluictrl.h"
 
@@ -68,7 +69,6 @@ public:
     void reshape(S32 width, S32 height, BOOL called_from_parent) override;
 
 public:
-    const LLWString& getEmojis() const { return mEmojis; }
     size_t getEmojiCount() const { return mEmojis.size(); }
     void setEmojis(const LLWString& emojis);
     void setEmojiHint(const std::string& hint);
@@ -95,7 +95,7 @@ protected:
     const LLFontGL* mIconFont;
     const LLFontGL* mTextFont;
 
-    LLWString       mEmojis;
+    std::vector<LLEmojiSearchResult> mEmojis;
     LLScrollbar*    mScrollbar;
     LLRect          mRenderRect;
     U16             mEmojiWidth = 0;
-- 
cgit v1.2.3


From da783d1750ec8a03d62ddf81a0b44bba1b2f565b Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 5 Oct 2023 14:17:50 +0200
Subject: SL-20389 Emoji Completion floater - highlight the entered part of the
 shortcode

---
 indra/newview/llpanelemojicomplete.cpp | 38 +++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 22cac8ad88..29e1a29ed3 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -108,10 +108,10 @@ void LLPanelEmojiComplete::draw()
         mSelectedImage->draw(x, y, width, height);
     }
 
-    S32 iconCenterX = mRenderRect.mLeft + mEmojiWidth / 2;
-    S32 iconCenterY = mRenderRect.mTop - mEmojiHeight / 2;
-    S32 textLeft = mVertical ? mRenderRect.mLeft + mEmojiWidth + mPadding : 0;
-    S32 textWidth = mVertical ? getRect().getWidth() - textLeft - mPadding : 0;
+    F32 iconCenterX = mRenderRect.mLeft + (F32)mEmojiWidth / 2;
+    F32 iconCenterY = mRenderRect.mTop - (F32)mEmojiHeight / 2;
+    F32 textLeft = mVertical ? mRenderRect.mLeft + mEmojiWidth + mPadding : 0;
+    F32 textWidth = mVertical ? getRect().getWidth() - textLeft - mPadding : 0;
 
     for (U32 curIdx = firstVisibleIdx; curIdx < lastVisibleIdx; curIdx++)
     {
@@ -122,9 +122,33 @@ void LLPanelEmojiComplete::draw()
         if (mVertical)
         {
             const std::string& shortCode = mEmojis[curIdx].String;
-            mTextFont->renderUTF8(shortCode, 0, textLeft, iconCenterY, LLColor4::white,
-                LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                shortCode.size(), textWidth, NULL, FALSE, FALSE);
+            F32 x0 = textLeft;
+            F32 x1 = textWidth;
+            if (mEmojis[curIdx].Begin)
+            {
+                std::string text = shortCode.substr(0, mEmojis[curIdx].Begin);
+                mTextFont->renderUTF8(text, 0, x0, iconCenterY, LLColor4::white,
+                    LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
+                    text.size(), x1, NULL, FALSE, FALSE);
+                x0 += mTextFont->getWidthF32(text);
+                x1 = textLeft + textWidth - x0;
+            }
+            if (x1 > 0 && mEmojis[curIdx].End > mEmojis[curIdx].Begin)
+            {
+                std::string text = shortCode.substr(mEmojis[curIdx].Begin, mEmojis[curIdx].End - mEmojis[curIdx].Begin);
+                mTextFont->renderUTF8(text, 0, x0, iconCenterY, LLColor4::yellow6,
+                    LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
+                    text.size(), x1, NULL, FALSE, FALSE);
+                x0 += mTextFont->getWidthF32(text);
+                x1 = textLeft + textWidth - x0;
+            }
+            if (x1 > 0 && mEmojis[curIdx].End < shortCode.size())
+            {
+                std::string text = shortCode.substr(mEmojis[curIdx].End);
+                mTextFont->renderUTF8(text, 0, x0, iconCenterY, LLColor4::white,
+                    LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
+                    text.size(), x1, NULL, FALSE, FALSE);
+            }
             iconCenterY -= mEmojiHeight;
         }
         else
-- 
cgit v1.2.3


From f9a4266e2ffd49e38d2d9bb536cd6af5009c4868 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 5 Oct 2023 18:30:34 +0200
Subject: SL-20355 Sort completion suggestions by position of the search
 pattern

---
 indra/llui/llemojidictionary.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index bf7e53701d..e29f3436cf 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -192,6 +192,8 @@ void LLEmojiDictionary::findByShortCode(std::vector<LLEmojiSearchResult>& result
             return false;
         };
 
+    std::map<std::size_t, std::vector<LLEmojiSearchResult>> results;
+
     for (const LLEmojiDescriptor& d : mEmojis)
     {
         if (d.ShortCodes.empty())
@@ -202,9 +204,18 @@ void LLEmojiDictionary::findByShortCode(std::vector<LLEmojiSearchResult>& result
         std::size_t begin, end;
         if (search(begin, end, shortCode))
         {
-            result.emplace_back(d.Character, shortCode, begin, end);
+            results[begin].emplace_back(d.Character, shortCode, begin, end);
         }
     }
+
+    for (const auto& it : results)
+    {
+#ifdef __cpp_lib_containers_ranges
+        result.append_range(it.second);
+#else
+        result.insert(result.end(), it.second.cbegin(), it.second.cend());
+#endif
+    }
 }
 
 const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromEmoji(llwchar emoji) const
-- 
cgit v1.2.3


From 4bff25310163ec58c25c462a218e2ad94d87a093 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 5 Oct 2023 01:14:30 +0300
Subject: SL-19311 Grey textures after teleport

---
 indra/newview/lltexturefetch.cpp | 100 ++++++++++++++++++++++++++++++++-------
 1 file changed, 84 insertions(+), 16 deletions(-)

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index a1beec7c1f..d1ab019a3e 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -259,6 +259,10 @@ static const S32 HTTP_NONPIPE_REQUESTS_LOW_WATER = 20;
 // request (e.g. 'Range: <start>-') which seems to fix the problem.
 static const S32 HTTP_REQUESTS_RANGE_END_MAX = 20000000;
 
+// stop after 720 seconds, might be overkill, but cap request can keep going forever.
+static const S32 MAX_CAP_MISSING_RETRIES = 720;
+static const S32 CAP_MISSING_EXPIRATION_DELAY = 1; // seconds
+
 //////////////////////////////////////////////////////////////////////////////
 namespace
 {
@@ -554,6 +558,7 @@ private:
 
 	e_state mState;
 	void setState(e_state new_state);
+    LLViewerRegion* getRegion();
 
 	e_write_to_cache_state mWriteToCacheState;
 	LLTextureFetch* mFetcher;
@@ -610,6 +615,10 @@ private:
 	LLCore::HttpStatus mGetStatus;
 	std::string mGetReason;
 	LLAdaptiveRetryPolicy mFetchRetryPolicy;
+    bool mCanUseCapability;
+    LLTimer mRegionRetryTimer;
+    S32 mRegionRetryAttempt;
+    LLUUID mLastRegionId;
 
 	
 	// Work Data
@@ -960,7 +969,9 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
 	  mCacheReadCount(0U),
 	  mCacheWriteCount(0U),
 	  mResourceWaitCount(0U),
-	  mFetchRetryPolicy(10.0,3600.0,2.0,10)
+      mFetchRetryPolicy(10.0, 3600.0,2.0,10),
+      mCanUseCapability(true),
+      mRegionRetryAttempt(0)
 {
 	calcWorkPriority();
 	mType = host.isOk() ? LLImageBase::TYPE_AVATAR_BAKE : LLImageBase::TYPE_NORMAL;
@@ -1138,6 +1149,19 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			return true; // abort
 		}
 	}
+    if (mState > CACHE_POST && !mCanUseCapability && mCanUseHTTP)
+    {
+        if (mRegionRetryAttempt > MAX_CAP_MISSING_RETRIES)
+        {
+            mCanUseHTTP = false;
+        }
+        else if (!mRegionRetryTimer.hasExpired())
+        {
+            setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+            return false;
+        }
+        // else retry
+    }
 	if(mState > CACHE_POST && !mCanUseHTTP)
 	{
 		//nowhere to get data, abort.
@@ -1341,16 +1365,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 // 		if (mHost.isInvalid()) get_url = false;
 		if ( use_http && mCanUseHTTP && mUrl.empty())//get http url.
 		{
-			LLViewerRegion* region = NULL;
-            if (mHost.isInvalid())
-            {
-                region = gAgent.getRegion();
-            }
-            else if (LLWorld::instanceExists())
-            {
-                region = LLWorld::getInstance()->getRegion(mHost);
-            }
-
+			LLViewerRegion* region = getRegion();
 			if (region)
 			{
 				std::string http_url = region->getViewerAssetUrl();
@@ -1363,19 +1378,29 @@ bool LLTextureFetchWorker::doWork(S32 param)
 					setUrl(http_url + "/?texture_id=" + mID.asString().c_str());
 					LL_DEBUGS(LOG_TXT) << "Texture URL: " << mUrl << LL_ENDL;
 					mWriteToCacheState = CAN_WRITE ; //because this texture has a fixed texture id.
+                    mCanUseCapability = true;
+                    mRegionRetryAttempt = 0;
+                    mLastRegionId = region->getRegionID();
 				}
 				else
 				{
-					mCanUseHTTP = false ;
-					LL_WARNS(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
+					mCanUseCapability = false;
+                    mRegionRetryAttempt++;
+                    mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
+                    setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+                    // ex: waiting for caps
+					LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
 				}
 			}
 			else
 			{
+                mCanUseCapability = false;
+                mRegionRetryAttempt++;
+                mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
+                setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
 				// This will happen if not logged in or if a region deoes not have HTTP Texture enabled
 				//LL_WARNS(LOG_TXT) << "Region not found for host: " << mHost << LL_ENDL;
-                LL_WARNS(LOG_TXT) << "Texture not available via HTTP: no region " << mUrl << LL_ENDL;
-				mCanUseHTTP = false;
+                LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: no region " << mUrl << LL_ENDL;
 			}
 		}
 		else if (mFTType == FTT_SERVER_BAKE)
@@ -1383,7 +1408,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			mWriteToCacheState = CAN_WRITE;
 		}
 
-		if (mCanUseHTTP && !mUrl.empty())
+		if (mCanUseCapability && mCanUseHTTP && !mUrl.empty())
 		{
 			setState(WAIT_HTTP_RESOURCE);
 			setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
@@ -1586,10 +1611,39 @@ bool LLTextureFetchWorker::doWork(S32 param)
 						}
 						return true; 
 					}
+
+                    if (mCanUseHTTP && !mUrl.empty() && cur_size <= 0)
+                    {
+                        LLViewerRegion* region = getRegion();
+                        if (!region || mLastRegionId != region->getRegionID())
+                        {
+                            // cap failure? try on new region.
+                            mUrl.clear();
+                            ++mRetryAttempt;
+                            mLastRegionId.setNull();
+                            setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                            setState(INIT);
+                            return false;
+                        }
+                    }
 				}
 				else if (http_service_unavail == mGetStatus)
 				{
 					LL_INFOS_ONCE(LOG_TXT) << "Texture server busy (503): " << mUrl << LL_ENDL;
+                    if (mCanUseHTTP && !mUrl.empty() && cur_size <= 0)
+                    {
+                        LLViewerRegion* region = getRegion();
+                        if (!region || mLastRegionId != region->getRegionID())
+                        {
+                            // try on new region.
+                            mUrl.clear();
+                            ++mRetryAttempt;
+                            mLastRegionId.setNull();
+                            setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                            setState(INIT);
+                            return false;
+                        }
+                    }
 				}
 				else if (http_not_sat == mGetStatus)
 				{
@@ -3125,6 +3179,20 @@ void LLTextureFetchWorker::setState(e_state new_state)
 	mState = new_state;
 }
 
+LLViewerRegion* LLTextureFetchWorker::getRegion()
+{
+    LLViewerRegion* region = NULL;
+    if (mHost.isInvalid())
+    {
+        region = gAgent.getRegion();
+    }
+    else if (LLWorld::instanceExists())
+    {
+        region = LLWorld::getInstance()->getRegion(mHost);
+    }
+    return region;
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 // Threads:  T*
-- 
cgit v1.2.3


From 13fe9744d7fb005ec37c05eae70e9bb2c518cb88 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 6 Oct 2023 22:50:04 +0200
Subject: SL-20420 Emoji - Increase nearby chat history buffer size

---
 indra/newview/lllogchat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index ba82ff0b0f..07825c1b0c 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -59,7 +59,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/local_time_adjustor.hpp>
 
-const S32 LOG_RECALL_SIZE = 2048;
+const S32 LOG_RECALL_SIZE = 20480;
 
 const std::string LL_IM_TIME("time");
 const std::string LL_IM_DATE_TIME("datetime");
-- 
cgit v1.2.3


From 393896be1641758ccc45ebedc1e34e0b751dfd5f Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 6 Oct 2023 22:50:04 +0200
Subject: SL-20420 Emoji - Increase nearby chat history buffer size

---
 indra/newview/lllogchat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index ba82ff0b0f..07825c1b0c 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -59,7 +59,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/local_time_adjustor.hpp>
 
-const S32 LOG_RECALL_SIZE = 2048;
+const S32 LOG_RECALL_SIZE = 20480;
 
 const std::string LL_IM_TIME("time");
 const std::string LL_IM_DATE_TIME("datetime");
-- 
cgit v1.2.3


From eb7ab130003ce1e8f005e3a0d4263987f08759ac Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 9 Oct 2023 23:39:45 +0200
Subject: SL-20288 Lags in Appearance floater

---
 indra/newview/lloutfitslist.cpp | 89 ++++++++++++++++++++++++++++++++++-------
 indra/newview/lloutfitslist.h   | 14 ++++++-
 2 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 5c7792b0df..8042b87a44 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -835,7 +835,6 @@ void LLOutfitListBase::onOpen(const LLSD& info)
         // arrive.
         category->fetch();
         refreshList(outfits);
-        highlightBaseOutfit();
 
         mIsInitialized = true;
     }
@@ -843,6 +842,9 @@ void LLOutfitListBase::onOpen(const LLSD& info)
 
 void LLOutfitListBase::refreshList(const LLUUID& category_id)
 {
+    bool wasNull = mRefreshListState.CategoryUUID.isNull();
+    mRefreshListState.CategoryUUID.setNull();
+
     LLInventoryModel::cat_array_t cat_array;
     LLInventoryModel::item_array_t item_array;
 
@@ -855,27 +857,81 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id)
         LLInventoryModel::EXCLUDE_TRASH,
         is_category);
 
-    uuid_vec_t vadded;
-    uuid_vec_t vremoved;
+    // Memorize item names for each UUID
+    std::map<LLUUID, std::string> names;
+    for (const LLPointer<LLViewerInventoryCategory>& cat : cat_array)
+    {
+        names.emplace(std::make_pair(cat->getUUID(), cat->getName()));
+    }
+
+    // Fill added and removed items vectors.
+    mRefreshListState.Added.clear();
+    mRefreshListState.Removed.clear();
+    computeDifference(cat_array, mRefreshListState.Added, mRefreshListState.Removed);
+    // Sort added items vector by item name.
+    std::sort(mRefreshListState.Added.begin(), mRefreshListState.Added.end(),
+        [names](const LLUUID& a, const LLUUID& b)
+        {
+            return LLStringUtil::compareDict(names.at(a), names.at(b)) < 0;
+        });
+    // Initialize iterators for added and removed items vectors.
+    mRefreshListState.AddedIterator = mRefreshListState.Added.begin();
+    mRefreshListState.RemovedIterator = mRefreshListState.Removed.begin();
+
+    LL_INFOS() << "added: " << mRefreshListState.Added.size() <<
+        ", removed: " << mRefreshListState.Removed.size() <<
+        ", changed: " << gInventory.getChangedIDs().size() <<
+        LL_ENDL;
+
+    mRefreshListState.CategoryUUID = category_id;
+    if (wasNull)
+    {
+        gIdleCallbacks.addFunction(onIdle, this);
+    }
+}
+
+// static
+void LLOutfitListBase::onIdle(void* userdata)
+{
+    LLOutfitListBase* self = (LLOutfitListBase*)userdata;
+
+    self->onIdleRefreshList();
+}
+
+void LLOutfitListBase::onIdleRefreshList()
+{
+    if (mRefreshListState.CategoryUUID.isNull())
+        return;
 
-    // Create added and removed items vectors.
-    computeDifference(cat_array, vadded, vremoved);
+    const F64 MAX_TIME = 0.05f;
+    F64 curent_time = LLTimer::getTotalSeconds();
+    const F64 end_time = curent_time + MAX_TIME;
 
     // Handle added tabs.
-    for (uuid_vec_t::const_iterator iter = vadded.begin();
-        iter != vadded.end();
-        ++iter)
+    while (mRefreshListState.AddedIterator < mRefreshListState.Added.end())
     {
-        const LLUUID cat_id = (*iter);
+        const LLUUID cat_id = (*mRefreshListState.AddedIterator++);
         updateAddedCategory(cat_id);
+
+        curent_time = LLTimer::getTotalSeconds();
+        if (curent_time >= end_time)
+            return;
     }
+    mRefreshListState.Added.clear();
+    mRefreshListState.AddedIterator = mRefreshListState.Added.end();
 
     // Handle removed tabs.
-    for (uuid_vec_t::const_iterator iter = vremoved.begin(); iter != vremoved.end(); ++iter)
+    while (mRefreshListState.RemovedIterator < mRefreshListState.Removed.end())
     {
-        const LLUUID cat_id = (*iter);
+        const LLUUID cat_id = (*mRefreshListState.RemovedIterator++);
         updateRemovedCategory(cat_id);
+
+        curent_time = LLTimer::getTotalSeconds();
+        if (curent_time >= end_time)
+            return;
     }
+    mRefreshListState.Removed.clear();
+    mRefreshListState.RemovedIterator = mRefreshListState.Removed.end();
 
     // Get changed items from inventory model and update outfit tabs
     // which might have been renamed.
@@ -888,9 +944,9 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id)
         if (!cat)
         {
             LLInventoryObject* obj = gInventory.getObject(*items_iter);
-            if(!obj || (obj->getType() != LLAssetType::AT_CATEGORY))
+            if (!obj || (obj->getType() != LLAssetType::AT_CATEGORY))
             {
-                return;
+                break;
             }
             cat = (LLViewerInventoryCategory*)obj;
         }
@@ -900,6 +956,12 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id)
     }
 
     sortOutfits();
+    highlightBaseOutfit();
+
+    gIdleCallbacks.deleteFunction(onIdle, this);
+    mRefreshListState.CategoryUUID.setNull();
+
+    LL_INFOS() << "done" << LL_ENDL;
 }
 
 void LLOutfitListBase::computeDifference(
@@ -936,7 +998,6 @@ void LLOutfitListBase::highlightBaseOutfit()
         mHighlightedOutfitUUID = base_id;
         onHighlightBaseOutfit(base_id, prev_id);
     }
-
 }
 
 void LLOutfitListBase::removeSelected()
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index 66b3165169..7d212420a2 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -116,8 +116,20 @@ protected:
     void onOutfitsRemovalConfirmation(const LLSD& notification, const LLSD& response);
     virtual void onChangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id) = 0;
 
+    static void onIdle(void* userdata);
+    void onIdleRefreshList();
+
+    struct
+    {
+        LLUUID						CategoryUUID;
+        uuid_vec_t					Added;
+        uuid_vec_t					Removed;
+        uuid_vec_t::const_iterator	AddedIterator;
+        uuid_vec_t::const_iterator	RemovedIterator;
+    } mRefreshListState;
+
     bool                            mIsInitialized;
-    LLInventoryCategoriesObserver* 	mCategoriesObserver;    
+    LLInventoryCategoriesObserver* 	mCategoriesObserver;
     LLUUID							mSelectedOutfitUUID;
     // id of currently highlited outfit
     LLUUID							mHighlightedOutfitUUID;
-- 
cgit v1.2.3


From dc2fc3488d8d1ebb2e90520dd17325f08b7c538b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 10 Oct 2023 22:32:11 +0300
Subject: Revert "SL-18721 Viewer shutdown order changes"

This reverts commit edf0874e0656c6f512df50ee52236209531ca329.
Reverted since it causes a significant uptick in shutdown freezes.
Can't repro those freezes, will seek an alternate solution.
---
 indra/llcommon/threadpool.cpp    | 12 ++----------
 indra/llcommon/threadpool.h      |  3 +--
 indra/llwindow/llwindowwin32.cpp |  3 +--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index 22bbff4478..d5adf11264 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -21,12 +21,11 @@
 #include "llevents.h"
 #include "stringize.h"
 
-LL::ThreadPool::ThreadPool(const std::string& name, size_t threads, size_t capacity, bool auto_shutdown):
+LL::ThreadPool::ThreadPool(const std::string& name, size_t threads, size_t capacity):
     super(name),
     mQueue(name, capacity),
     mName("ThreadPool:" + name),
-    mThreadCount(threads),
-    mAutomaticShutdown(auto_shutdown)
+    mThreadCount(threads)
 {}
 
 void LL::ThreadPool::start()
@@ -40,13 +39,6 @@ void LL::ThreadPool::start()
                 run(tname);
             });
     }
-
-    // Some threads might need to run longer than LLEventPumps
-    if (!mAutomaticShutdown)
-    {
-        return;
-    }
-
     // Listen on "LLApp", and when the app is shutting down, close the queue
     // and join the workers.
     LLEventPumps::instance().obtain("LLApp").listen(
diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index 22c875edb9..f8eec3b457 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -31,7 +31,7 @@ namespace LL
          * Pass ThreadPool a string name. This can be used to look up the
          * relevant WorkQueue.
          */
-        ThreadPool(const std::string& name, size_t threads=1, size_t capacity=1024, bool auto_shutdown = true);
+        ThreadPool(const std::string& name, size_t threads=1, size_t capacity=1024);
         virtual ~ThreadPool();
 
         /**
@@ -66,7 +66,6 @@ namespace LL
         std::string mName;
         size_t mThreadCount;
         std::vector<std::pair<std::string, std::thread>> mThreads;
-        bool mAutomaticShutdown;
     };
 
 } // namespace LL
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 01e38fcc9d..2e560ddb0a 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -828,7 +828,6 @@ void LLWindowWin32::close()
 	// Is window is already closed?
 	if (!mWindowHandle)
 	{
-        mWindowThread->close();
 		return;
 	}
 
@@ -4591,7 +4590,7 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList()
 #endif // LL_WINDOWS
 
 inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
-    : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, false)
+    : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE)
 {
     ThreadPool::start();
 }
-- 
cgit v1.2.3


From fa5a705f6e699d3ae2b7314c2140fae52ececb4f Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 10 Oct 2023 22:52:59 +0300
Subject: DRTVWR-588 Update viewer-manager to 3.0-f48e635

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 7181d91579..f87d52bcae 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2701,11 +2701,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6db9317ed29ccb00c2f75758f4aa2d4cd8784f46</string>
+              <string>a11c32c702f6df94dcdd69aabdafe40d7f25a7ae</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-83fb46a/viewer_manager-3.0-83fb46a-darwin64-83fb46a.tar.zst</string>
+              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0.f48e635/viewer_manager-3.0-f48e635-darwin64-f48e635.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2715,11 +2715,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>426d3b30681b747056027ca21136ae56b188cd47</string>
+              <string>10aa6f8a4161b32ba2de7ab37ccd693e7ee5b11d</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-83fb46a/viewer_manager-3.0-83fb46a-linux64-83fb46a.tar.zst</string>
+              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0.f48e635/viewer_manager-3.0-f48e635-linux64-f48e635.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2741,11 +2741,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fe8e9ee00f53f11a7417a7bcf1db069e25dace5d</string>
+              <string>15b7238af86d9b3a29ae4a7158ea5c1838f4252e</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0-83fb46a/viewer_manager-3.0-83fb46a-windows64-83fb46a.tar.zst</string>
+              <string>https://github.com/secondlife/viewer-manager/releases/download/v3.0.f48e635/viewer_manager-3.0-f48e635-windows64-f48e635.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -2756,7 +2756,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>source_type</key>
         <string>hg</string>
         <key>version</key>
-        <string>3.0-83fb46a</string>
+        <string>3.0-f48e635</string>
       </map>
       <key>vlc-bin</key>
       <map>
-- 
cgit v1.2.3


From e9ffe7ee471a2bbe428ec6a3ad07a7ef998c2e36 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 10 Oct 2023 23:18:41 +0200
Subject: SL-20288 Lags in Appearance floater (code format in LLAccordionCtrl)

---
 indra/llui/llaccordionctrl.cpp    | 330 ++++++++++++++++-----------------
 indra/llui/llaccordionctrl.h      |   2 +-
 indra/llui/llaccordionctrltab.cpp | 371 ++++++++++++++++++++------------------
 indra/llui/llaccordionctrltab.h   |   2 +-
 indra/llui/llflatlistview.cpp     |  52 +++---
 5 files changed, 387 insertions(+), 370 deletions(-)

diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index 809d72208f..0a82bed896 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -60,7 +60,7 @@ LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params)
 	initNoTabsWidget(params.no_matched_tabs_text);
 
 	mSingleExpansion = params.single_expansion;
-	if(mFitParent && !mSingleExpansion)
+	if (mFitParent && !mSingleExpansion)
 	{
 		LL_INFOS() << "fit_parent works best when combined with single_expansion" << LL_ENDL;
 	}
@@ -102,14 +102,13 @@ void LLAccordionCtrl::draw()
 	LLPanel::draw();
 }
 
-
 //---------------------------------------------------------------------------------
 BOOL LLAccordionCtrl::postBuild()
 {
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
 
 	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
+	scroll_rect.setOriginAndSize(
 		getRect().getWidth() - scrollbar_size,
 		1,
 		scrollbar_size,
@@ -126,39 +125,42 @@ BOOL LLAccordionCtrl::postBuild()
 	sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
 	sbparams.change_callback(boost::bind(&LLAccordionCtrl::onScrollPosChangeCallback, this, _1, _2));
 	
-	mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
-	LLView::addChild( mScrollbar );
-	mScrollbar->setVisible( false );
+	mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
+	LLView::addChild(mScrollbar);
+	mScrollbar->setVisible(FALSE);
 	mScrollbar->setFollowsRight();
 	mScrollbar->setFollowsTop();
 	mScrollbar->setFollowsBottom();
 
 	//if it was created from xml...
 	std::vector<LLUICtrl*> accordion_tabs;
-	for(child_list_const_iter_t it = getChildList()->begin(); 
+	for (child_list_const_iter_t it = getChildList()->begin(); 
 		getChildList()->end() != it; ++it)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(*it);
-		if(accordion_tab == NULL)
+		if (accordion_tab == NULL)
 			continue;
-		if(std::find(mAccordionTabs.begin(),mAccordionTabs.end(),accordion_tab) == mAccordionTabs.end())
+		if (std::find(mAccordionTabs.begin(), mAccordionTabs.end(), accordion_tab) == mAccordionTabs.end())
 		{
 			accordion_tabs.push_back(accordion_tab);
 		}
 	}
 
-	for(std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();it!=accordion_tabs.rend();++it)
+	for (std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();
+		it < accordion_tabs.rend(); ++it)
+	{
 		addCollapsibleCtrl(*it);
+	}
 
-	arrange	();
+	arrange();
 
-	if(mSingleExpansion)
+	if (mSingleExpansion)
 	{
-		if(!mAccordionTabs[0]->getDisplayChildren())
+		if (!mAccordionTabs[0]->getDisplayChildren())
 			mAccordionTabs[0]->setDisplayChildren(true);
-		for(size_t i=1;i<mAccordionTabs.size();++i)
+		for (size_t i = 1; i < mAccordionTabs.size(); ++i)
 		{
-			if(mAccordionTabs[i]->getDisplayChildren())
+			if (mAccordionTabs[i]->getDisplayChildren())
 				mAccordionTabs[i]->setDisplayChildren(false);
 		}
 	}
@@ -205,23 +207,22 @@ BOOL LLAccordionCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::shiftAccordionTabs(S16 panel_num, S32 delta)
 {
-	for(size_t i = panel_num; i < mAccordionTabs.size(); i++ )
+	for (size_t i = panel_num; i < mAccordionTabs.size(); ++i)
 	{
 		ctrlShiftVertical(mAccordionTabs[i],delta);
 	}	
 }
 
-
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num) 
 {
-	if(mSingleExpansion)
+	if (mSingleExpansion)
 	{
-		for(size_t i=0;i<mAccordionTabs.size();++i)
+		for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 		{
-			if(i==panel_num)
+			if (i == panel_num)
 				continue;
-			if(mAccordionTabs[i]->getDisplayChildren())
+			if (mAccordionTabs[i]->getDisplayChildren())
 				mAccordionTabs[i]->setDisplayChildren(false);
 		}
 
@@ -232,64 +233,63 @@ void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num)
 void LLAccordionCtrl::show_hide_scrollbar(S32 width, S32 height)
 {
 	calcRecuiredHeight();
-	if(getRecuiredHeight() > height )
-		showScrollbar(width,height);
+	if (getRecuiredHeight() > height)
+		showScrollbar(width, height);
 	else
-		hideScrollbar(width,height);
+		hideScrollbar(width, height);
 }
 
-void	LLAccordionCtrl::showScrollbar(S32 width, S32 height)
+void LLAccordionCtrl::showScrollbar(S32 width, S32 height)
 {
 	bool was_visible = mScrollbar->getVisible();
 
-	mScrollbar->setVisible(true);
+	mScrollbar->setVisible(TRUE);
 	
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	ctrlSetLeftTopAndSize(mScrollbar
-		,width-scrollbar_size - PARENT_BORDER_MARGIN/2
-		,height-PARENT_BORDER_MARGIN
-		,scrollbar_size
-		,height-2*PARENT_BORDER_MARGIN);
+		, width - scrollbar_size - PARENT_BORDER_MARGIN / 2
+		, height - PARENT_BORDER_MARGIN
+		, scrollbar_size
+		, height - PARENT_BORDER_MARGIN * 2);
 	
 	mScrollbar->setPageSize(height);
-	mScrollbar->setDocParams(mInnerRect.getHeight(),mScrollbar->getDocPos());
+	mScrollbar->setDocParams(mInnerRect.getHeight(), mScrollbar->getDocPos());
 
-	if(was_visible)
+	if (was_visible)
 	{
 		S32 scroll_pos = llmin(mScrollbar->getDocPos(), getRecuiredHeight() - height - 1);
 		mScrollbar->setDocPos(scroll_pos);
 	}
 }
 
-void	LLAccordionCtrl::hideScrollbar( S32 width, S32 height )
+void LLAccordionCtrl::hideScrollbar(S32 width, S32 height)
 {
-	if(mScrollbar->getVisible() == false)
+	if (mScrollbar->getVisible() == FALSE)
 		return;
-	mScrollbar->setVisible(false);
+	mScrollbar->setVisible(FALSE);
 
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	S32 panel_width = width - 2*BORDER_MARGIN;
 
-	//reshape all accordeons and shift all draggers
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	// Reshape all accordions and shift all draggers
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLRect panel_rect = mAccordionTabs[i]->getRect();
-		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_rect.mTop,panel_width,panel_rect.getHeight());
+		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_rect.mTop, panel_width, panel_rect.getHeight());
 	}
 
 	mScrollbar->setDocPos(0);
 
-	if(mAccordionTabs.size()>0)
+	if (!mAccordionTabs.empty())
 	{
-		S32 panel_top = height - BORDER_MARGIN;		  // Top coordinate of the first panel
+		S32 panel_top = height - BORDER_MARGIN; // Top coordinate of the first panel
 		S32 diff = panel_top - mAccordionTabs[0]->getRect().mTop;
-		shiftAccordionTabs(0,diff);
+		shiftAccordionTabs(0, diff);
 	}
 }
 
-
 //---------------------------------------------------------------------------------
 S32 LLAccordionCtrl::calcRecuiredHeight()
 {
@@ -305,7 +305,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
 		}
 	}
 
-	mInnerRect.setLeftTopAndSize(0,rec_height + BORDER_MARGIN*2,getRect().getWidth(),rec_height + BORDER_MARGIN);
+	mInnerRect.setLeftTopAndSize(0, rec_height + BORDER_MARGIN * 2, getRect().getWidth(), rec_height + BORDER_MARGIN);
 
 	return mInnerRect.getHeight();
 }
@@ -313,7 +313,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	LLRect panel_rect = panel->getRect();
 	panel_rect.setLeftTopAndSize( left, top, width, height);
@@ -321,9 +321,9 @@ void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S3
 	panel->setRect(panel_rect);
 }
 
-void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
+void LLAccordionCtrl::ctrlShiftVertical(LLView* panel, S32 delta)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	panel->translate(0,delta);
 }
@@ -333,9 +333,9 @@ void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
 void LLAccordionCtrl::addCollapsibleCtrl(LLView* view)
 {
 	LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(view);
-	if(!accordion_tab)
+	if (!accordion_tab)
 		return;
-	if(std::find(beginChild(), endChild(), accordion_tab) == endChild())
+	if (std::find(beginChild(), endChild(), accordion_tab) == endChild())
 		addChild(accordion_tab);
 	mAccordionTabs.push_back(accordion_tab);
 
@@ -369,7 +369,7 @@ void LLAccordionCtrl::removeCollapsibleCtrl(LLView* view)
 	}
 }
 
-void	LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
+void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
 {
 	LLTextBox::Params tp = tb_params;
 	tp.rect(getLocalRect());
@@ -377,39 +377,39 @@ void	LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
 	mNoVisibleTabsHelpText = LLUICtrlFactory::create<LLTextBox>(tp, this);
 }
 
-void	LLAccordionCtrl::updateNoTabsHelpTextVisibility()
+void LLAccordionCtrl::updateNoTabsHelpTextVisibility()
 {
 	bool visible_exists = false;
 	std::vector<LLAccordionCtrlTab*>::const_iterator it = mAccordionTabs.begin();
 	const std::vector<LLAccordionCtrlTab*>::const_iterator it_end = mAccordionTabs.end();
-	for (; it != it_end; ++it)
+	while (it < it_end)
 	{
-		if ((*it)->getVisible())
+		if ((*(it++))->getVisible())
 		{
 			visible_exists = true;
 			break;
 		}
 	}
 
-	mNoVisibleTabsHelpText->setVisible(!visible_exists);
+	mNoVisibleTabsHelpText->setVisible(visible_exists ? FALSE : TRUE);
 }
 
-void	LLAccordionCtrl::arrangeSinge()
+void LLAccordionCtrl::arrangeSingle()
 {
-	S32 panel_left = BORDER_MARGIN;	  // Margin from left side of Splitter
-	S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-	S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+	S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
+	S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+	S32 panel_width = getRect().getWidth() - 4;
 	S32 panel_height;
 
 	S32 collapsed_height = 0;
 
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			collapsed_height+=mAccordionTabs[i]->getRect().getHeight();
 		}
@@ -417,28 +417,28 @@ void	LLAccordionCtrl::arrangeSinge()
 
 	S32 expanded_height = getRect().getHeight() - BORDER_MARGIN - collapsed_height;
 	
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			panel_height = accordion_tab->getRect().getHeight();
 		}
 		else
 		{
-			if(mFitParent)
+			if (mFitParent)
 			{
 				panel_height = expanded_height;
 			}
 			else
 			{
-				if(accordion_tab->getAccordionView())
+				if (accordion_tab->getAccordionView())
 				{
 					panel_height = accordion_tab->getAccordionView()->getRect().getHeight() + 
-						accordion_tab->getHeaderHeight() + 2*BORDER_MARGIN;
+						accordion_tab->getHeaderHeight() + BORDER_MARGIN * 2;
 				}
 				else
 				{
@@ -451,67 +451,67 @@ void	LLAccordionCtrl::arrangeSinge()
 		panel_height = llmax(panel_height, accordion_tab->getHeaderHeight());
 
 		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
-		panel_top-=mAccordionTabs[i]->getRect().getHeight();
+		panel_top -= mAccordionTabs[i]->getRect().getHeight();
 	}
 
 	show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
-void	LLAccordionCtrl::arrangeMultiple()
+void LLAccordionCtrl::arrangeMultiple()
 {
-	S32 panel_left = BORDER_MARGIN;	  // Margin from left side of Splitter
-	S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-	S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+	S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
+	S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+	S32 panel_width = getRect().getWidth() - 4;
 
 	//Calculate params	
-	for(size_t i = 0; i < mAccordionTabs.size(); i++ )
+	for (size_t i = 0; i < mAccordionTabs.size(); i++ )
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
 		
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, accordion_tab->getRect().getHeight());
-			panel_top-=mAccordionTabs[i]->getRect().getHeight();
+			panel_top -= mAccordionTabs[i]->getRect().getHeight();
 		}
 		else
 		{
 			S32 panel_height = accordion_tab->getRect().getHeight();
 			
-			if(mFitParent)
+			if (mFitParent)
 			{
-				// all expanded tabs will have equal height
+				// All expanded tabs will have equal height
 				panel_height = calcExpandedTabHeight(i, panel_top);
 				ctrlSetLeftTopAndSize(accordion_tab, panel_left, panel_top, panel_width, panel_height);
 
-				// try to make accordion tab fit accordion view height.
+				// Try to make accordion tab fit accordion view height.
 				// Accordion View should implement getRequiredRect() and provide valid height
 				S32 optimal_height = accordion_tab->getAccordionView()->getRequiredRect().getHeight();
 				optimal_height += accordion_tab->getHeaderHeight() + 2 * BORDER_MARGIN;
-				if(optimal_height < panel_height)
+				if (optimal_height < panel_height)
 				{
 					panel_height = optimal_height;
 				}
 
 				// minimum tab height is equal to header height
-				if(mAccordionTabs[i]->getHeaderHeight() > panel_height)
+				if (mAccordionTabs[i]->getHeaderHeight() > panel_height)
 				{
 					panel_height = mAccordionTabs[i]->getHeaderHeight();
 				}
 			}
 			
 			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
-			panel_top-=panel_height;
+			panel_top -= panel_height;
 			
 		}
 	}	
 
-	show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+	show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 
-	updateLayout(getRect().getWidth(),getRect().getHeight());
+	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
 
@@ -519,70 +519,67 @@ void LLAccordionCtrl::arrange()
 {
 	updateNoTabsHelpTextVisibility();
 
-	if( mAccordionTabs.size() == 0)
+	if (mAccordionTabs.empty())
 	{
-		//We do not arrange if we do not have what should be arranged
+		// Nothing to arrange
 		return;
 	}
 
-
-	if(mAccordionTabs.size() == 1)
+	if (mAccordionTabs.size() == 1)
 	{
-		S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-		S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+		S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+		S32 panel_width = getRect().getWidth() - 4;
 		
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[0]);
 		
 		LLRect panel_rect = accordion_tab->getRect();
 		
-		S32 panel_height = getRect().getHeight() - 2*BORDER_MARGIN;
-
+		S32 panel_height = getRect().getHeight() - BORDER_MARGIN * 2;
 		if (accordion_tab->getFitParent())
 			panel_height = accordion_tab->getRect().getHeight();
-		ctrlSetLeftTopAndSize(accordion_tab,panel_rect.mLeft,panel_top,panel_width,panel_height);
+
+		ctrlSetLeftTopAndSize(accordion_tab, panel_rect.mLeft, panel_top, panel_width, panel_height);
 		
-		show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+		show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 		return;
-
 	}
 
-	if(mSingleExpansion)
-		arrangeSinge ();
+	if (mSingleExpansion)
+		arrangeSingle();
 	else
-		arrangeMultiple ();
+		arrangeMultiple();
 }
 
 //---------------------------------------------------------------------------------
 
-BOOL LLAccordionCtrl::handleScrollWheel		( S32 x, S32 y, S32 clicks )
+BOOL LLAccordionCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	if(LLPanel::handleScrollWheel(x,y,clicks))
+	if (LLPanel::handleScrollWheel(x, y, clicks))
 		return TRUE;
-	if( mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
+	if (mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
 		return TRUE;
-	return false;
-
+	return FALSE;
 }
 
-BOOL LLAccordionCtrl::handleKeyHere			(KEY key, MASK mask)
+BOOL LLAccordionCtrl::handleKeyHere(KEY key, MASK mask)
 {
-	if( mScrollbar->getVisible() && mScrollbar->handleKeyHere( key,mask ) )
+	if (mScrollbar->getVisible() && mScrollbar->handleKeyHere(key, mask))
 		return TRUE;
-	return LLPanel::handleKeyHere(key,mask);
+	return LLPanel::handleKeyHere(key, mask);
 }
 
-BOOL LLAccordionCtrl::handleDragAndDrop		(S32 x, S32 y, MASK mask,
-											 BOOL drop,
-											 EDragAndDropType cargo_type,
-											 void* cargo_data,
-											 EAcceptance* accept,
-											 std::string& tooltip_msg)
+BOOL LLAccordionCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
+										BOOL drop,
+										EDragAndDropType cargo_type,
+										void* cargo_data,
+										EAcceptance* accept,
+										std::string& tooltip_msg)
 {
 	// Scroll folder view if needed.  Never accepts a drag or drop.
 	*accept = ACCEPT_NO;
 	BOOL handled = autoScroll(x, y);
 
-	if( !handled )
+	if (!handled)
 	{
 		handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
 											cargo_data, accept, tooltip_msg) != NULL;
@@ -590,14 +587,14 @@ BOOL LLAccordionCtrl::handleDragAndDrop		(S32 x, S32 y, MASK mask,
 	return TRUE;
 }
 
-BOOL LLAccordionCtrl::autoScroll		(S32 x, S32 y)
+BOOL LLAccordionCtrl::autoScroll(S32 x, S32 y)
 {
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	bool scrolling = false;
-	if( mScrollbar->getVisible() )
+	if (mScrollbar->getVisible())
 	{
-		LLRect rect_local( 0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0 );
+		LLRect rect_local(0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0);
 		LLRect screen_local_extents;
 
 		// clip rect against root view
@@ -610,51 +607,52 @@ BOOL LLAccordionCtrl::autoScroll		(S32 x, S32 y)
 
 		LLRect bottom_scroll_rect = screen_local_extents;
 		bottom_scroll_rect.mTop = rect_local.mBottom + auto_scroll_region_height;
-		if( bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()) )
+		if (bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()))
 		{
-			mScrollbar->setDocPos( mScrollbar->getDocPos() + auto_scroll_speed );
+			mScrollbar->setDocPos(mScrollbar->getDocPos() + auto_scroll_speed);
 			mAutoScrolling = true;
 			scrolling = true;
 		}
 
 		LLRect top_scroll_rect = screen_local_extents;
 		top_scroll_rect.mBottom = rect_local.mTop - auto_scroll_region_height;
-		if( top_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() > 0) )
+		if (top_scroll_rect.pointInRect(x, y) && (mScrollbar->getDocPos() > 0))
 		{
-			mScrollbar->setDocPos( mScrollbar->getDocPos() - auto_scroll_speed );
+			mScrollbar->setDocPos(mScrollbar->getDocPos() - auto_scroll_speed);
 			mAutoScrolling = true;
 			scrolling = true;
 		}
 	}
-	return scrolling;
+
+	return scrolling ? TRUE : FALSE;
 }
 
-void	LLAccordionCtrl::updateLayout	(S32 width, S32 height)
+void LLAccordionCtrl::updateLayout(S32 width, S32 height)
 {
 	S32 panel_top = height - BORDER_MARGIN ;
-	if(mScrollbar->getVisible())
-		panel_top+=mScrollbar->getDocPos();
+	if (mScrollbar->getVisible())
+		panel_top += mScrollbar->getDocPos();
 
-	S32 panel_width = width - 2*BORDER_MARGIN;
+	S32 panel_width = width - BORDER_MARGIN * 2;
 
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	if(mScrollbar->getVisible())
-		panel_width-=scrollbar_size;
+	if (mScrollbar->getVisible())
+		panel_width -= scrollbar_size;
 
-	//set sizes for first panels and dragbars
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	// set sizes for first panels and dragbars
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
-		if(!mAccordionTabs[i]->getVisible())
+		if (!mAccordionTabs[i]->getVisible())
 			continue;
 		LLRect panel_rect = mAccordionTabs[i]->getRect();
-		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
-		panel_top-=panel_rect.getHeight();
+		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
+		panel_top -= panel_rect.getHeight();
 	}
 }
 
-void	LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
+void LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
 {
-	updateLayout(getRect().getWidth(),getRect().getHeight());
+	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
 // virtual
@@ -687,42 +685,43 @@ void LLAccordionCtrl::onUpdateScrollToChild(const LLUICtrl *cntrl)
     LLUICtrl::onUpdateScrollToChild(cntrl);
 }
 
-void	LLAccordionCtrl::onOpen		(const LLSD& key)
+void LLAccordionCtrl::onOpen(const LLSD& key)
 {
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		LLPanel* panel = dynamic_cast<LLPanel*>(accordion_tab->getAccordionView());
-		if(panel!=NULL)
+		if (panel != NULL)
 		{
 			panel->onOpen(key);
 		}
 	}
 }
+
 S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "size_changes")
+		if (str_action == "size_changes")
 		{
 			//
 			arrange();
 			return 1;
 		}
-		else if(str_action == "select_next")
+		if (str_action == "select_next")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
-				if(accordion_tab->hasFocus())
+				if (accordion_tab->hasFocus())
 				{
-					while(++i<mAccordionTabs.size())
+					while (++i < mAccordionTabs.size())
 					{
-						if(mAccordionTabs[i]->getVisible())
+						if (mAccordionTabs[i]->getVisible())
 							break;
 					}
-					if(i<mAccordionTabs.size())
+					if (i < mAccordionTabs.size())
 					{
 						accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 						accordion_tab->notify(LLSD().with("action","select_first"));
@@ -733,17 +732,17 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "select_prev")
+		if (str_action == "select_prev")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
-				if(accordion_tab->hasFocus() && i>0)
+				if (accordion_tab->hasFocus() && i > 0)
 				{
 					bool prev_visible_tab_found = false;
-					while(i>0)
+					while (i > 0)
 					{
-						if(mAccordionTabs[--i]->getVisible())
+						if (mAccordionTabs[--i]->getVisible())
 						{
 							prev_visible_tab_found = true;
 							break;
@@ -761,12 +760,12 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "select_current")
+		if (str_action == "select_current")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				// Set selection to the currently focused tab.
-				if(mAccordionTabs[i]->hasFocus())
+				if (mAccordionTabs[i]->hasFocus())
 				{
 					if (mAccordionTabs[i] != mSelectedTab)
 					{
@@ -783,7 +782,7 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "deselect_current")
+		if (str_action == "deselect_current")
 		{
 			// Reset selection to the currently selected tab.
 			if (mSelectedTab)
@@ -802,9 +801,9 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 		screenRectToLocal(screen_rc, &local_rc);
 
 		// Translate to parent coordinatess to check if we are in visible rectangle
-		local_rc.translate( getRect().mLeft, getRect().mBottom );
+		local_rc.translate(getRect().mLeft, getRect().mBottom);
 
-		if ( !getRect().contains (local_rc) )
+		if (!getRect().contains (local_rc))
 		{
 			// Back to local coords and calculate position for scroller
 			S32 bottom = mScrollbar->getDocPos() - local_rc.mBottom + getRect().mBottom;
@@ -814,7 +813,7 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 									 bottom, // min vertical scroll
 									 top); // max vertical scroll 
 
-			mScrollbar->setDocPos( scroll_pos );
+			mScrollbar->setDocPos(scroll_pos);
 		}
 		return 1;
 	}
@@ -834,15 +833,16 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 	}
 	return LLPanel::notifyParent(info);
 }
-void	LLAccordionCtrl::reset		()
+
+void LLAccordionCtrl::reset()
 {
-	if(mScrollbar)
+	if (mScrollbar)
 		mScrollbar->setDocPos(0);
 }
 
 void LLAccordionCtrl::expandDefaultTab()
 {
-	if (mAccordionTabs.size() > 0)
+	if (!mAccordionTabs.empty())
 	{
 		LLAccordionCtrlTab* tab = mAccordionTabs.front();
 
@@ -877,7 +877,7 @@ void LLAccordionCtrl::sort()
 	arrange();
 }
 
-void	LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
+void LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
 {
 	LLStringUtil::format_map_t args;
 	args["[SEARCH_TERM]"] = LLURI::escape(filter_string);
@@ -907,7 +907,7 @@ const LLAccordionCtrlTab* LLAccordionCtrl::getExpandedTab() const
 
 S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 available_height /* = 0 */)
 {
-	if(tab_index < 0)
+	if (tab_index < 0)
 	{
 		return available_height;
 	}
@@ -915,9 +915,9 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
 	S32 collapsed_tabs_height = 0;
 	S32 num_expanded = 0;
 
-	for(size_t n = tab_index; n < mAccordionTabs.size(); ++n)
+	for (size_t n = tab_index; n < mAccordionTabs.size(); ++n)
 	{
-		if(!mAccordionTabs[n]->isExpanded())
+		if (!mAccordionTabs[n]->isExpanded())
 		{
 			collapsed_tabs_height += mAccordionTabs[n]->getHeaderHeight();
 		}
@@ -927,7 +927,7 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
 		}
 	}
 
-	if(0 == num_expanded)
+	if (0 == num_expanded)
 	{
 		return available_height;
 	}
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 2828254472..6a1989afba 100644
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -144,7 +144,7 @@ private:
 	void	initNoTabsWidget(const LLTextBox::Params& tb_params);
 	void	updateNoTabsHelpTextVisibility();
 
-	void	arrangeSinge();
+	void	arrangeSingle();
 	void	arrangeMultiple();
 
 	// Calc Splitter's height that is necessary to display all child content
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 04485c6262..20da568746 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -69,13 +69,13 @@ public:
 	virtual BOOL postBuild();
 
 	std::string getTitle();
-	void	setTitle(const std::string& title, const std::string& hl);
+	void setTitle(const std::string& title, const std::string& hl);
 
-	void	setTitleFontStyle(std::string style);
+	void setTitleFontStyle(std::string style);
 
-	void	setTitleColor(LLUIColor);
+	void setTitleColor(LLUIColor);
 
-	void	setSelected(bool is_selected) { mIsSelected = is_selected; }
+	void setSelected(bool is_selected) { mIsSelected = is_selected; }
 
 	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
 	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
@@ -85,8 +85,8 @@ public:
 								   void* cargo_data,
 								   EAcceptance* accept,
 								   std::string& tooltip_msg);
-private:
 
+private:
 	LLTextBox* mHeaderTextbox;
 
 	// Overlay images (arrows)
@@ -102,7 +102,7 @@ private:
 	LLPointer<LLUIImage> mImageHeaderFocused;
 
 	// style saved when applying it in setTitleFontStyle
-	LLStyle::Params			mStyleParams;
+	LLStyle::Params mStyleParams;
 
 	LLUIColor mHeaderBGColor;
 
@@ -157,19 +157,17 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::postBuild()
 
 std::string LLAccordionCtrlTab::LLAccordionCtrlTabHeader::getTitle()
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		return mHeaderTextbox->getText();
 	}
-	else
-	{
-		return LLStringUtil::null;
-	}
+
+	return LLStringUtil::null;
 }
 
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitle(const std::string& title, const std::string& hl)
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		LLTextUtil::textboxSetHighlightedVal(
 			mHeaderTextbox,
@@ -192,7 +190,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleFontStyle(std::string
 
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleColor(LLUIColor color)
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		mHeaderTextbox->setColor(color);
 	}
@@ -204,11 +202,11 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 	S32 height = getRect().getHeight();
 
 	F32 alpha = getCurrentTransparency();
-	gl_rect_2d(0,0,width - 1 ,height - 1,mHeaderBGColor.get() % alpha,true);
+	gl_rect_2d(0, 0, width - 1, height - 1, mHeaderBGColor.get() % alpha, TRUE);
 
 	LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
-	bool collapsible = (parent && parent->getCollapsible());
-	bool expanded = (parent && parent->getDisplayChildren());
+	bool collapsible = parent && parent->getCollapsible();
+	bool expanded = parent && parent->getDisplayChildren();
 
 	// Handle overlay images, if needed
 	// Only show green "focus" background image if the accordion is open,
@@ -218,23 +216,22 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 		/*&& !(collapsible && !expanded)*/ // WHY??
 		)
 	{
-		mImageHeaderFocused->draw(0,0,width,height);
+		mImageHeaderFocused->draw(0, 0, width, height);
 	}
 	else
 	{
-		mImageHeader->draw(0,0,width,height);
+		mImageHeader->draw(0, 0, width, height);
 	}
 
-	if(mNeedsHighlight)
+	if (mNeedsHighlight)
 	{
-		mImageHeaderOver->draw(0,0,width,height);
+		mImageHeaderOver->draw(0, 0, width, height);
 	}
-	
 
-	if(collapsible)
+	if (collapsible)
 	{
 		LLPointer<LLUIImage> overlay_image;
-		if(expanded)
+		if (expanded)
 		{
 			overlay_image = mImageExpanded;
 		}
@@ -242,8 +239,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 		{
 			overlay_image = mImageCollapsed;
 		}
-		overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET,
-							(height - overlay_image->getHeight()) / 2);
+		overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET, (height - overlay_image->getHeight()) / 2);
 	}
 	
 	LLUICtrl::draw();
@@ -253,7 +249,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::reshape(S32 width, S32 height
 {
 	S32 header_height = mHeaderTextbox->getTextPixelHeight();
 
-	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET,(height+header_height)/2 ,width,(height-header_height)/2);
+	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET, (height + header_height) / 2, width, (height - header_height) / 2);
 	mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
 	mHeaderTextbox->setRect(textboxRect);
 
@@ -272,20 +268,24 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseEnter(S32 x, S32 y, MA
 	LLUICtrl::onMouseEnter(x, y, mask);
 	mNeedsHighlight = true;
 }
+
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	LLUICtrl::onMouseLeave(x, y, mask);
 	mNeedsHighlight = false;
 	mAutoOpenTimer.stop();
 }
+
 BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	if ( ( key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
+	if ((key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
 	{
 		return getParent()->handleKey(key, mask, called_from_parent);
 	}
+
 	return LLUICtrl::handleKey(key, mask, called_from_parent);
 }
+
 BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32 y, MASK mask,
 																	 BOOL drop,
 																	 EDragAndDropType cargo_type,
@@ -295,7 +295,7 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
 {
 	LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
 
-	if ( parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose() )
+	if (parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose())
 	{
 		if (mAutoOpenTimer.getStarted())
 		{
@@ -307,12 +307,15 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
 			}
 		}
 		else
+		{
 			mAutoOpenTimer.start();
+		}
 	}
 
 	return LLUICtrl::handleDragAndDrop(x, y, mask, drop, cargo_type,
 									   cargo_data, accept, tooltip_msg);
 }
+
 LLAccordionCtrlTab::Params::Params()
 	: title("title")
 	,display_children("expanded", true)
@@ -384,41 +387,39 @@ LLAccordionCtrlTab::~LLAccordionCtrlTab()
 {
 }
 
-
 void LLAccordionCtrlTab::setDisplayChildren(bool display)
 {
 	mDisplayChildren = display;
 	LLRect rect = getRect();
 
-	rect.mBottom = rect.mTop - (getDisplayChildren() ? 
-		mExpandedHeight : HEADER_HEIGHT);
+	rect.mBottom = rect.mTop - (getDisplayChildren() ? mExpandedHeight : HEADER_HEIGHT);
 	setRect(rect);
 
-	if(mContainerPanel)
+	if (mContainerPanel)
+	{
 		mContainerPanel->setVisible(getDisplayChildren());
+	}
 
-	if(mDisplayChildren)
+	if (mDisplayChildren)
 	{
 		adjustContainerPanel();
 	}
 	else
 	{
-		if(mScrollbar)
-			mScrollbar->setVisible(false);
+		if (mScrollbar)
+			mScrollbar->setVisible(FALSE);
 	}
-
 }
 
 void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
 {
 	LLRect headerRect;
 
-	headerRect.setLeftTopAndSize(
-		0,height,width,HEADER_HEIGHT);
+	headerRect.setLeftTopAndSize(0, height, width, HEADER_HEIGHT);
 	mHeader->setRect(headerRect);
 	mHeader->reshape(headerRect.getWidth(), headerRect.getHeight());
 
-	if(!mDisplayChildren)
+	if (!mDisplayChildren)
 		return;
 
 	LLRect childRect;
@@ -426,7 +427,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
 	childRect.setLeftTopAndSize(
 		getPaddingLeft(),
 		height - getHeaderHeight() - getPaddingTop(),
-		width - getPaddingLeft() - getPaddingRight(), 
+		width - getPaddingLeft() - getPaddingRight(),
 		height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
 
 	adjustContainerPanel(childRect);
@@ -434,7 +435,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
 
 void LLAccordionCtrlTab::changeOpenClose(bool is_open)
 {
-	if(is_open)
+	if (is_open)
 		mExpandedHeight = getRect().getHeight();
 
 	setDisplayChildren(!is_open);
@@ -483,14 +484,14 @@ void LLAccordionCtrlTab::onUpdateScrollToChild(const LLUICtrl *cntrl)
 
 BOOL LLAccordionCtrlTab::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	if(mCollapsible && mHeaderVisible && mCanOpenClose)
+	if (mCollapsible && mHeaderVisible && mCanOpenClose)
 	{
-		if(y >= (getRect().getHeight() - HEADER_HEIGHT) )
+		if (y >= (getRect().getHeight() - HEADER_HEIGHT))
 		{
 			mHeader->setFocus(true);
 			changeOpenClose(getDisplayChildren());
 
-			//reset stored state
+			// Reset stored state
 			mWasStateStored = false;
 			return TRUE;
 		}
@@ -510,7 +511,7 @@ boost::signals2::connection LLAccordionCtrlTab::setDropDownStateChangedCallback(
 
 bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 {
-	if(DD_HEADER_NAME != child->getName())
+	if (DD_HEADER_NAME != child->getName())
 	{
 		reshape(child->getRect().getWidth() , child->getRect().getHeight() + HEADER_HEIGHT );
 		mExpandedHeight = getRect().getHeight();
@@ -518,12 +519,12 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 
 	bool res = LLUICtrl::addChild(child, tab_group);
 
-	if(DD_HEADER_NAME != child->getName())
+	if (DD_HEADER_NAME != child->getName())
 	{
-		if(!mCollapsible)
+		if (!mCollapsible)
 			setDisplayChildren(true);
 		else
-			setDisplayChildren(getDisplayChildren());	
+			setDisplayChildren(getDisplayChildren());
 	}
 
 	if (!mContainerPanel)
@@ -534,7 +535,7 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 
 void LLAccordionCtrlTab::setAccordionView(LLView* panel)
 {
-	addChild(panel,0);
+	addChild(panel, 0);
 }
 
 std::string LLAccordionCtrlTab::getTitle() const
@@ -543,10 +544,8 @@ std::string LLAccordionCtrlTab::getTitle() const
 	{
 		return mHeader->getTitle();
 	}
-	else
-	{
-		return LLStringUtil::null;
-	}
+
+	return LLStringUtil::null;
 }
 
 void LLAccordionCtrlTab::setTitle(const std::string& title, const std::string& hl)
@@ -579,6 +578,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusReceivedCallback(const f
 	{
 		return mHeader->setFocusReceivedCallback(cb);
 	}
+
 	return boost::signals2::connection();
 }
 
@@ -588,6 +588,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusLostCallback(const focus
 	{
 		return mHeader->setFocusLostCallback(cb);
 	}
+
 	return boost::signals2::connection();
 }
 
@@ -601,59 +602,65 @@ void LLAccordionCtrlTab::setSelected(bool is_selected)
 
 LLView*	LLAccordionCtrlTab::findContainerView()
 {
-	for(child_list_const_iter_t it = getChildList()->begin(); 
-		getChildList()->end() != it; ++it)
+	child_list_const_iter_t it = getChildList()->begin(), it_end = getChildList()->end();
+	while (it != it_end)
 	{
-		LLView* child = *it;
-		if(DD_HEADER_NAME == child->getName())
-			continue;
-		if(!child->getVisible())
-			continue;
-		return child;
+		LLView* child = *(it++);
+		if (DD_HEADER_NAME != child->getName() && child->getVisible())
+			return child;
 	}
+
 	return NULL;
 }
 
 void LLAccordionCtrlTab::selectOnFocusReceived()
 {
 	if (getParent()) // A parent may not be set if tabs are added dynamically.
+	{
 		getParent()->notifyParent(LLSD().with("action", "select_current"));
+	}
 }
 
 void LLAccordionCtrlTab::deselectOnFocusLost()
 {
-	if(getParent()) // A parent may not be set if tabs are added dynamically.
+	if (getParent()) // A parent may not be set if tabs are added dynamically.
 	{
 		getParent()->notifyParent(LLSD().with("action", "deselect_current"));
 	}
-
 }
 
 S32 LLAccordionCtrlTab::getHeaderHeight()
 {
-	return mHeaderVisible?HEADER_HEIGHT:0; 
+	return mHeaderVisible ? HEADER_HEIGHT : 0;
 }
 
-void LLAccordionCtrlTab::setHeaderVisible(bool value) 
+void LLAccordionCtrlTab::setHeaderVisible(bool value)
 {
-	if(mHeaderVisible == value)
+	if (mHeaderVisible == value)
 		return;
+
 	mHeaderVisible = value;
-	if(mHeader)
-		mHeader->setVisible(value);
+
+	if (mHeader)
+	{
+		mHeader->setVisible(value ? TRUE : FALSE);
+	}
+
 	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
 };
 
 //virtual
 BOOL LLAccordionCtrlTab::postBuild()
 {
-	if(mHeader)
+	if (mHeader)
+	{
 		mHeader->setVisible(mHeaderVisible);
-	
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	}
+
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
 
 	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
+	scroll_rect.setOriginAndSize(
 		getRect().getWidth() - scrollbar_size,
 		1,
 		scrollbar_size,
@@ -661,7 +668,7 @@ BOOL LLAccordionCtrlTab::postBuild()
 
 	mContainerPanel = findContainerView();
 
-	if(!mFitPanel)
+	if (!mFitPanel)
 	{
 		LLScrollbar::Params sbparams;
 		sbparams.name("scrollable vertical");
@@ -674,9 +681,8 @@ BOOL LLAccordionCtrlTab::postBuild()
 		sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
 		sbparams.change_callback(boost::bind(&LLAccordionCtrlTab::onScrollPosChangeCallback, this, _1, _2));
 
-
-		mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
-		LLView::addChild( mScrollbar );
+		mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
+		LLView::addChild(mScrollbar);
 		mScrollbar->setFollowsRight();
 		mScrollbar->setFollowsTop();
 		mScrollbar->setFollowsBottom();
@@ -684,44 +690,48 @@ BOOL LLAccordionCtrlTab::postBuild()
 		mScrollbar->setVisible(false);
 	}
 
-	if(mContainerPanel)
+	if (mContainerPanel)
+	{
 		mContainerPanel->setVisible(mDisplayChildren);
+	}
 
 	return LLUICtrl::postBuild();
 }
-bool	LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
+
+bool LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "store_state")
+		if (str_action == "store_state")
 		{
 			storeOpenCloseState();
 			return true;
 		}
-		if(str_action == "restore_state")
+
+		if (str_action == "restore_state")
 		{
 			restoreOpenCloseState();
 			return true;
 		}
 	}	
+
 	return LLUICtrl::notifyChildren(info);
 }
 
 S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "size_changes")
+		if (str_action == "size_changes")
 		{
-			//
 			S32 height = info["height"];
-			height = llmax(height,10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
+			height = llmax(height, 10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
 			
 			mExpandedHeight = height;
 			
-			if(isExpanded() && !mSkipChangesOnNotifyParent)
+			if (isExpanded() && !mSkipChangesOnNotifyParent)
 			{
 				LLRect panel_rect = getRect();
 				panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), height);
@@ -729,12 +739,13 @@ S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 				setRect(panel_rect);
 			}
 			
-			//LLAccordionCtrl should rearrange accordion tab if one of accordion change its size
+			// LLAccordionCtrl should rearrange accordion tab if one of accordions changed its size
 			if (getParent()) // A parent may not be set if tabs are added dynamically.
 				getParent()->notifyParent(info);
 			return 1;
 		}
-		else if(str_action == "select_prev") 
+
+		if (str_action == "select_prev") 
 		{
 			showAndFocusHeader();
 			return 1;
@@ -772,78 +783,85 @@ S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 
 S32 LLAccordionCtrlTab::notify(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "select_first")
+		if (str_action == "select_first")
 		{
 			showAndFocusHeader();
 			return 1;
 		}
-		else if( str_action == "select_last" )
+
+		if (str_action == "select_last")
 		{
-			if(getDisplayChildren() == false)
+			if (!getDisplayChildren())
 			{
 				showAndFocusHeader();
 			}
 			else
 			{
 				LLView* view = getAccordionView();
-				if(view)
-					view->notify(LLSD().with("action","select_last"));
+				if (view)
+				{
+					view->notify(LLSD().with("action", "select_last"));
+				}
 			}
 		}
 	}
+
 	return 0;
 }
 
 BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	if( !mHeader->hasFocus() )
+	if (!mHeader->hasFocus())
 		return LLUICtrl::handleKey(key, mask, called_from_parent);
 
-	if ( (key == KEY_RETURN )&& mask == MASK_NONE)
+	if ((key == KEY_RETURN) && mask == MASK_NONE)
 	{
 		changeOpenClose(getDisplayChildren());
 		return TRUE;
 	}
 
-	if ( (key == KEY_ADD || key == KEY_RIGHT)&& mask == MASK_NONE)
+	if ((key == KEY_ADD || key == KEY_RIGHT) && mask == MASK_NONE)
 	{
-		if(getDisplayChildren() == false)
+		if (!getDisplayChildren())
 		{
 			changeOpenClose(getDisplayChildren());
 			return TRUE;
 		}
 	}
-	if ( (key == KEY_SUBTRACT || key == KEY_LEFT)&& mask == MASK_NONE)
+
+	if ((key == KEY_SUBTRACT || key == KEY_LEFT) && mask == MASK_NONE)
 	{
-		if(getDisplayChildren() == true)
+		if (getDisplayChildren())
 		{
 			changeOpenClose(getDisplayChildren());
 			return TRUE;
 		}
 	}
 
-	if ( key == KEY_DOWN && mask == MASK_NONE)
+	if (key == KEY_DOWN && mask == MASK_NONE)
 	{
-		//if collapsed go to the next accordion
-		if(getDisplayChildren() == false)
-			//we processing notifyParent so let call parent directly
-			getParent()->notifyParent(LLSD().with("action","select_next"));
+		// if collapsed go to the next accordion
+		if (!getDisplayChildren())
+		{
+			// we're processing notifyParent so let call parent directly
+			getParent()->notifyParent(LLSD().with("action", "select_next"));
+		}
 		else
 		{
-			getAccordionView()->notify(LLSD().with("action","select_first"));
+			getAccordionView()->notify(LLSD().with("action", "select_first"));
 		}
 		return TRUE;
 	}
 
-	if ( key == KEY_UP && mask == MASK_NONE)
+	if (key == KEY_UP && mask == MASK_NONE)
 	{
-		//go to the previous accordion
+		// go to the previous accordion
 
-		//we processing notifyParent so let call parent directly
-		getParent()->notifyParent(LLSD().with("action","select_prev"));
+		// we're processing notifyParent so let call parent directly
+		getParent()->notifyParent(LLSD().with("action", "select_prev"));
 		return TRUE;
 	}
 
@@ -869,28 +887,29 @@ void LLAccordionCtrlTab::showAndFocusHeader()
 	// accordion tab (assuming that the parent is an LLAccordionCtrl) the calls chain
 	// is shortened and messages from inside the collapsed tabs are avoided.
 	// See STORM-536.
-	getParent()->notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));
+	getParent()->notifyParent(LLSD().with("scrollToShowRect", screen_rc.getValue()));
 }
-void    LLAccordionCtrlTab::storeOpenCloseState()
+
+void LLAccordionCtrlTab::storeOpenCloseState()
 {
-	if(mWasStateStored)
+	if (mWasStateStored)
 		return;
 	mStoredOpenCloseState = getDisplayChildren();
 	mWasStateStored = true;
 }
 
-void   LLAccordionCtrlTab::restoreOpenCloseState()
+void LLAccordionCtrlTab::restoreOpenCloseState()
 {
-	if(!mWasStateStored)
+	if (!mWasStateStored)
 		return;
-	if(getDisplayChildren() != mStoredOpenCloseState)
+	if (getDisplayChildren() != mStoredOpenCloseState)
 	{
 		changeOpenClose(getDisplayChildren());
 	}
 	mWasStateStored = false;
 }
 
-void LLAccordionCtrlTab::adjustContainerPanel	()
+void LLAccordionCtrlTab::adjustContainerPanel()
 {
 	S32 width = getRect().getWidth();
 	S32 height = getRect().getHeight();
@@ -907,83 +926,83 @@ void LLAccordionCtrlTab::adjustContainerPanel	()
 
 void LLAccordionCtrlTab::adjustContainerPanel(const LLRect& child_rect)
 {
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return; 
 
-	if(!mFitPanel)
+	if (!mFitPanel)
 	{
 		show_hide_scrollbar(child_rect);
 		updateLayout(child_rect);
 	}
 	else
 	{
-		mContainerPanel->reshape(child_rect.getWidth(),child_rect.getHeight());
+		mContainerPanel->reshape(child_rect.getWidth(), child_rect.getHeight());
 		mContainerPanel->setRect(child_rect);
 	}
 }
 
 S32 LLAccordionCtrlTab::getChildViewHeight()
 {
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return 0;
 	return mContainerPanel->getRect().getHeight();
 }
 
 void LLAccordionCtrlTab::show_hide_scrollbar(const LLRect& child_rect)
 {
-	if(getChildViewHeight() > child_rect.getHeight() )
+	if (getChildViewHeight() > child_rect.getHeight())
 		showScrollbar(child_rect);
 	else
 		hideScrollbar(child_rect);
 }
+
 void LLAccordionCtrlTab::showScrollbar(const LLRect& child_rect)
 {
-	if(!mContainerPanel || !mScrollbar)
+	if (!mContainerPanel || !mScrollbar)
 		return;
 	bool was_visible = mScrollbar->getVisible();
 	mScrollbar->setVisible(true);
 	
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
-	{
-		ctrlSetLeftTopAndSize(mScrollbar,child_rect.getWidth()-scrollbar_size, 
-			child_rect.getHeight()-PARENT_BORDER_MARGIN, 
-			scrollbar_size, 
-			child_rect.getHeight()-2*PARENT_BORDER_MARGIN);
-	}
+	ctrlSetLeftTopAndSize(mScrollbar,
+		child_rect.getWidth() - scrollbar_size,
+		child_rect.getHeight() - PARENT_BORDER_MARGIN,
+		scrollbar_size, 
+		child_rect.getHeight() - PARENT_BORDER_MARGIN * 2);
 
 	LLRect orig_rect = mContainerPanel->getRect();
 
 	mScrollbar->setPageSize(child_rect.getHeight());
-	mScrollbar->setDocParams(orig_rect.getHeight(),mScrollbar->getDocPos());
+	mScrollbar->setDocParams(orig_rect.getHeight(), mScrollbar->getDocPos());
 	
-	if(was_visible)
+	if (was_visible)
 	{
 		S32 scroll_pos = llmin(mScrollbar->getDocPos(), orig_rect.getHeight() - child_rect.getHeight() - 1);
 		mScrollbar->setDocPos(scroll_pos);
 	}
-	else//shrink child panel
+	else // Shrink child panel
 	{
 		updateLayout(child_rect);
 	}
-	
 }
 
-void	LLAccordionCtrlTab::hideScrollbar( const LLRect& child_rect )
+void LLAccordionCtrlTab::hideScrollbar(const LLRect& child_rect)
 {
-	if(!mContainerPanel || !mScrollbar)
+	if (!mContainerPanel || !mScrollbar)
 		return;
 
-	if(mScrollbar->getVisible() == false)
+	if (mScrollbar->getVisible() == FALSE)
 		return;
-	mScrollbar->setVisible(false);
+
+	mScrollbar->setVisible(FALSE);
 	mScrollbar->setDocPos(0);
 
 	//shrink child panel
 	updateLayout(child_rect);
 }
 
-void	LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
+void LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
 {
 	LLRect child_rect;
 
@@ -999,21 +1018,20 @@ void	LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
 	updateLayout(child_rect);
 }
 
-void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
+void LLAccordionCtrlTab::drawChild(const LLRect& root_rect, LLView* child)
 {
 	if (child && child->getVisible() && child->getRect().isValid())
 	{
 		LLRect screen_rect;
-		localRectToScreen(child->getRect(),&screen_rect);
-		
-		if ( root_rect.overlaps(screen_rect)  && sDirtyRect.overlaps(screen_rect))
+		localRectToScreen(child->getRect(), &screen_rect);
+
+		if (root_rect.overlaps(screen_rect) && sDirtyRect.overlaps(screen_rect))
 		{
 			gGL.matrixMode(LLRender::MM_MODELVIEW);
 			LLUI::pushMatrix();
 			{
 				LLUI::translate((F32)child->getRect().mLeft, (F32)child->getRect().mBottom);
 				child->draw();
-
 			}
 			LLUI::popMatrix();
 		}
@@ -1022,64 +1040,67 @@ void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
 
 void LLAccordionCtrlTab::draw()
 {
-	if(mFitPanel)
+	if (mFitPanel)
+	{
 		LLUICtrl::draw();
+	}
 	else
 	{
-		LLRect root_rect = getRootView()->getRect();
-		drawChild(root_rect,mHeader);
-		drawChild(root_rect,mScrollbar );
-		{
-			LLRect child_rect;
+		LLRect root_rect(getRootView()->getRect());
+		drawChild(root_rect, mHeader);
+		drawChild(root_rect, mScrollbar);
 
-			S32 width = getRect().getWidth();
-			S32 height = getRect().getHeight();
+		LLRect child_rect;
 
-			child_rect.setLeftTopAndSize(
-				getPaddingLeft(),
-				height - getHeaderHeight() - getPaddingTop(),
-				width - getPaddingLeft() - getPaddingRight(), 
-				height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
+		S32 width = getRect().getWidth();
+		S32 height = getRect().getHeight();
 
-			LLLocalClipRect clip(child_rect);
-			drawChild(root_rect,mContainerPanel);
-		}
+		child_rect.setLeftTopAndSize(
+			getPaddingLeft(),
+			height - getHeaderHeight() - getPaddingTop(),
+			width - getPaddingLeft() - getPaddingRight(),
+			height - getHeaderHeight() - getPaddingTop() - getPaddingBottom());
+
+		LLLocalClipRect clip(child_rect);
+		drawChild(root_rect,mContainerPanel);
 	}
 }
 
-void	LLAccordionCtrlTab::updateLayout	( const LLRect& child_rect )
+void LLAccordionCtrlTab::updateLayout(const LLRect& child_rect)
 {
 	LLView*	child = getAccordionView();
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return;
 
 	S32 panel_top = child_rect.getHeight();
 	S32 panel_width = child_rect.getWidth();
 
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	if(mScrollbar && mScrollbar->getVisible() != false)
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
+	if (mScrollbar && mScrollbar->getVisible())
 	{
-		panel_top+=mScrollbar->getDocPos();
-		panel_width-=scrollbar_size;
+		panel_top += mScrollbar->getDocPos();
+		panel_width -= scrollbar_size;
 	}
 
-	//set sizes for first panels and dragbars
+	// Set sizes for first panels and dragbars
 	LLRect panel_rect = child->getRect();
-	ctrlSetLeftTopAndSize(mContainerPanel,child_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
+	ctrlSetLeftTopAndSize(mContainerPanel, child_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
 }
+
 void LLAccordionCtrlTab::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	LLRect panel_rect = panel->getRect();
-	panel_rect.setLeftTopAndSize( left, top, width, height);
+	panel_rect.setLeftTopAndSize(left, top, width, height);
 	panel->reshape( width, height, 1);
 	panel->setRect(panel_rect);
 }
+
 BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 {
 	//header may be not the first child but we need to process it first
-	if(y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT/2) )
+	if (y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT / 2))
 	{
 		//inside tab header
 		//fix for EXT-6619
@@ -1088,16 +1109,18 @@ BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 	}
 	return LLUICtrl::handleToolTip(x, y, mask);
 }
-BOOL LLAccordionCtrlTab::handleScrollWheel		( S32 x, S32 y, S32 clicks )
+
+BOOL LLAccordionCtrlTab::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	if( LLUICtrl::handleScrollWheel(x,y,clicks))
+	if (LLUICtrl::handleScrollWheel(x, y, clicks))
 	{
 		return TRUE;
 	}
-	if( mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
+
+	if (mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
 	{
 		return TRUE;
 	}
+
 	return FALSE;
 }
-
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 2c72e8c036..896a34cac4 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -104,7 +104,7 @@ public:
 	virtual void setDisplayChildren(bool display);
 
 	// Returns expand/collapse state
-	virtual bool getDisplayChildren() const {return mDisplayChildren;};
+	virtual bool getDisplayChildren() const { return mDisplayChildren; };
 
 	//set LLAccordionCtrlTab panel
 	void		setAccordionView(LLView* panel);
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index b13e7389cc..460bd0945b 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1198,7 +1198,7 @@ void LLFlatListView::onFocusReceived()
 {
 	if (size())
 	{
-	mSelectedItemsBorder->setVisible(TRUE);
+		mSelectedItemsBorder->setVisible(TRUE);
 	}
 	gEditMenuHandler = this;
 }
@@ -1207,7 +1207,7 @@ void LLFlatListView::onFocusLost()
 {
 	mSelectedItemsBorder->setVisible(FALSE);
 	// Route menu back to the default
- 	if( gEditMenuHandler == this )
+	if (gEditMenuHandler == this)
 	{
 		gEditMenuHandler = NULL;
 	}
@@ -1216,16 +1216,16 @@ void LLFlatListView::onFocusLost()
 //virtual 
 S32 LLFlatListView::notify(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "select_first")
+		if (str_action == "select_first")
 		{
 			setFocus(true);
 			selectFirstItem();
 			return 1;
 		}
-		else if(str_action == "select_last")
+		else if (str_action == "select_last")
 		{
 			setFocus(true);
 			selectLastItem();
@@ -1238,6 +1238,7 @@ S32 LLFlatListView::notify(const LLSD& info)
 		notifyParentItemsRectChanged();
 		return 1;
 	}
+
 	return 0;
 }
 
@@ -1249,10 +1250,8 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 	detached_items.clear();
 	// Go through items and detach valid items, remove them from items panel
 	// and add to detached_items.
-	for (pairs_iterator_t
-			 iter = mItemPairs.begin(),
-			 iter_end = mItemPairs.end();
-		 iter != iter_end; ++iter)
+	pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+	while (iter != iter_end)
 	{
 		LLPanel* pItem = (*iter)->first;
 		if (1 == pItem->notify(action))
@@ -1261,6 +1260,7 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 			mItemsPanel->removeChild(pItem);
 			detached_items.push_back(pItem);
 		}
+		iter++;
 	}
 	if (!detached_items.empty())
 	{
@@ -1268,13 +1268,12 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 		if (detached_items.size() == mItemPairs.size())
 		{
 			// This way will be faster if all items were disconnected
-			for (pairs_iterator_t
-					 iter = mItemPairs.begin(),
-					 iter_end = mItemPairs.end();
-				 iter != iter_end; ++iter)
+			pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+			while (iter != iter_end)
 			{
 				(*iter)->first = NULL;
 				delete *iter;
+				iter++;
 			}
 			mItemPairs.clear();
 			// Also set items panel height to zero.
@@ -1287,16 +1286,14 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 		}
 		else
 		{
-			for (std::vector<LLPanel*>::const_iterator
-					 detached_iter = detached_items.begin(),
-					 detached_iter_end = detached_items.end();
-				 detached_iter != detached_iter_end; ++detached_iter)
+			std::vector<LLPanel*>::const_iterator
+				detached_iter = detached_items.begin(),
+				detached_iter_end = detached_items.end();
+			while (detached_iter < detached_iter_end)
 			{
 				LLPanel* pDetachedItem = *detached_iter;
-				for (pairs_iterator_t
-						 iter = mItemPairs.begin(),
-						 iter_end = mItemPairs.end();
-					 iter != iter_end; ++iter)
+				pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+				while (iter != iter_end)
 				{
 					item_pair_t* item_pair = *iter;
 					if (item_pair->first == pDetachedItem)
@@ -1306,7 +1303,9 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 						delete item_pair;
 						break;
 					}
+					iter++;
 				}
+				detached_iter++;
 			}
 			rearrangeItems();
 		}
@@ -1322,7 +1321,6 @@ LLFlatListViewEx::Params::Params()
 : no_items_msg("no_items_msg")
 , no_filtered_items_msg("no_filtered_items_msg")
 {
-
 }
 
 LLFlatListViewEx::LLFlatListViewEx(const Params& p)
@@ -1332,7 +1330,6 @@ LLFlatListViewEx::LLFlatListViewEx(const Params& p)
 , mForceShowingUnmatchedItems(false)
 , mHasMatchedItems(false)
 {
-
 }
 
 void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
@@ -1352,7 +1349,6 @@ void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
 		// list does not contain any items at all
 		setNoItemsCommentText(mNoItemsMsg);
 	}
-
 }
 
 bool LLFlatListViewEx::getForceShowingUnmatchedItems()
@@ -1411,12 +1407,10 @@ void LLFlatListViewEx::filterItems()
 	getItems(items);
 
 	mHasMatchedItems = false;
-	for (item_panel_list_t::iterator
-			 iter = items.begin(),
-			 iter_end = items.end();
-		 iter != iter_end; ++iter)
+    item_panel_list_t::iterator iter = items.begin(), iter_end = items.end();
+	while (iter < iter_end)
 	{
-		LLPanel* pItem = (*iter);
+		LLPanel* pItem = *(iter++);
 		updateItemVisibility(pItem, action);
 	}
 
-- 
cgit v1.2.3


From 80bdfe3b5eec180e563bb0887bdc986f76dfd6f9 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 10 Oct 2023 23:18:41 +0200
Subject: SL-20288 Lags in Appearance floater (code format in LLAccordionCtrl)

---
 indra/llui/llaccordionctrl.cpp    | 330 ++++++++++++++++-----------------
 indra/llui/llaccordionctrl.h      |   2 +-
 indra/llui/llaccordionctrltab.cpp | 371 ++++++++++++++++++++------------------
 indra/llui/llaccordionctrltab.h   |   2 +-
 indra/llui/llflatlistview.cpp     |  52 +++---
 5 files changed, 387 insertions(+), 370 deletions(-)

diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index 809d72208f..0a82bed896 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -60,7 +60,7 @@ LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params)
 	initNoTabsWidget(params.no_matched_tabs_text);
 
 	mSingleExpansion = params.single_expansion;
-	if(mFitParent && !mSingleExpansion)
+	if (mFitParent && !mSingleExpansion)
 	{
 		LL_INFOS() << "fit_parent works best when combined with single_expansion" << LL_ENDL;
 	}
@@ -102,14 +102,13 @@ void LLAccordionCtrl::draw()
 	LLPanel::draw();
 }
 
-
 //---------------------------------------------------------------------------------
 BOOL LLAccordionCtrl::postBuild()
 {
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
 
 	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
+	scroll_rect.setOriginAndSize(
 		getRect().getWidth() - scrollbar_size,
 		1,
 		scrollbar_size,
@@ -126,39 +125,42 @@ BOOL LLAccordionCtrl::postBuild()
 	sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
 	sbparams.change_callback(boost::bind(&LLAccordionCtrl::onScrollPosChangeCallback, this, _1, _2));
 	
-	mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
-	LLView::addChild( mScrollbar );
-	mScrollbar->setVisible( false );
+	mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
+	LLView::addChild(mScrollbar);
+	mScrollbar->setVisible(FALSE);
 	mScrollbar->setFollowsRight();
 	mScrollbar->setFollowsTop();
 	mScrollbar->setFollowsBottom();
 
 	//if it was created from xml...
 	std::vector<LLUICtrl*> accordion_tabs;
-	for(child_list_const_iter_t it = getChildList()->begin(); 
+	for (child_list_const_iter_t it = getChildList()->begin(); 
 		getChildList()->end() != it; ++it)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(*it);
-		if(accordion_tab == NULL)
+		if (accordion_tab == NULL)
 			continue;
-		if(std::find(mAccordionTabs.begin(),mAccordionTabs.end(),accordion_tab) == mAccordionTabs.end())
+		if (std::find(mAccordionTabs.begin(), mAccordionTabs.end(), accordion_tab) == mAccordionTabs.end())
 		{
 			accordion_tabs.push_back(accordion_tab);
 		}
 	}
 
-	for(std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();it!=accordion_tabs.rend();++it)
+	for (std::vector<LLUICtrl*>::reverse_iterator it = accordion_tabs.rbegin();
+		it < accordion_tabs.rend(); ++it)
+	{
 		addCollapsibleCtrl(*it);
+	}
 
-	arrange	();
+	arrange();
 
-	if(mSingleExpansion)
+	if (mSingleExpansion)
 	{
-		if(!mAccordionTabs[0]->getDisplayChildren())
+		if (!mAccordionTabs[0]->getDisplayChildren())
 			mAccordionTabs[0]->setDisplayChildren(true);
-		for(size_t i=1;i<mAccordionTabs.size();++i)
+		for (size_t i = 1; i < mAccordionTabs.size(); ++i)
 		{
-			if(mAccordionTabs[i]->getDisplayChildren())
+			if (mAccordionTabs[i]->getDisplayChildren())
 				mAccordionTabs[i]->setDisplayChildren(false);
 		}
 	}
@@ -205,23 +207,22 @@ BOOL LLAccordionCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::shiftAccordionTabs(S16 panel_num, S32 delta)
 {
-	for(size_t i = panel_num; i < mAccordionTabs.size(); i++ )
+	for (size_t i = panel_num; i < mAccordionTabs.size(); ++i)
 	{
 		ctrlShiftVertical(mAccordionTabs[i],delta);
 	}	
 }
 
-
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num) 
 {
-	if(mSingleExpansion)
+	if (mSingleExpansion)
 	{
-		for(size_t i=0;i<mAccordionTabs.size();++i)
+		for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 		{
-			if(i==panel_num)
+			if (i == panel_num)
 				continue;
-			if(mAccordionTabs[i]->getDisplayChildren())
+			if (mAccordionTabs[i]->getDisplayChildren())
 				mAccordionTabs[i]->setDisplayChildren(false);
 		}
 
@@ -232,64 +233,63 @@ void LLAccordionCtrl::onCollapseCtrlCloseOpen(S16 panel_num)
 void LLAccordionCtrl::show_hide_scrollbar(S32 width, S32 height)
 {
 	calcRecuiredHeight();
-	if(getRecuiredHeight() > height )
-		showScrollbar(width,height);
+	if (getRecuiredHeight() > height)
+		showScrollbar(width, height);
 	else
-		hideScrollbar(width,height);
+		hideScrollbar(width, height);
 }
 
-void	LLAccordionCtrl::showScrollbar(S32 width, S32 height)
+void LLAccordionCtrl::showScrollbar(S32 width, S32 height)
 {
 	bool was_visible = mScrollbar->getVisible();
 
-	mScrollbar->setVisible(true);
+	mScrollbar->setVisible(TRUE);
 	
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	ctrlSetLeftTopAndSize(mScrollbar
-		,width-scrollbar_size - PARENT_BORDER_MARGIN/2
-		,height-PARENT_BORDER_MARGIN
-		,scrollbar_size
-		,height-2*PARENT_BORDER_MARGIN);
+		, width - scrollbar_size - PARENT_BORDER_MARGIN / 2
+		, height - PARENT_BORDER_MARGIN
+		, scrollbar_size
+		, height - PARENT_BORDER_MARGIN * 2);
 	
 	mScrollbar->setPageSize(height);
-	mScrollbar->setDocParams(mInnerRect.getHeight(),mScrollbar->getDocPos());
+	mScrollbar->setDocParams(mInnerRect.getHeight(), mScrollbar->getDocPos());
 
-	if(was_visible)
+	if (was_visible)
 	{
 		S32 scroll_pos = llmin(mScrollbar->getDocPos(), getRecuiredHeight() - height - 1);
 		mScrollbar->setDocPos(scroll_pos);
 	}
 }
 
-void	LLAccordionCtrl::hideScrollbar( S32 width, S32 height )
+void LLAccordionCtrl::hideScrollbar(S32 width, S32 height)
 {
-	if(mScrollbar->getVisible() == false)
+	if (mScrollbar->getVisible() == FALSE)
 		return;
-	mScrollbar->setVisible(false);
+	mScrollbar->setVisible(FALSE);
 
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	S32 panel_width = width - 2*BORDER_MARGIN;
 
-	//reshape all accordeons and shift all draggers
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	// Reshape all accordions and shift all draggers
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLRect panel_rect = mAccordionTabs[i]->getRect();
-		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_rect.mTop,panel_width,panel_rect.getHeight());
+		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_rect.mTop, panel_width, panel_rect.getHeight());
 	}
 
 	mScrollbar->setDocPos(0);
 
-	if(mAccordionTabs.size()>0)
+	if (!mAccordionTabs.empty())
 	{
-		S32 panel_top = height - BORDER_MARGIN;		  // Top coordinate of the first panel
+		S32 panel_top = height - BORDER_MARGIN; // Top coordinate of the first panel
 		S32 diff = panel_top - mAccordionTabs[0]->getRect().mTop;
-		shiftAccordionTabs(0,diff);
+		shiftAccordionTabs(0, diff);
 	}
 }
 
-
 //---------------------------------------------------------------------------------
 S32 LLAccordionCtrl::calcRecuiredHeight()
 {
@@ -305,7 +305,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
 		}
 	}
 
-	mInnerRect.setLeftTopAndSize(0,rec_height + BORDER_MARGIN*2,getRect().getWidth(),rec_height + BORDER_MARGIN);
+	mInnerRect.setLeftTopAndSize(0, rec_height + BORDER_MARGIN * 2, getRect().getWidth(), rec_height + BORDER_MARGIN);
 
 	return mInnerRect.getHeight();
 }
@@ -313,7 +313,7 @@ S32 LLAccordionCtrl::calcRecuiredHeight()
 //---------------------------------------------------------------------------------
 void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	LLRect panel_rect = panel->getRect();
 	panel_rect.setLeftTopAndSize( left, top, width, height);
@@ -321,9 +321,9 @@ void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S3
 	panel->setRect(panel_rect);
 }
 
-void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
+void LLAccordionCtrl::ctrlShiftVertical(LLView* panel, S32 delta)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	panel->translate(0,delta);
 }
@@ -333,9 +333,9 @@ void LLAccordionCtrl::ctrlShiftVertical(LLView* panel,S32 delta)
 void LLAccordionCtrl::addCollapsibleCtrl(LLView* view)
 {
 	LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(view);
-	if(!accordion_tab)
+	if (!accordion_tab)
 		return;
-	if(std::find(beginChild(), endChild(), accordion_tab) == endChild())
+	if (std::find(beginChild(), endChild(), accordion_tab) == endChild())
 		addChild(accordion_tab);
 	mAccordionTabs.push_back(accordion_tab);
 
@@ -369,7 +369,7 @@ void LLAccordionCtrl::removeCollapsibleCtrl(LLView* view)
 	}
 }
 
-void	LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
+void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
 {
 	LLTextBox::Params tp = tb_params;
 	tp.rect(getLocalRect());
@@ -377,39 +377,39 @@ void	LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params)
 	mNoVisibleTabsHelpText = LLUICtrlFactory::create<LLTextBox>(tp, this);
 }
 
-void	LLAccordionCtrl::updateNoTabsHelpTextVisibility()
+void LLAccordionCtrl::updateNoTabsHelpTextVisibility()
 {
 	bool visible_exists = false;
 	std::vector<LLAccordionCtrlTab*>::const_iterator it = mAccordionTabs.begin();
 	const std::vector<LLAccordionCtrlTab*>::const_iterator it_end = mAccordionTabs.end();
-	for (; it != it_end; ++it)
+	while (it < it_end)
 	{
-		if ((*it)->getVisible())
+		if ((*(it++))->getVisible())
 		{
 			visible_exists = true;
 			break;
 		}
 	}
 
-	mNoVisibleTabsHelpText->setVisible(!visible_exists);
+	mNoVisibleTabsHelpText->setVisible(visible_exists ? FALSE : TRUE);
 }
 
-void	LLAccordionCtrl::arrangeSinge()
+void LLAccordionCtrl::arrangeSingle()
 {
-	S32 panel_left = BORDER_MARGIN;	  // Margin from left side of Splitter
-	S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-	S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+	S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
+	S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+	S32 panel_width = getRect().getWidth() - 4;
 	S32 panel_height;
 
 	S32 collapsed_height = 0;
 
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			collapsed_height+=mAccordionTabs[i]->getRect().getHeight();
 		}
@@ -417,28 +417,28 @@ void	LLAccordionCtrl::arrangeSinge()
 
 	S32 expanded_height = getRect().getHeight() - BORDER_MARGIN - collapsed_height;
 	
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			panel_height = accordion_tab->getRect().getHeight();
 		}
 		else
 		{
-			if(mFitParent)
+			if (mFitParent)
 			{
 				panel_height = expanded_height;
 			}
 			else
 			{
-				if(accordion_tab->getAccordionView())
+				if (accordion_tab->getAccordionView())
 				{
 					panel_height = accordion_tab->getAccordionView()->getRect().getHeight() + 
-						accordion_tab->getHeaderHeight() + 2*BORDER_MARGIN;
+						accordion_tab->getHeaderHeight() + BORDER_MARGIN * 2;
 				}
 				else
 				{
@@ -451,67 +451,67 @@ void	LLAccordionCtrl::arrangeSinge()
 		panel_height = llmax(panel_height, accordion_tab->getHeaderHeight());
 
 		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
-		panel_top-=mAccordionTabs[i]->getRect().getHeight();
+		panel_top -= mAccordionTabs[i]->getRect().getHeight();
 	}
 
 	show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
-void	LLAccordionCtrl::arrangeMultiple()
+void LLAccordionCtrl::arrangeMultiple()
 {
-	S32 panel_left = BORDER_MARGIN;	  // Margin from left side of Splitter
-	S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-	S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+	S32 panel_left = BORDER_MARGIN; // Margin from left side of Splitter
+	S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+	S32 panel_width = getRect().getWidth() - 4;
 
 	//Calculate params	
-	for(size_t i = 0; i < mAccordionTabs.size(); i++ )
+	for (size_t i = 0; i < mAccordionTabs.size(); i++ )
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		
-		if(accordion_tab->getVisible() == false) //skip hidden accordion tabs
+		if (accordion_tab->getVisible() == FALSE) // Skip hidden accordion tabs
 			continue;
 		
-		if(!accordion_tab->isExpanded() )
+		if (!accordion_tab->isExpanded() )
 		{
 			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, accordion_tab->getRect().getHeight());
-			panel_top-=mAccordionTabs[i]->getRect().getHeight();
+			panel_top -= mAccordionTabs[i]->getRect().getHeight();
 		}
 		else
 		{
 			S32 panel_height = accordion_tab->getRect().getHeight();
 			
-			if(mFitParent)
+			if (mFitParent)
 			{
-				// all expanded tabs will have equal height
+				// All expanded tabs will have equal height
 				panel_height = calcExpandedTabHeight(i, panel_top);
 				ctrlSetLeftTopAndSize(accordion_tab, panel_left, panel_top, panel_width, panel_height);
 
-				// try to make accordion tab fit accordion view height.
+				// Try to make accordion tab fit accordion view height.
 				// Accordion View should implement getRequiredRect() and provide valid height
 				S32 optimal_height = accordion_tab->getAccordionView()->getRequiredRect().getHeight();
 				optimal_height += accordion_tab->getHeaderHeight() + 2 * BORDER_MARGIN;
-				if(optimal_height < panel_height)
+				if (optimal_height < panel_height)
 				{
 					panel_height = optimal_height;
 				}
 
 				// minimum tab height is equal to header height
-				if(mAccordionTabs[i]->getHeaderHeight() > panel_height)
+				if (mAccordionTabs[i]->getHeaderHeight() > panel_height)
 				{
 					panel_height = mAccordionTabs[i]->getHeaderHeight();
 				}
 			}
 			
 			ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_left, panel_top, panel_width, panel_height);
-			panel_top-=panel_height;
+			panel_top -= panel_height;
 			
 		}
 	}	
 
-	show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+	show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 
-	updateLayout(getRect().getWidth(),getRect().getHeight());
+	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
 
@@ -519,70 +519,67 @@ void LLAccordionCtrl::arrange()
 {
 	updateNoTabsHelpTextVisibility();
 
-	if( mAccordionTabs.size() == 0)
+	if (mAccordionTabs.empty())
 	{
-		//We do not arrange if we do not have what should be arranged
+		// Nothing to arrange
 		return;
 	}
 
-
-	if(mAccordionTabs.size() == 1)
+	if (mAccordionTabs.size() == 1)
 	{
-		S32 panel_top = getRect().getHeight() - BORDER_MARGIN;		  // Top coordinate of the first panel
-		S32 panel_width = getRect().getWidth() - 4;		  // Top coordinate of the first panel
+		S32 panel_top = getRect().getHeight() - BORDER_MARGIN; // Top coordinate of the first panel
+		S32 panel_width = getRect().getWidth() - 4;
 		
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[0]);
 		
 		LLRect panel_rect = accordion_tab->getRect();
 		
-		S32 panel_height = getRect().getHeight() - 2*BORDER_MARGIN;
-
+		S32 panel_height = getRect().getHeight() - BORDER_MARGIN * 2;
 		if (accordion_tab->getFitParent())
 			panel_height = accordion_tab->getRect().getHeight();
-		ctrlSetLeftTopAndSize(accordion_tab,panel_rect.mLeft,panel_top,panel_width,panel_height);
+
+		ctrlSetLeftTopAndSize(accordion_tab, panel_rect.mLeft, panel_top, panel_width, panel_height);
 		
-		show_hide_scrollbar(getRect().getWidth(),getRect().getHeight());
+		show_hide_scrollbar(getRect().getWidth(), getRect().getHeight());
 		return;
-
 	}
 
-	if(mSingleExpansion)
-		arrangeSinge ();
+	if (mSingleExpansion)
+		arrangeSingle();
 	else
-		arrangeMultiple ();
+		arrangeMultiple();
 }
 
 //---------------------------------------------------------------------------------
 
-BOOL LLAccordionCtrl::handleScrollWheel		( S32 x, S32 y, S32 clicks )
+BOOL LLAccordionCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	if(LLPanel::handleScrollWheel(x,y,clicks))
+	if (LLPanel::handleScrollWheel(x, y, clicks))
 		return TRUE;
-	if( mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
+	if (mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
 		return TRUE;
-	return false;
-
+	return FALSE;
 }
 
-BOOL LLAccordionCtrl::handleKeyHere			(KEY key, MASK mask)
+BOOL LLAccordionCtrl::handleKeyHere(KEY key, MASK mask)
 {
-	if( mScrollbar->getVisible() && mScrollbar->handleKeyHere( key,mask ) )
+	if (mScrollbar->getVisible() && mScrollbar->handleKeyHere(key, mask))
 		return TRUE;
-	return LLPanel::handleKeyHere(key,mask);
+	return LLPanel::handleKeyHere(key, mask);
 }
 
-BOOL LLAccordionCtrl::handleDragAndDrop		(S32 x, S32 y, MASK mask,
-											 BOOL drop,
-											 EDragAndDropType cargo_type,
-											 void* cargo_data,
-											 EAcceptance* accept,
-											 std::string& tooltip_msg)
+BOOL LLAccordionCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
+										BOOL drop,
+										EDragAndDropType cargo_type,
+										void* cargo_data,
+										EAcceptance* accept,
+										std::string& tooltip_msg)
 {
 	// Scroll folder view if needed.  Never accepts a drag or drop.
 	*accept = ACCEPT_NO;
 	BOOL handled = autoScroll(x, y);
 
-	if( !handled )
+	if (!handled)
 	{
 		handled = childrenHandleDragAndDrop(x, y, mask, drop, cargo_type,
 											cargo_data, accept, tooltip_msg) != NULL;
@@ -590,14 +587,14 @@ BOOL LLAccordionCtrl::handleDragAndDrop		(S32 x, S32 y, MASK mask,
 	return TRUE;
 }
 
-BOOL LLAccordionCtrl::autoScroll		(S32 x, S32 y)
+BOOL LLAccordionCtrl::autoScroll(S32 x, S32 y)
 {
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
 	bool scrolling = false;
-	if( mScrollbar->getVisible() )
+	if (mScrollbar->getVisible())
 	{
-		LLRect rect_local( 0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0 );
+		LLRect rect_local(0, getRect().getHeight(), getRect().getWidth() - scrollbar_size, 0);
 		LLRect screen_local_extents;
 
 		// clip rect against root view
@@ -610,51 +607,52 @@ BOOL LLAccordionCtrl::autoScroll		(S32 x, S32 y)
 
 		LLRect bottom_scroll_rect = screen_local_extents;
 		bottom_scroll_rect.mTop = rect_local.mBottom + auto_scroll_region_height;
-		if( bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()) )
+		if (bottom_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() < mScrollbar->getDocPosMax()))
 		{
-			mScrollbar->setDocPos( mScrollbar->getDocPos() + auto_scroll_speed );
+			mScrollbar->setDocPos(mScrollbar->getDocPos() + auto_scroll_speed);
 			mAutoScrolling = true;
 			scrolling = true;
 		}
 
 		LLRect top_scroll_rect = screen_local_extents;
 		top_scroll_rect.mBottom = rect_local.mTop - auto_scroll_region_height;
-		if( top_scroll_rect.pointInRect( x, y ) && (mScrollbar->getDocPos() > 0) )
+		if (top_scroll_rect.pointInRect(x, y) && (mScrollbar->getDocPos() > 0))
 		{
-			mScrollbar->setDocPos( mScrollbar->getDocPos() - auto_scroll_speed );
+			mScrollbar->setDocPos(mScrollbar->getDocPos() - auto_scroll_speed);
 			mAutoScrolling = true;
 			scrolling = true;
 		}
 	}
-	return scrolling;
+
+	return scrolling ? TRUE : FALSE;
 }
 
-void	LLAccordionCtrl::updateLayout	(S32 width, S32 height)
+void LLAccordionCtrl::updateLayout(S32 width, S32 height)
 {
 	S32 panel_top = height - BORDER_MARGIN ;
-	if(mScrollbar->getVisible())
-		panel_top+=mScrollbar->getDocPos();
+	if (mScrollbar->getVisible())
+		panel_top += mScrollbar->getDocPos();
 
-	S32 panel_width = width - 2*BORDER_MARGIN;
+	S32 panel_width = width - BORDER_MARGIN * 2;
 
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	if(mScrollbar->getVisible())
-		panel_width-=scrollbar_size;
+	if (mScrollbar->getVisible())
+		panel_width -= scrollbar_size;
 
-	//set sizes for first panels and dragbars
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	// set sizes for first panels and dragbars
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
-		if(!mAccordionTabs[i]->getVisible())
+		if (!mAccordionTabs[i]->getVisible())
 			continue;
 		LLRect panel_rect = mAccordionTabs[i]->getRect();
-		ctrlSetLeftTopAndSize(mAccordionTabs[i],panel_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
-		panel_top-=panel_rect.getHeight();
+		ctrlSetLeftTopAndSize(mAccordionTabs[i], panel_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
+		panel_top -= panel_rect.getHeight();
 	}
 }
 
-void	LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
+void LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
 {
-	updateLayout(getRect().getWidth(),getRect().getHeight());
+	updateLayout(getRect().getWidth(), getRect().getHeight());
 }
 
 // virtual
@@ -687,42 +685,43 @@ void LLAccordionCtrl::onUpdateScrollToChild(const LLUICtrl *cntrl)
     LLUICtrl::onUpdateScrollToChild(cntrl);
 }
 
-void	LLAccordionCtrl::onOpen		(const LLSD& key)
+void LLAccordionCtrl::onOpen(const LLSD& key)
 {
-	for(size_t i=0;i<mAccordionTabs.size();++i)
+	for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 	{
 		LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 		LLPanel* panel = dynamic_cast<LLPanel*>(accordion_tab->getAccordionView());
-		if(panel!=NULL)
+		if (panel != NULL)
 		{
 			panel->onOpen(key);
 		}
 	}
 }
+
 S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "size_changes")
+		if (str_action == "size_changes")
 		{
 			//
 			arrange();
 			return 1;
 		}
-		else if(str_action == "select_next")
+		if (str_action == "select_next")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
-				if(accordion_tab->hasFocus())
+				if (accordion_tab->hasFocus())
 				{
-					while(++i<mAccordionTabs.size())
+					while (++i < mAccordionTabs.size())
 					{
-						if(mAccordionTabs[i]->getVisible())
+						if (mAccordionTabs[i]->getVisible())
 							break;
 					}
-					if(i<mAccordionTabs.size())
+					if (i < mAccordionTabs.size())
 					{
 						accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
 						accordion_tab->notify(LLSD().with("action","select_first"));
@@ -733,17 +732,17 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "select_prev")
+		if (str_action == "select_prev")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				LLAccordionCtrlTab* accordion_tab = dynamic_cast<LLAccordionCtrlTab*>(mAccordionTabs[i]);
-				if(accordion_tab->hasFocus() && i>0)
+				if (accordion_tab->hasFocus() && i > 0)
 				{
 					bool prev_visible_tab_found = false;
-					while(i>0)
+					while (i > 0)
 					{
-						if(mAccordionTabs[--i]->getVisible())
+						if (mAccordionTabs[--i]->getVisible())
 						{
 							prev_visible_tab_found = true;
 							break;
@@ -761,12 +760,12 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "select_current")
+		if (str_action == "select_current")
 		{
-			for(size_t i=0;i<mAccordionTabs.size();++i)
+			for (size_t i = 0; i < mAccordionTabs.size(); ++i)
 			{
 				// Set selection to the currently focused tab.
-				if(mAccordionTabs[i]->hasFocus())
+				if (mAccordionTabs[i]->hasFocus())
 				{
 					if (mAccordionTabs[i] != mSelectedTab)
 					{
@@ -783,7 +782,7 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 			}
 			return 0;
 		}
-		else if(str_action == "deselect_current")
+		if (str_action == "deselect_current")
 		{
 			// Reset selection to the currently selected tab.
 			if (mSelectedTab)
@@ -802,9 +801,9 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 		screenRectToLocal(screen_rc, &local_rc);
 
 		// Translate to parent coordinatess to check if we are in visible rectangle
-		local_rc.translate( getRect().mLeft, getRect().mBottom );
+		local_rc.translate(getRect().mLeft, getRect().mBottom);
 
-		if ( !getRect().contains (local_rc) )
+		if (!getRect().contains (local_rc))
 		{
 			// Back to local coords and calculate position for scroller
 			S32 bottom = mScrollbar->getDocPos() - local_rc.mBottom + getRect().mBottom;
@@ -814,7 +813,7 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 									 bottom, // min vertical scroll
 									 top); // max vertical scroll 
 
-			mScrollbar->setDocPos( scroll_pos );
+			mScrollbar->setDocPos(scroll_pos);
 		}
 		return 1;
 	}
@@ -834,15 +833,16 @@ S32	LLAccordionCtrl::notifyParent(const LLSD& info)
 	}
 	return LLPanel::notifyParent(info);
 }
-void	LLAccordionCtrl::reset		()
+
+void LLAccordionCtrl::reset()
 {
-	if(mScrollbar)
+	if (mScrollbar)
 		mScrollbar->setDocPos(0);
 }
 
 void LLAccordionCtrl::expandDefaultTab()
 {
-	if (mAccordionTabs.size() > 0)
+	if (!mAccordionTabs.empty())
 	{
 		LLAccordionCtrlTab* tab = mAccordionTabs.front();
 
@@ -877,7 +877,7 @@ void LLAccordionCtrl::sort()
 	arrange();
 }
 
-void	LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
+void LLAccordionCtrl::setFilterSubString(const std::string& filter_string)
 {
 	LLStringUtil::format_map_t args;
 	args["[SEARCH_TERM]"] = LLURI::escape(filter_string);
@@ -907,7 +907,7 @@ const LLAccordionCtrlTab* LLAccordionCtrl::getExpandedTab() const
 
 S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 available_height /* = 0 */)
 {
-	if(tab_index < 0)
+	if (tab_index < 0)
 	{
 		return available_height;
 	}
@@ -915,9 +915,9 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
 	S32 collapsed_tabs_height = 0;
 	S32 num_expanded = 0;
 
-	for(size_t n = tab_index; n < mAccordionTabs.size(); ++n)
+	for (size_t n = tab_index; n < mAccordionTabs.size(); ++n)
 	{
-		if(!mAccordionTabs[n]->isExpanded())
+		if (!mAccordionTabs[n]->isExpanded())
 		{
 			collapsed_tabs_height += mAccordionTabs[n]->getHeaderHeight();
 		}
@@ -927,7 +927,7 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
 		}
 	}
 
-	if(0 == num_expanded)
+	if (0 == num_expanded)
 	{
 		return available_height;
 	}
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 2828254472..6a1989afba 100644
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -144,7 +144,7 @@ private:
 	void	initNoTabsWidget(const LLTextBox::Params& tb_params);
 	void	updateNoTabsHelpTextVisibility();
 
-	void	arrangeSinge();
+	void	arrangeSingle();
 	void	arrangeMultiple();
 
 	// Calc Splitter's height that is necessary to display all child content
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index 04485c6262..20da568746 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -69,13 +69,13 @@ public:
 	virtual BOOL postBuild();
 
 	std::string getTitle();
-	void	setTitle(const std::string& title, const std::string& hl);
+	void setTitle(const std::string& title, const std::string& hl);
 
-	void	setTitleFontStyle(std::string style);
+	void setTitleFontStyle(std::string style);
 
-	void	setTitleColor(LLUIColor);
+	void setTitleColor(LLUIColor);
 
-	void	setSelected(bool is_selected) { mIsSelected = is_selected; }
+	void setSelected(bool is_selected) { mIsSelected = is_selected; }
 
 	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
 	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
@@ -85,8 +85,8 @@ public:
 								   void* cargo_data,
 								   EAcceptance* accept,
 								   std::string& tooltip_msg);
-private:
 
+private:
 	LLTextBox* mHeaderTextbox;
 
 	// Overlay images (arrows)
@@ -102,7 +102,7 @@ private:
 	LLPointer<LLUIImage> mImageHeaderFocused;
 
 	// style saved when applying it in setTitleFontStyle
-	LLStyle::Params			mStyleParams;
+	LLStyle::Params mStyleParams;
 
 	LLUIColor mHeaderBGColor;
 
@@ -157,19 +157,17 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::postBuild()
 
 std::string LLAccordionCtrlTab::LLAccordionCtrlTabHeader::getTitle()
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		return mHeaderTextbox->getText();
 	}
-	else
-	{
-		return LLStringUtil::null;
-	}
+
+	return LLStringUtil::null;
 }
 
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitle(const std::string& title, const std::string& hl)
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		LLTextUtil::textboxSetHighlightedVal(
 			mHeaderTextbox,
@@ -192,7 +190,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleFontStyle(std::string
 
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::setTitleColor(LLUIColor color)
 {
-	if(mHeaderTextbox)
+	if (mHeaderTextbox)
 	{
 		mHeaderTextbox->setColor(color);
 	}
@@ -204,11 +202,11 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 	S32 height = getRect().getHeight();
 
 	F32 alpha = getCurrentTransparency();
-	gl_rect_2d(0,0,width - 1 ,height - 1,mHeaderBGColor.get() % alpha,true);
+	gl_rect_2d(0, 0, width - 1, height - 1, mHeaderBGColor.get() % alpha, TRUE);
 
 	LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
-	bool collapsible = (parent && parent->getCollapsible());
-	bool expanded = (parent && parent->getDisplayChildren());
+	bool collapsible = parent && parent->getCollapsible();
+	bool expanded = parent && parent->getDisplayChildren();
 
 	// Handle overlay images, if needed
 	// Only show green "focus" background image if the accordion is open,
@@ -218,23 +216,22 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 		/*&& !(collapsible && !expanded)*/ // WHY??
 		)
 	{
-		mImageHeaderFocused->draw(0,0,width,height);
+		mImageHeaderFocused->draw(0, 0, width, height);
 	}
 	else
 	{
-		mImageHeader->draw(0,0,width,height);
+		mImageHeader->draw(0, 0, width, height);
 	}
 
-	if(mNeedsHighlight)
+	if (mNeedsHighlight)
 	{
-		mImageHeaderOver->draw(0,0,width,height);
+		mImageHeaderOver->draw(0, 0, width, height);
 	}
-	
 
-	if(collapsible)
+	if (collapsible)
 	{
 		LLPointer<LLUIImage> overlay_image;
-		if(expanded)
+		if (expanded)
 		{
 			overlay_image = mImageExpanded;
 		}
@@ -242,8 +239,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 		{
 			overlay_image = mImageCollapsed;
 		}
-		overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET,
-							(height - overlay_image->getHeight()) / 2);
+		overlay_image->draw(HEADER_IMAGE_LEFT_OFFSET, (height - overlay_image->getHeight()) / 2);
 	}
 	
 	LLUICtrl::draw();
@@ -253,7 +249,7 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::reshape(S32 width, S32 height
 {
 	S32 header_height = mHeaderTextbox->getTextPixelHeight();
 
-	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET,(height+header_height)/2 ,width,(height-header_height)/2);
+	LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET, (height + header_height) / 2, width, (height - header_height) / 2);
 	mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
 	mHeaderTextbox->setRect(textboxRect);
 
@@ -272,20 +268,24 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseEnter(S32 x, S32 y, MA
 	LLUICtrl::onMouseEnter(x, y, mask);
 	mNeedsHighlight = true;
 }
+
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	LLUICtrl::onMouseLeave(x, y, mask);
 	mNeedsHighlight = false;
 	mAutoOpenTimer.stop();
 }
+
 BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	if ( ( key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
+	if ((key == KEY_LEFT || key == KEY_RIGHT) && mask == MASK_NONE)
 	{
 		return getParent()->handleKey(key, mask, called_from_parent);
 	}
+
 	return LLUICtrl::handleKey(key, mask, called_from_parent);
 }
+
 BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32 y, MASK mask,
 																	 BOOL drop,
 																	 EDragAndDropType cargo_type,
@@ -295,7 +295,7 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
 {
 	LLAccordionCtrlTab* parent = dynamic_cast<LLAccordionCtrlTab*>(getParent());
 
-	if ( parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose() )
+	if (parent && !parent->getDisplayChildren() && parent->getCollapsible() && parent->canOpenClose())
 	{
 		if (mAutoOpenTimer.getStarted())
 		{
@@ -307,12 +307,15 @@ BOOL LLAccordionCtrlTab::LLAccordionCtrlTabHeader::handleDragAndDrop(S32 x, S32
 			}
 		}
 		else
+		{
 			mAutoOpenTimer.start();
+		}
 	}
 
 	return LLUICtrl::handleDragAndDrop(x, y, mask, drop, cargo_type,
 									   cargo_data, accept, tooltip_msg);
 }
+
 LLAccordionCtrlTab::Params::Params()
 	: title("title")
 	,display_children("expanded", true)
@@ -384,41 +387,39 @@ LLAccordionCtrlTab::~LLAccordionCtrlTab()
 {
 }
 
-
 void LLAccordionCtrlTab::setDisplayChildren(bool display)
 {
 	mDisplayChildren = display;
 	LLRect rect = getRect();
 
-	rect.mBottom = rect.mTop - (getDisplayChildren() ? 
-		mExpandedHeight : HEADER_HEIGHT);
+	rect.mBottom = rect.mTop - (getDisplayChildren() ? mExpandedHeight : HEADER_HEIGHT);
 	setRect(rect);
 
-	if(mContainerPanel)
+	if (mContainerPanel)
+	{
 		mContainerPanel->setVisible(getDisplayChildren());
+	}
 
-	if(mDisplayChildren)
+	if (mDisplayChildren)
 	{
 		adjustContainerPanel();
 	}
 	else
 	{
-		if(mScrollbar)
-			mScrollbar->setVisible(false);
+		if (mScrollbar)
+			mScrollbar->setVisible(FALSE);
 	}
-
 }
 
 void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
 {
 	LLRect headerRect;
 
-	headerRect.setLeftTopAndSize(
-		0,height,width,HEADER_HEIGHT);
+	headerRect.setLeftTopAndSize(0, height, width, HEADER_HEIGHT);
 	mHeader->setRect(headerRect);
 	mHeader->reshape(headerRect.getWidth(), headerRect.getHeight());
 
-	if(!mDisplayChildren)
+	if (!mDisplayChildren)
 		return;
 
 	LLRect childRect;
@@ -426,7 +427,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
 	childRect.setLeftTopAndSize(
 		getPaddingLeft(),
 		height - getHeaderHeight() - getPaddingTop(),
-		width - getPaddingLeft() - getPaddingRight(), 
+		width - getPaddingLeft() - getPaddingRight(),
 		height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
 
 	adjustContainerPanel(childRect);
@@ -434,7 +435,7 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, BOOL called_from_parent
 
 void LLAccordionCtrlTab::changeOpenClose(bool is_open)
 {
-	if(is_open)
+	if (is_open)
 		mExpandedHeight = getRect().getHeight();
 
 	setDisplayChildren(!is_open);
@@ -483,14 +484,14 @@ void LLAccordionCtrlTab::onUpdateScrollToChild(const LLUICtrl *cntrl)
 
 BOOL LLAccordionCtrlTab::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	if(mCollapsible && mHeaderVisible && mCanOpenClose)
+	if (mCollapsible && mHeaderVisible && mCanOpenClose)
 	{
-		if(y >= (getRect().getHeight() - HEADER_HEIGHT) )
+		if (y >= (getRect().getHeight() - HEADER_HEIGHT))
 		{
 			mHeader->setFocus(true);
 			changeOpenClose(getDisplayChildren());
 
-			//reset stored state
+			// Reset stored state
 			mWasStateStored = false;
 			return TRUE;
 		}
@@ -510,7 +511,7 @@ boost::signals2::connection LLAccordionCtrlTab::setDropDownStateChangedCallback(
 
 bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 {
-	if(DD_HEADER_NAME != child->getName())
+	if (DD_HEADER_NAME != child->getName())
 	{
 		reshape(child->getRect().getWidth() , child->getRect().getHeight() + HEADER_HEIGHT );
 		mExpandedHeight = getRect().getHeight();
@@ -518,12 +519,12 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 
 	bool res = LLUICtrl::addChild(child, tab_group);
 
-	if(DD_HEADER_NAME != child->getName())
+	if (DD_HEADER_NAME != child->getName())
 	{
-		if(!mCollapsible)
+		if (!mCollapsible)
 			setDisplayChildren(true);
 		else
-			setDisplayChildren(getDisplayChildren());	
+			setDisplayChildren(getDisplayChildren());
 	}
 
 	if (!mContainerPanel)
@@ -534,7 +535,7 @@ bool LLAccordionCtrlTab::addChild(LLView* child, S32 tab_group)
 
 void LLAccordionCtrlTab::setAccordionView(LLView* panel)
 {
-	addChild(panel,0);
+	addChild(panel, 0);
 }
 
 std::string LLAccordionCtrlTab::getTitle() const
@@ -543,10 +544,8 @@ std::string LLAccordionCtrlTab::getTitle() const
 	{
 		return mHeader->getTitle();
 	}
-	else
-	{
-		return LLStringUtil::null;
-	}
+
+	return LLStringUtil::null;
 }
 
 void LLAccordionCtrlTab::setTitle(const std::string& title, const std::string& hl)
@@ -579,6 +578,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusReceivedCallback(const f
 	{
 		return mHeader->setFocusReceivedCallback(cb);
 	}
+
 	return boost::signals2::connection();
 }
 
@@ -588,6 +588,7 @@ boost::signals2::connection LLAccordionCtrlTab::setFocusLostCallback(const focus
 	{
 		return mHeader->setFocusLostCallback(cb);
 	}
+
 	return boost::signals2::connection();
 }
 
@@ -601,59 +602,65 @@ void LLAccordionCtrlTab::setSelected(bool is_selected)
 
 LLView*	LLAccordionCtrlTab::findContainerView()
 {
-	for(child_list_const_iter_t it = getChildList()->begin(); 
-		getChildList()->end() != it; ++it)
+	child_list_const_iter_t it = getChildList()->begin(), it_end = getChildList()->end();
+	while (it != it_end)
 	{
-		LLView* child = *it;
-		if(DD_HEADER_NAME == child->getName())
-			continue;
-		if(!child->getVisible())
-			continue;
-		return child;
+		LLView* child = *(it++);
+		if (DD_HEADER_NAME != child->getName() && child->getVisible())
+			return child;
 	}
+
 	return NULL;
 }
 
 void LLAccordionCtrlTab::selectOnFocusReceived()
 {
 	if (getParent()) // A parent may not be set if tabs are added dynamically.
+	{
 		getParent()->notifyParent(LLSD().with("action", "select_current"));
+	}
 }
 
 void LLAccordionCtrlTab::deselectOnFocusLost()
 {
-	if(getParent()) // A parent may not be set if tabs are added dynamically.
+	if (getParent()) // A parent may not be set if tabs are added dynamically.
 	{
 		getParent()->notifyParent(LLSD().with("action", "deselect_current"));
 	}
-
 }
 
 S32 LLAccordionCtrlTab::getHeaderHeight()
 {
-	return mHeaderVisible?HEADER_HEIGHT:0; 
+	return mHeaderVisible ? HEADER_HEIGHT : 0;
 }
 
-void LLAccordionCtrlTab::setHeaderVisible(bool value) 
+void LLAccordionCtrlTab::setHeaderVisible(bool value)
 {
-	if(mHeaderVisible == value)
+	if (mHeaderVisible == value)
 		return;
+
 	mHeaderVisible = value;
-	if(mHeader)
-		mHeader->setVisible(value);
+
+	if (mHeader)
+	{
+		mHeader->setVisible(value ? TRUE : FALSE);
+	}
+
 	reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
 };
 
 //virtual
 BOOL LLAccordionCtrlTab::postBuild()
 {
-	if(mHeader)
+	if (mHeader)
+	{
 		mHeader->setVisible(mHeaderVisible);
-	
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+	}
+
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
 
 	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
+	scroll_rect.setOriginAndSize(
 		getRect().getWidth() - scrollbar_size,
 		1,
 		scrollbar_size,
@@ -661,7 +668,7 @@ BOOL LLAccordionCtrlTab::postBuild()
 
 	mContainerPanel = findContainerView();
 
-	if(!mFitPanel)
+	if (!mFitPanel)
 	{
 		LLScrollbar::Params sbparams;
 		sbparams.name("scrollable vertical");
@@ -674,9 +681,8 @@ BOOL LLAccordionCtrlTab::postBuild()
 		sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
 		sbparams.change_callback(boost::bind(&LLAccordionCtrlTab::onScrollPosChangeCallback, this, _1, _2));
 
-
-		mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
-		LLView::addChild( mScrollbar );
+		mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
+		LLView::addChild(mScrollbar);
 		mScrollbar->setFollowsRight();
 		mScrollbar->setFollowsTop();
 		mScrollbar->setFollowsBottom();
@@ -684,44 +690,48 @@ BOOL LLAccordionCtrlTab::postBuild()
 		mScrollbar->setVisible(false);
 	}
 
-	if(mContainerPanel)
+	if (mContainerPanel)
+	{
 		mContainerPanel->setVisible(mDisplayChildren);
+	}
 
 	return LLUICtrl::postBuild();
 }
-bool	LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
+
+bool LLAccordionCtrlTab::notifyChildren	(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "store_state")
+		if (str_action == "store_state")
 		{
 			storeOpenCloseState();
 			return true;
 		}
-		if(str_action == "restore_state")
+
+		if (str_action == "restore_state")
 		{
 			restoreOpenCloseState();
 			return true;
 		}
 	}	
+
 	return LLUICtrl::notifyChildren(info);
 }
 
 S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "size_changes")
+		if (str_action == "size_changes")
 		{
-			//
 			S32 height = info["height"];
-			height = llmax(height,10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
+			height = llmax(height, 10) + HEADER_HEIGHT + getPaddingTop() + getPaddingBottom();
 			
 			mExpandedHeight = height;
 			
-			if(isExpanded() && !mSkipChangesOnNotifyParent)
+			if (isExpanded() && !mSkipChangesOnNotifyParent)
 			{
 				LLRect panel_rect = getRect();
 				panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), height);
@@ -729,12 +739,13 @@ S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 				setRect(panel_rect);
 			}
 			
-			//LLAccordionCtrl should rearrange accordion tab if one of accordion change its size
+			// LLAccordionCtrl should rearrange accordion tab if one of accordions changed its size
 			if (getParent()) // A parent may not be set if tabs are added dynamically.
 				getParent()->notifyParent(info);
 			return 1;
 		}
-		else if(str_action == "select_prev") 
+
+		if (str_action == "select_prev") 
 		{
 			showAndFocusHeader();
 			return 1;
@@ -772,78 +783,85 @@ S32	LLAccordionCtrlTab::notifyParent(const LLSD& info)
 
 S32 LLAccordionCtrlTab::notify(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "select_first")
+		if (str_action == "select_first")
 		{
 			showAndFocusHeader();
 			return 1;
 		}
-		else if( str_action == "select_last" )
+
+		if (str_action == "select_last")
 		{
-			if(getDisplayChildren() == false)
+			if (!getDisplayChildren())
 			{
 				showAndFocusHeader();
 			}
 			else
 			{
 				LLView* view = getAccordionView();
-				if(view)
-					view->notify(LLSD().with("action","select_last"));
+				if (view)
+				{
+					view->notify(LLSD().with("action", "select_last"));
+				}
 			}
 		}
 	}
+
 	return 0;
 }
 
 BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-	if( !mHeader->hasFocus() )
+	if (!mHeader->hasFocus())
 		return LLUICtrl::handleKey(key, mask, called_from_parent);
 
-	if ( (key == KEY_RETURN )&& mask == MASK_NONE)
+	if ((key == KEY_RETURN) && mask == MASK_NONE)
 	{
 		changeOpenClose(getDisplayChildren());
 		return TRUE;
 	}
 
-	if ( (key == KEY_ADD || key == KEY_RIGHT)&& mask == MASK_NONE)
+	if ((key == KEY_ADD || key == KEY_RIGHT) && mask == MASK_NONE)
 	{
-		if(getDisplayChildren() == false)
+		if (!getDisplayChildren())
 		{
 			changeOpenClose(getDisplayChildren());
 			return TRUE;
 		}
 	}
-	if ( (key == KEY_SUBTRACT || key == KEY_LEFT)&& mask == MASK_NONE)
+
+	if ((key == KEY_SUBTRACT || key == KEY_LEFT) && mask == MASK_NONE)
 	{
-		if(getDisplayChildren() == true)
+		if (getDisplayChildren())
 		{
 			changeOpenClose(getDisplayChildren());
 			return TRUE;
 		}
 	}
 
-	if ( key == KEY_DOWN && mask == MASK_NONE)
+	if (key == KEY_DOWN && mask == MASK_NONE)
 	{
-		//if collapsed go to the next accordion
-		if(getDisplayChildren() == false)
-			//we processing notifyParent so let call parent directly
-			getParent()->notifyParent(LLSD().with("action","select_next"));
+		// if collapsed go to the next accordion
+		if (!getDisplayChildren())
+		{
+			// we're processing notifyParent so let call parent directly
+			getParent()->notifyParent(LLSD().with("action", "select_next"));
+		}
 		else
 		{
-			getAccordionView()->notify(LLSD().with("action","select_first"));
+			getAccordionView()->notify(LLSD().with("action", "select_first"));
 		}
 		return TRUE;
 	}
 
-	if ( key == KEY_UP && mask == MASK_NONE)
+	if (key == KEY_UP && mask == MASK_NONE)
 	{
-		//go to the previous accordion
+		// go to the previous accordion
 
-		//we processing notifyParent so let call parent directly
-		getParent()->notifyParent(LLSD().with("action","select_prev"));
+		// we're processing notifyParent so let call parent directly
+		getParent()->notifyParent(LLSD().with("action", "select_prev"));
 		return TRUE;
 	}
 
@@ -869,28 +887,29 @@ void LLAccordionCtrlTab::showAndFocusHeader()
 	// accordion tab (assuming that the parent is an LLAccordionCtrl) the calls chain
 	// is shortened and messages from inside the collapsed tabs are avoided.
 	// See STORM-536.
-	getParent()->notifyParent(LLSD().with("scrollToShowRect",screen_rc.getValue()));
+	getParent()->notifyParent(LLSD().with("scrollToShowRect", screen_rc.getValue()));
 }
-void    LLAccordionCtrlTab::storeOpenCloseState()
+
+void LLAccordionCtrlTab::storeOpenCloseState()
 {
-	if(mWasStateStored)
+	if (mWasStateStored)
 		return;
 	mStoredOpenCloseState = getDisplayChildren();
 	mWasStateStored = true;
 }
 
-void   LLAccordionCtrlTab::restoreOpenCloseState()
+void LLAccordionCtrlTab::restoreOpenCloseState()
 {
-	if(!mWasStateStored)
+	if (!mWasStateStored)
 		return;
-	if(getDisplayChildren() != mStoredOpenCloseState)
+	if (getDisplayChildren() != mStoredOpenCloseState)
 	{
 		changeOpenClose(getDisplayChildren());
 	}
 	mWasStateStored = false;
 }
 
-void LLAccordionCtrlTab::adjustContainerPanel	()
+void LLAccordionCtrlTab::adjustContainerPanel()
 {
 	S32 width = getRect().getWidth();
 	S32 height = getRect().getHeight();
@@ -907,83 +926,83 @@ void LLAccordionCtrlTab::adjustContainerPanel	()
 
 void LLAccordionCtrlTab::adjustContainerPanel(const LLRect& child_rect)
 {
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return; 
 
-	if(!mFitPanel)
+	if (!mFitPanel)
 	{
 		show_hide_scrollbar(child_rect);
 		updateLayout(child_rect);
 	}
 	else
 	{
-		mContainerPanel->reshape(child_rect.getWidth(),child_rect.getHeight());
+		mContainerPanel->reshape(child_rect.getWidth(), child_rect.getHeight());
 		mContainerPanel->setRect(child_rect);
 	}
 }
 
 S32 LLAccordionCtrlTab::getChildViewHeight()
 {
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return 0;
 	return mContainerPanel->getRect().getHeight();
 }
 
 void LLAccordionCtrlTab::show_hide_scrollbar(const LLRect& child_rect)
 {
-	if(getChildViewHeight() > child_rect.getHeight() )
+	if (getChildViewHeight() > child_rect.getHeight())
 		showScrollbar(child_rect);
 	else
 		hideScrollbar(child_rect);
 }
+
 void LLAccordionCtrlTab::showScrollbar(const LLRect& child_rect)
 {
-	if(!mContainerPanel || !mScrollbar)
+	if (!mContainerPanel || !mScrollbar)
 		return;
 	bool was_visible = mScrollbar->getVisible();
 	mScrollbar->setVisible(true);
 	
 	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
-	{
-		ctrlSetLeftTopAndSize(mScrollbar,child_rect.getWidth()-scrollbar_size, 
-			child_rect.getHeight()-PARENT_BORDER_MARGIN, 
-			scrollbar_size, 
-			child_rect.getHeight()-2*PARENT_BORDER_MARGIN);
-	}
+	ctrlSetLeftTopAndSize(mScrollbar,
+		child_rect.getWidth() - scrollbar_size,
+		child_rect.getHeight() - PARENT_BORDER_MARGIN,
+		scrollbar_size, 
+		child_rect.getHeight() - PARENT_BORDER_MARGIN * 2);
 
 	LLRect orig_rect = mContainerPanel->getRect();
 
 	mScrollbar->setPageSize(child_rect.getHeight());
-	mScrollbar->setDocParams(orig_rect.getHeight(),mScrollbar->getDocPos());
+	mScrollbar->setDocParams(orig_rect.getHeight(), mScrollbar->getDocPos());
 	
-	if(was_visible)
+	if (was_visible)
 	{
 		S32 scroll_pos = llmin(mScrollbar->getDocPos(), orig_rect.getHeight() - child_rect.getHeight() - 1);
 		mScrollbar->setDocPos(scroll_pos);
 	}
-	else//shrink child panel
+	else // Shrink child panel
 	{
 		updateLayout(child_rect);
 	}
-	
 }
 
-void	LLAccordionCtrlTab::hideScrollbar( const LLRect& child_rect )
+void LLAccordionCtrlTab::hideScrollbar(const LLRect& child_rect)
 {
-	if(!mContainerPanel || !mScrollbar)
+	if (!mContainerPanel || !mScrollbar)
 		return;
 
-	if(mScrollbar->getVisible() == false)
+	if (mScrollbar->getVisible() == FALSE)
 		return;
-	mScrollbar->setVisible(false);
+
+	mScrollbar->setVisible(FALSE);
 	mScrollbar->setDocPos(0);
 
 	//shrink child panel
 	updateLayout(child_rect);
 }
 
-void	LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
+void LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
 {
 	LLRect child_rect;
 
@@ -999,21 +1018,20 @@ void	LLAccordionCtrlTab::onScrollPosChangeCallback(S32, LLScrollbar*)
 	updateLayout(child_rect);
 }
 
-void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
+void LLAccordionCtrlTab::drawChild(const LLRect& root_rect, LLView* child)
 {
 	if (child && child->getVisible() && child->getRect().isValid())
 	{
 		LLRect screen_rect;
-		localRectToScreen(child->getRect(),&screen_rect);
-		
-		if ( root_rect.overlaps(screen_rect)  && sDirtyRect.overlaps(screen_rect))
+		localRectToScreen(child->getRect(), &screen_rect);
+
+		if (root_rect.overlaps(screen_rect) && sDirtyRect.overlaps(screen_rect))
 		{
 			gGL.matrixMode(LLRender::MM_MODELVIEW);
 			LLUI::pushMatrix();
 			{
 				LLUI::translate((F32)child->getRect().mLeft, (F32)child->getRect().mBottom);
 				child->draw();
-
 			}
 			LLUI::popMatrix();
 		}
@@ -1022,64 +1040,67 @@ void LLAccordionCtrlTab::drawChild(const LLRect& root_rect,LLView* child)
 
 void LLAccordionCtrlTab::draw()
 {
-	if(mFitPanel)
+	if (mFitPanel)
+	{
 		LLUICtrl::draw();
+	}
 	else
 	{
-		LLRect root_rect = getRootView()->getRect();
-		drawChild(root_rect,mHeader);
-		drawChild(root_rect,mScrollbar );
-		{
-			LLRect child_rect;
+		LLRect root_rect(getRootView()->getRect());
+		drawChild(root_rect, mHeader);
+		drawChild(root_rect, mScrollbar);
 
-			S32 width = getRect().getWidth();
-			S32 height = getRect().getHeight();
+		LLRect child_rect;
 
-			child_rect.setLeftTopAndSize(
-				getPaddingLeft(),
-				height - getHeaderHeight() - getPaddingTop(),
-				width - getPaddingLeft() - getPaddingRight(), 
-				height - getHeaderHeight() - getPaddingTop() - getPaddingBottom() );
+		S32 width = getRect().getWidth();
+		S32 height = getRect().getHeight();
 
-			LLLocalClipRect clip(child_rect);
-			drawChild(root_rect,mContainerPanel);
-		}
+		child_rect.setLeftTopAndSize(
+			getPaddingLeft(),
+			height - getHeaderHeight() - getPaddingTop(),
+			width - getPaddingLeft() - getPaddingRight(),
+			height - getHeaderHeight() - getPaddingTop() - getPaddingBottom());
+
+		LLLocalClipRect clip(child_rect);
+		drawChild(root_rect,mContainerPanel);
 	}
 }
 
-void	LLAccordionCtrlTab::updateLayout	( const LLRect& child_rect )
+void LLAccordionCtrlTab::updateLayout(const LLRect& child_rect)
 {
 	LLView*	child = getAccordionView();
-	if(!mContainerPanel)
+	if (!mContainerPanel)
 		return;
 
 	S32 panel_top = child_rect.getHeight();
 	S32 panel_width = child_rect.getWidth();
 
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-	if(mScrollbar && mScrollbar->getVisible() != false)
+	static LLUICachedControl<S32> scrollbar_size("UIScrollbarSize", 0);
+	if (mScrollbar && mScrollbar->getVisible())
 	{
-		panel_top+=mScrollbar->getDocPos();
-		panel_width-=scrollbar_size;
+		panel_top += mScrollbar->getDocPos();
+		panel_width -= scrollbar_size;
 	}
 
-	//set sizes for first panels and dragbars
+	// Set sizes for first panels and dragbars
 	LLRect panel_rect = child->getRect();
-	ctrlSetLeftTopAndSize(mContainerPanel,child_rect.mLeft,panel_top,panel_width,panel_rect.getHeight());
+	ctrlSetLeftTopAndSize(mContainerPanel, child_rect.mLeft, panel_top, panel_width, panel_rect.getHeight());
 }
+
 void LLAccordionCtrlTab::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S32 width, S32 height)
 {
-	if(!panel)
+	if (!panel)
 		return;
 	LLRect panel_rect = panel->getRect();
-	panel_rect.setLeftTopAndSize( left, top, width, height);
+	panel_rect.setLeftTopAndSize(left, top, width, height);
 	panel->reshape( width, height, 1);
 	panel->setRect(panel_rect);
 }
+
 BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 {
 	//header may be not the first child but we need to process it first
-	if(y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT/2) )
+	if (y >= (getRect().getHeight() - HEADER_HEIGHT - HEADER_HEIGHT / 2))
 	{
 		//inside tab header
 		//fix for EXT-6619
@@ -1088,16 +1109,18 @@ BOOL LLAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 	}
 	return LLUICtrl::handleToolTip(x, y, mask);
 }
-BOOL LLAccordionCtrlTab::handleScrollWheel		( S32 x, S32 y, S32 clicks )
+
+BOOL LLAccordionCtrlTab::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-	if( LLUICtrl::handleScrollWheel(x,y,clicks))
+	if (LLUICtrl::handleScrollWheel(x, y, clicks))
 	{
 		return TRUE;
 	}
-	if( mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel( 0, 0, clicks ) )
+
+	if (mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollWheel(0, 0, clicks))
 	{
 		return TRUE;
 	}
+
 	return FALSE;
 }
-
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 2c72e8c036..896a34cac4 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -104,7 +104,7 @@ public:
 	virtual void setDisplayChildren(bool display);
 
 	// Returns expand/collapse state
-	virtual bool getDisplayChildren() const {return mDisplayChildren;};
+	virtual bool getDisplayChildren() const { return mDisplayChildren; };
 
 	//set LLAccordionCtrlTab panel
 	void		setAccordionView(LLView* panel);
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index b13e7389cc..460bd0945b 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1198,7 +1198,7 @@ void LLFlatListView::onFocusReceived()
 {
 	if (size())
 	{
-	mSelectedItemsBorder->setVisible(TRUE);
+		mSelectedItemsBorder->setVisible(TRUE);
 	}
 	gEditMenuHandler = this;
 }
@@ -1207,7 +1207,7 @@ void LLFlatListView::onFocusLost()
 {
 	mSelectedItemsBorder->setVisible(FALSE);
 	// Route menu back to the default
- 	if( gEditMenuHandler == this )
+	if (gEditMenuHandler == this)
 	{
 		gEditMenuHandler = NULL;
 	}
@@ -1216,16 +1216,16 @@ void LLFlatListView::onFocusLost()
 //virtual 
 S32 LLFlatListView::notify(const LLSD& info)
 {
-	if(info.has("action"))
+	if (info.has("action"))
 	{
 		std::string str_action = info["action"];
-		if(str_action == "select_first")
+		if (str_action == "select_first")
 		{
 			setFocus(true);
 			selectFirstItem();
 			return 1;
 		}
-		else if(str_action == "select_last")
+		else if (str_action == "select_last")
 		{
 			setFocus(true);
 			selectLastItem();
@@ -1238,6 +1238,7 @@ S32 LLFlatListView::notify(const LLSD& info)
 		notifyParentItemsRectChanged();
 		return 1;
 	}
+
 	return 0;
 }
 
@@ -1249,10 +1250,8 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 	detached_items.clear();
 	// Go through items and detach valid items, remove them from items panel
 	// and add to detached_items.
-	for (pairs_iterator_t
-			 iter = mItemPairs.begin(),
-			 iter_end = mItemPairs.end();
-		 iter != iter_end; ++iter)
+	pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+	while (iter != iter_end)
 	{
 		LLPanel* pItem = (*iter)->first;
 		if (1 == pItem->notify(action))
@@ -1261,6 +1260,7 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 			mItemsPanel->removeChild(pItem);
 			detached_items.push_back(pItem);
 		}
+		iter++;
 	}
 	if (!detached_items.empty())
 	{
@@ -1268,13 +1268,12 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 		if (detached_items.size() == mItemPairs.size())
 		{
 			// This way will be faster if all items were disconnected
-			for (pairs_iterator_t
-					 iter = mItemPairs.begin(),
-					 iter_end = mItemPairs.end();
-				 iter != iter_end; ++iter)
+			pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+			while (iter != iter_end)
 			{
 				(*iter)->first = NULL;
 				delete *iter;
+				iter++;
 			}
 			mItemPairs.clear();
 			// Also set items panel height to zero.
@@ -1287,16 +1286,14 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 		}
 		else
 		{
-			for (std::vector<LLPanel*>::const_iterator
-					 detached_iter = detached_items.begin(),
-					 detached_iter_end = detached_items.end();
-				 detached_iter != detached_iter_end; ++detached_iter)
+			std::vector<LLPanel*>::const_iterator
+				detached_iter = detached_items.begin(),
+				detached_iter_end = detached_items.end();
+			while (detached_iter < detached_iter_end)
 			{
 				LLPanel* pDetachedItem = *detached_iter;
-				for (pairs_iterator_t
-						 iter = mItemPairs.begin(),
-						 iter_end = mItemPairs.end();
-					 iter != iter_end; ++iter)
+				pairs_iterator_t iter = mItemPairs.begin(), iter_end = mItemPairs.end();
+				while (iter != iter_end)
 				{
 					item_pair_t* item_pair = *iter;
 					if (item_pair->first == pDetachedItem)
@@ -1306,7 +1303,9 @@ void LLFlatListView::detachItems(std::vector<LLPanel*>& detached_items)
 						delete item_pair;
 						break;
 					}
+					iter++;
 				}
+				detached_iter++;
 			}
 			rearrangeItems();
 		}
@@ -1322,7 +1321,6 @@ LLFlatListViewEx::Params::Params()
 : no_items_msg("no_items_msg")
 , no_filtered_items_msg("no_filtered_items_msg")
 {
-
 }
 
 LLFlatListViewEx::LLFlatListViewEx(const Params& p)
@@ -1332,7 +1330,6 @@ LLFlatListViewEx::LLFlatListViewEx(const Params& p)
 , mForceShowingUnmatchedItems(false)
 , mHasMatchedItems(false)
 {
-
 }
 
 void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
@@ -1352,7 +1349,6 @@ void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
 		// list does not contain any items at all
 		setNoItemsCommentText(mNoItemsMsg);
 	}
-
 }
 
 bool LLFlatListViewEx::getForceShowingUnmatchedItems()
@@ -1411,12 +1407,10 @@ void LLFlatListViewEx::filterItems()
 	getItems(items);
 
 	mHasMatchedItems = false;
-	for (item_panel_list_t::iterator
-			 iter = items.begin(),
-			 iter_end = items.end();
-		 iter != iter_end; ++iter)
+    item_panel_list_t::iterator iter = items.begin(), iter_end = items.end();
+	while (iter < iter_end)
 	{
-		LLPanel* pItem = (*iter);
+		LLPanel* pItem = *(iter++);
 		updateItemVisibility(pItem, action);
 	}
 
-- 
cgit v1.2.3


From 45a1a94a35142da71c507c724ae4d1498217e449 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 10 Oct 2023 23:21:08 +0200
Subject: SL-20432 Filtering My Outfits with big number of items freezes UI

---
 indra/llui/llaccordionctrltab.h           |  10 +--
 indra/llui/llflatlistview.cpp             |  47 ++++++++-----
 indra/llui/llflatlistview.h               |  11 +--
 indra/newview/llinventoryitemslist.cpp    |   2 +-
 indra/newview/llinventoryitemslist.h      |   8 +--
 indra/newview/lloutfitgallery.cpp         |  41 +++++------
 indra/newview/lloutfitgallery.h           |   4 +-
 indra/newview/lloutfitslist.cpp           | 110 +++++++++++-------------------
 indra/newview/lloutfitslist.h             |   9 +--
 indra/newview/llpanelappearancetab.cpp    |  27 +++++++-
 indra/newview/llpanelappearancetab.h      |  13 +++-
 indra/newview/llpaneloutfitedit.cpp       |   5 +-
 indra/newview/llpaneloutfitsinventory.cpp |  30 +++-----
 indra/newview/llpaneloutfitsinventory.h   |   1 -
 indra/newview/llpanelwearing.cpp          |   9 ++-
 indra/newview/llpanelwearing.h            |   2 +-
 16 files changed, 158 insertions(+), 171 deletions(-)

diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 896a34cac4..496c34c38b 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -126,12 +126,12 @@ public:
 
 	void setSelected(bool is_selected);
 
-	bool getCollapsible() {return mCollapsible;};
+	bool getCollapsible() { return mCollapsible; };
 
-	void setCollapsible(bool collapsible) {mCollapsible = collapsible;};
+	void setCollapsible(bool collapsible) { mCollapsible = collapsible; };
 	void changeOpenClose(bool is_open);
 
-	void canOpenClose(bool can_open_close) { mCanOpenClose = can_open_close;};
+	void canOpenClose(bool can_open_close) { mCanOpenClose = can_open_close; };
 	bool canOpenClose() const { return mCanOpenClose; };
 
 	virtual BOOL postBuild();
@@ -142,8 +142,8 @@ public:
 
 	void draw();
 
-	void    storeOpenCloseState		();
-	void    restoreOpenCloseState	();
+	void storeOpenCloseState();
+	void restoreOpenCloseState();
 
 protected:
 	LLAccordionCtrlTab(const LLAccordionCtrlTab::Params&);
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 460bd0945b..e4f2dd11a4 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1361,26 +1361,28 @@ void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show)
 	mForceShowingUnmatchedItems = show;
 }
 
-void LLFlatListViewEx::setFilterSubString(const std::string& filter_str)
+void LLFlatListViewEx::setFilterSubString(const std::string& filter_str, bool notify_parent)
 {
 	if (0 != LLStringUtil::compareInsensitive(filter_str, mFilterSubString))
 	{
 		mFilterSubString = filter_str;
 		updateNoItemsMessage(mFilterSubString);
-		filterItems();
+		filterItems(false, notify_parent);
 	}
 }
 
-void LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
+bool LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
 {
-	if (!item) return;
+    if (!item)
+        return false;
+
+	BOOL visible = TRUE;
 
 	// 0 signifies that filter is matched,
 	// i.e. we don't hide items that don't support 'match_filter' action, separators etc.
 	if (0 == item->notify(action))
 	{
 		mHasMatchedItems = true;
-		item->setVisible(true);
 	}
 	else
 	{
@@ -1388,12 +1390,20 @@ void LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
 		if (!mForceShowingUnmatchedItems)
 		{
 			selectItem(item, false);
+			visible = FALSE;
 		}
-		item->setVisible(mForceShowingUnmatchedItems);
 	}
+
+	if (item->getVisible() != visible)
+	{
+		item->setVisible(visible);
+		return true;
+	}
+
+	return false;
 }
 
-void LLFlatListViewEx::filterItems()
+void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
 {
 	typedef std::vector <LLPanel*> item_panel_list_t;
 
@@ -1403,19 +1413,24 @@ void LLFlatListViewEx::filterItems()
 	LLSD action;
 	action.with("match_filter", cur_filter);
 
-	item_panel_list_t items;
-	getItems(items);
-
 	mHasMatchedItems = false;
-    item_panel_list_t::iterator iter = items.begin(), iter_end = items.end();
-	while (iter < iter_end)
+	bool visibility_changed = false;
+	pairs_const_iterator_t iter = getItemPairs().begin(), iter_end = getItemPairs().end();
+	while (iter != iter_end)
 	{
-		LLPanel* pItem = *(iter++);
-		updateItemVisibility(pItem, action);
+		LLPanel* pItem = (*(iter++))->first;
+		visibility_changed |= updateItemVisibility(pItem, action);
 	}
 
-	sort();
-	notifyParentItemsRectChanged();
+    if (re_sort)
+    {
+        sort();
+    }
+
+    if (visibility_changed && notify_parent)
+    {
+        notifyParentItemsRectChanged();
+    }
 }
 
 bool LLFlatListViewEx::hasMatchedItems()
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index d47c1cf333..adb0e3e553 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -300,6 +300,7 @@ public:
 	virtual S32	notify(const LLSD& info) ;
 
 	virtual ~LLFlatListView();
+
 protected:
 
 	/** Pairs LLpanel representing a single item LLPanel and LLSD associated with it */
@@ -375,7 +376,9 @@ protected:
 
 	LLRect getLastSelectedItemRect();
 
-	void   ensureSelectedVisible();
+	void ensureSelectedVisible();
+
+	const pairs_list_t& getItemPairs() { return mItemPairs; }
 
 private:
 
@@ -482,14 +485,14 @@ public:
 	/**
 	 * Sets up new filter string and filters the list.
 	 */
-	void setFilterSubString(const std::string& filter_str);
+	void setFilterSubString(const std::string& filter_str, bool notify_parent);
 	std::string getFilterSubString() { return mFilterSubString; }
 	
 	/**
 	 * Filters the list, rearranges and notifies parent about shape changes.
 	 * Derived classes may want to overload rearrangeItems() to exclude repeated separators after filtration.
 	 */
-	void filterItems();
+	void filterItems(bool re_sort, bool notify_parent);
 
 	/**
 	 * Returns true if last call of filterItems() found at least one matching item
@@ -513,7 +516,7 @@ protected:
 	* @param item - item we are changing
 	* @param item - action - parameters to determin visibility from
 	*/
-	void updateItemVisibility(LLPanel* item, const LLSD &action);
+	bool updateItemVisibility(LLPanel* item, const LLSD &action);
 
 private:
 	std::string mNoFilteredItemsMsg;
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
index 23129f7d44..cac859387c 100644
--- a/indra/newview/llinventoryitemslist.cpp
+++ b/indra/newview/llinventoryitemslist.cpp
@@ -240,7 +240,7 @@ void LLInventoryItemsList::refresh()
     case REFRESH_LIST_SORT:
         {
             // Filter, sort, rearrange and notify parent about shape changes
-            filterItems();
+            filterItems(true, true);
 
             if (mAddedItems.size() == 0)
             {
diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h
index ce41105f98..5b83298bb9 100644
--- a/indra/newview/llinventoryitemslist.h
+++ b/indra/newview/llinventoryitemslist.h
@@ -51,20 +51,20 @@ public:
 	/**
 	 * Let list know items need to be refreshed in next doIdle()
 	 */
-	void setNeedsRefresh(bool needs_refresh){ mRefreshState = needs_refresh ? REFRESH_ALL : REFRESH_COMPLETE; }
+	void setNeedsRefresh(bool needs_refresh) { mRefreshState = needs_refresh ? REFRESH_ALL : REFRESH_COMPLETE; }
 
-	U32 getNeedsRefresh(){ return mRefreshState; }
+	U32 getNeedsRefresh() { return mRefreshState; }
 
 	/**
 	 * Sets the flag indicating that the list needs to be refreshed even if it is
 	 * not currently visible.
 	 */
-	void setForceRefresh(bool force_refresh){ mForceRefresh = force_refresh; }
+	void setForceRefresh(bool force_refresh) { mForceRefresh = force_refresh; }
 
 	/**
 	* If refreshes when invisible.
 	*/
-	bool getForceRefresh(){ return mForceRefresh;  }
+	bool getForceRefresh() { return mForceRefresh; }
 
 	virtual bool selectItemByValue(const LLSD& value, bool select = true);
 
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index de988555c5..e621c32911 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -433,8 +433,7 @@ bool compareGalleryItem(LLOutfitGalleryItem* item1, LLOutfitGalleryItem* item2)
 }
 
 void LLOutfitGallery::reArrangeRows(S32 row_diff)
-{
- 
+{ 
     std::vector<LLOutfitGalleryItem*> buf_items = mItems;
     for (std::vector<LLOutfitGalleryItem*>::const_reverse_iterator it = buf_items.rbegin(); it != buf_items.rend(); ++it)
     {
@@ -446,16 +445,24 @@ void LLOutfitGallery::reArrangeRows(S32 row_diff)
     }
     mHiddenItems.clear();
     
-    mItemsInRow+= row_diff;
+    mItemsInRow += row_diff;
     updateGalleryWidth();
     std::sort(buf_items.begin(), buf_items.end(), compareGalleryItem);
-    
+
+    std::string cur_filter = getFilterSubString();
+    LLStringUtil::toUpper(cur_filter);
+
     for (std::vector<LLOutfitGalleryItem*>::const_iterator it = buf_items.begin(); it != buf_items.end(); ++it)
     {
-    	(*it)->setHidden(false);
-    	applyFilter(*it,sFilterSubString);
+        std::string outfit_name = (*it)->getItemName();
+        LLStringUtil::toUpper(outfit_name);
+
+        bool hidden = (std::string::npos == outfit_name.find(cur_filter));
+        (*it)->setHidden(hidden);
+
     	addToGallery(*it);
     }
+
     updateMessageVisibility();
 }
 
@@ -725,9 +732,9 @@ LLOutfitGallery::~LLOutfitGallery()
     }
 }
 
-void LLOutfitGallery::setFilterSubString(const std::string& string)
+// virtual
+void LLOutfitGallery::onFilterSubStringChanged(const std::string& new_string, const std::string& old_string)
 {
-    sFilterSubString = string;
     reArrangeRows();
 }
 
@@ -743,20 +750,6 @@ void LLOutfitGallery::onHighlightBaseOutfit(LLUUID base_id, LLUUID prev_id)
     }
 }
 
-void LLOutfitGallery::applyFilter(LLOutfitGalleryItem* item, const std::string& filter_substring)
-{
-    if (!item) return;
-
-    std::string outfit_name = item->getItemName();
-    LLStringUtil::toUpper(outfit_name);
-
-    std::string cur_filter = filter_substring;
-    LLStringUtil::toUpper(cur_filter);
-
-    bool hidden = (std::string::npos == outfit_name.find(cur_filter));
-    item->setHidden(hidden);
-}
-
 void LLOutfitGallery::onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid)
 {
 }
@@ -904,11 +897,11 @@ bool LLOutfitGallery::hasDefaultImage(const LLUUID& outfit_cat_id)
 
 void LLOutfitGallery::updateMessageVisibility()
 {
-    if(mItems.empty())
+    if (mItems.empty())
     {
         mMessageTextBox->setVisible(TRUE);
         mScrollPanel->setVisible(FALSE);
-        std::string message = sFilterSubString.empty()? getString("no_outfits_msg") : getString("no_matched_outfits_msg");
+        std::string message = getString(getFilterSubString().empty() ? "no_outfits_msg" : "no_matched_outfits_msg");
         mMessageTextBox->setValue(message);
     }
     else
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 9915752962..f2366e6494 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -90,7 +90,7 @@ public:
     void wearSelectedOutfit();
 
 
-    /*virtual*/ void setFilterSubString(const std::string& string);
+    /*virtual*/ void onFilterSubStringChanged(const std::string& new_string, const std::string& old_string);
 
     /*virtual*/ void getCurrentCategories(uuid_vec_t& vcur);
     /*virtual*/ void updateAddedCategory(LLUUID cat_id);
@@ -117,8 +117,6 @@ protected:
     /*virtual*/ void onExpandAllFolders() {}
     /*virtual*/ LLOutfitListGearMenuBase* createGearMenu();
 
-    void applyFilter(LLOutfitGalleryItem* item, const std::string& filter_substring);
-
 private:
     LLUUID getPhotoAssetId(const LLUUID& outfit_id);
     LLUUID getDefaultPhoto();
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 8042b87a44..27d73fc4ae 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -188,7 +188,7 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
     list->setCommitCallback(boost::bind(&LLOutfitsList::onListSelectionChange, this, _1));
 
     // Setting list refresh callback to apply filter on list change.
-    list->setRefreshCompleteCallback(boost::bind(&LLOutfitsList::onFilteredWearableItemsListRefresh, this, _1));
+    list->setRefreshCompleteCallback(boost::bind(&LLOutfitsList::onRefreshComplete, this, _1));
 
     list->setRightMouseDownCallback(boost::bind(&LLOutfitsList::onWearableItemsListRightClick, this, _1, _2, _3));
 
@@ -199,19 +199,17 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
     // Further list updates will be triggered by the category observer.
     list->updateList(cat_id);
 
-    // If filter is currently applied we store the initial tab state and
-    // open it to show matched items if any.
-    if (!sFilterSubString.empty())
+    // If filter is currently applied we store the initial tab state.
+    if (!getFilterSubString().empty())
     {
         tab->notifyChildren(LLSD().with("action", "store_state"));
-        tab->setDisplayChildren(true);
 
         // Setting mForceRefresh flag will make the list refresh its contents
         // even if it is not currently visible. This is required to apply the
         // filter to the newly added list.
         list->setForceRefresh(true);
 
-        list->setFilterSubString(sFilterSubString);
+        list->setFilterSubString(getFilterSubString(), false);
     }
 }
 
@@ -313,14 +311,6 @@ void LLOutfitsList::onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid)
 	}
 }
 
-// virtual
-void LLOutfitsList::setFilterSubString(const std::string& string)
-{
-	applyFilter(string);
-
-	sFilterSubString = string;
-}
-
 // virtual
 bool LLOutfitListBase::isActionEnabled(const LLSD& userdata)
 {
@@ -494,9 +484,9 @@ void LLOutfitsList::restoreOutfitSelection(LLAccordionCtrlTab* tab, const LLUUID
 	}
 }
 
-void LLOutfitsList::onFilteredWearableItemsListRefresh(LLUICtrl* ctrl)
+void LLOutfitsList::onRefreshComplete(LLUICtrl* ctrl)
 {
-	if (!ctrl || sFilterSubString.empty())
+	if (!ctrl || getFilterSubString().empty())
 		return;
 
 	for (outfits_map_t::iterator
@@ -510,57 +500,50 @@ void LLOutfitsList::onFilteredWearableItemsListRefresh(LLUICtrl* ctrl)
 		LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
 		if (list != ctrl) continue;
 
-		applyFilterToTab(iter->first, tab, sFilterSubString);
+		applyFilterToTab(iter->first, tab, getFilterSubString());
 	}
 }
 
-void LLOutfitsList::applyFilter(const std::string& new_filter_substring)
+// virtual
+void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, const std::string& old_string)
 {
-	mAccordion->setFilterSubString(new_filter_substring);
+	mAccordion->setFilterSubString(new_string);
 
-	for (outfits_map_t::iterator
-			 iter = mOutfitsMap.begin(),
-			 iter_end = mOutfitsMap.end();
-		 iter != iter_end; ++iter)
+	outfits_map_t::iterator iter = mOutfitsMap.begin(), iter_end = mOutfitsMap.end();
+	while (iter != iter_end)
 	{
-		LLAccordionCtrlTab* tab = iter->second;
+		const LLUUID& category_id = iter->first;
+		LLAccordionCtrlTab* tab = iter++->second;
 		if (!tab) continue;
 
-		bool more_restrictive = sFilterSubString.size() < new_filter_substring.size() && !new_filter_substring.substr(0, sFilterSubString.size()).compare(sFilterSubString);
-
-		// Restore tab visibility in case of less restrictive filter
-		// to compare it with updated string if it was previously hidden.
-		if (!more_restrictive)
-		{
-			tab->setVisible(TRUE);
-		}
-
 		LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
 		if (list)
 		{
-			list->setFilterSubString(new_filter_substring);
+			list->setFilterSubString(new_string, tab->getDisplayChildren());
 		}
 
-		if(sFilterSubString.empty() && !new_filter_substring.empty())
+		if (old_string.empty())
 		{
-			//store accordion tab state when filter is not empty
-			tab->notifyChildren(LLSD().with("action","store_state"));
+			// Store accordion tab state when filter is not empty
+			tab->notifyChildren(LLSD().with("action", "store_state"));
 		}
 
-		if (!new_filter_substring.empty())
+		if (!new_string.empty())
 		{
-			applyFilterToTab(iter->first, tab, new_filter_substring);
+			applyFilterToTab(category_id, tab, new_string);
 		}
 		else
 		{
-			// restore tab title when filter is empty
+			tab->setVisible(TRUE);
+
+			// Restore tab title when filter is empty
 			tab->setTitle(tab->getTitle());
 
-			//restore accordion state after all those accodrion tab manipulations
-			tab->notifyChildren(LLSD().with("action","restore_state"));
+			// Restore accordion state after all those accodrion tab manipulations
+			tab->notifyChildren(LLSD().with("action", "restore_state"));
 
 			// Try restoring the tab selection.
-			restoreOutfitSelection(tab, iter->first);
+			restoreOutfitSelection(tab, category_id);
 		}
 	}
 
@@ -586,11 +569,11 @@ void LLOutfitsList::applyFilterToTab(
 
 	if (std::string::npos == title.find(cur_filter))
 	{
-		// hide tab if its title doesn't pass filter
-		// and it has no visible items
+		// Hide tab if its title doesn't pass filter
+		// and it has no matched items
 		tab->setVisible(list->hasMatchedItems());
 
-		// remove title highlighting because it might
+		// Remove title highlighting because it might
 		// have been previously highlighted by less restrictive filter
 		tab->setTitle(tab->getTitle());
 
@@ -602,18 +585,6 @@ void LLOutfitsList::applyFilterToTab(
 		// Try restoring the tab selection.
 		restoreOutfitSelection(tab, category_id);
 	}
-
-	if (tab->getVisible())
-	{
-		// Open tab if it has passed the filter.
-		tab->setDisplayChildren(true);
-	}
-	else
-	{
-		// Set force refresh flag to refresh not visible list
-		// when some changes occur in it.
-		list->setForceRefresh(true);
-	}
 }
 
 bool LLOutfitsList::canWearSelected()
@@ -698,11 +669,10 @@ void LLOutfitsList::onCOFChanged()
 	// These links UUIDs are not the same UUIDs that we have in each wearable items list.
 	// So we collect base items' UUIDs to find them or links that point to them in wearable
 	// items lists and update their worn state there.
-	for (LLInventoryModel::item_array_t::const_iterator iter = item_array.begin();
-		iter != item_array.end();
-		++iter)
+	LLInventoryModel::item_array_t::const_iterator array_iter = item_array.begin(), array_end = item_array.end();
+	while (array_iter < array_end)
 	{
-		vnew.push_back((*iter)->getLinkedUUID());
+		vnew.push_back((*(array_iter++))->getLinkedUUID());
 	}
 
 	// We need to update only items that were added or removed from COF.
@@ -711,20 +681,20 @@ void LLOutfitsList::onCOFChanged()
 	// Store the ids of items currently linked from COF.
 	mCOFLinkedItems = vnew;
 
-	for (outfits_map_t::iterator iter = mOutfitsMap.begin();
-			iter != mOutfitsMap.end();
-			++iter)
+	// Append removed ids to added ids because we should update all of them.
+	vadded.reserve(vadded.size() + vremoved.size());
+	vadded.insert(vadded.end(), vremoved.begin(), vremoved.end());
+	vremoved.clear();
+
+	outfits_map_t::iterator map_iter = mOutfitsMap.begin(), map_end = mOutfitsMap.end();
+	while (map_iter != map_end)
 	{
-		LLAccordionCtrlTab* tab = iter->second;
+		LLAccordionCtrlTab* tab = (map_iter++)->second;
 		if (!tab) continue;
 
 		LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
 		if (!list) continue;
 
-		// Append removed ids to added ids because we should update all of them.
-		vadded.reserve(vadded.size() + vremoved.size());
-		vadded.insert(vadded.end(), vremoved.begin(), vremoved.end());
-
 		// Every list updates the labels of changed items  or
 		// the links that point to these items.
 		list->updateChangedItems(vadded);
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index 7d212420a2..43c3ba75b5 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -237,7 +237,7 @@ public:
 	//void performAction(std::string action);
 
 
-	/*virtual*/ void setFilterSubString(const std::string& string);
+	/*virtual*/ void onFilterSubStringChanged(const std::string& new_string, const std::string& old_string);
 
 	/*virtual*/ void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const;
 
@@ -307,12 +307,7 @@ private:
 	 * Called upon list refresh event to update tab visibility depending on
 	 * the results of applying filter to the title and list items of the tab.
 	 */
-	void onFilteredWearableItemsListRefresh(LLUICtrl* ctrl);
-
-	/**
-	 * Highlights filtered items and hides tabs which haven't passed filter.
-	 */
-	void applyFilter(const std::string& new_filter_substring);
+	void onRefreshComplete(LLUICtrl* ctrl);
 
 	/**
 	 * Applies filter to the given tab
diff --git a/indra/newview/llpanelappearancetab.cpp b/indra/newview/llpanelappearancetab.cpp
index 8fa8867c69..16bd8a1380 100644
--- a/indra/newview/llpanelappearancetab.cpp
+++ b/indra/newview/llpanelappearancetab.cpp
@@ -28,12 +28,35 @@
 
 #include "llpanelappearancetab.h"
 
-
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
 #include "llviewerinventory.h"
 
-//virtual
+std::string LLPanelAppearanceTab::sRecentFilterSubString;
+
+void LLPanelAppearanceTab::setFilterSubString(const std::string& new_string)
+{
+    if (new_string != mFilterSubString)
+    {
+        std::string old_string = mFilterSubString;
+        mFilterSubString = new_string;
+        onFilterSubStringChanged(mFilterSubString, old_string);
+    }
+
+    sRecentFilterSubString = new_string;
+}
+
+void LLPanelAppearanceTab::checkFilterSubString()
+{
+    if (sRecentFilterSubString != mFilterSubString)
+    {
+        std::string old_string = mFilterSubString;
+        mFilterSubString = sRecentFilterSubString;
+        onFilterSubStringChanged(mFilterSubString, old_string);
+    }
+}
+
+// virtual
 bool LLPanelAppearanceTab::canTakeOffSelected()
 {
 	uuid_vec_t selected_uuids;
diff --git a/indra/newview/llpanelappearancetab.h b/indra/newview/llpanelappearancetab.h
index 2ed6b00497..e81394dd3c 100644
--- a/indra/newview/llpanelappearancetab.h
+++ b/indra/newview/llpanelappearancetab.h
@@ -35,13 +35,17 @@ public:
 	LLPanelAppearanceTab() : LLPanel() {}
 	virtual ~LLPanelAppearanceTab() {}
 
-	virtual void setFilterSubString(const std::string& string) = 0;
+	void setFilterSubString(const std::string& new_string);
+
+    void checkFilterSubString();
+
+    virtual void onFilterSubStringChanged(const std::string& new_string, const std::string& old_string) = 0;
 
 	virtual bool isActionEnabled(const LLSD& userdata) = 0;
 
 	virtual void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const {}
 
-	static const std::string& getFilterSubString() { return sFilterSubString; }
+	const std::string& getFilterSubString() { return mFilterSubString; }
 
 protected:
 
@@ -50,7 +54,10 @@ protected:
 	 */
 	bool canTakeOffSelected();
 
-	static std::string		sFilterSubString;
+private:
+    std::string mFilterSubString;
+
+    static std::string sRecentFilterSubString;
 };
 
 #endif //LL_LLPANELAPPEARANCETAB_H
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 4a755a6e93..c7ae4eb0d9 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -733,7 +733,7 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 	if (mSearchString == "")
 	{
 		mInventoryItemsPanel->setFilterSubString(LLStringUtil::null);
-		mWearableItemsList->setFilterSubString(LLStringUtil::null);
+		mWearableItemsList->setFilterSubString(LLStringUtil::null, true);
 		// re-open folders that were initially open
 		mSavedFolderState->setApply(TRUE);
 		mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
@@ -763,8 +763,7 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
 	
 	// set new filter string
 	mInventoryItemsPanel->setFilterSubString(mSearchString);
-	mWearableItemsList->setFilterSubString(mSearchString);
-
+	mWearableItemsList->setFilterSubString(mSearchString, true);
 }
 
 void LLPanelOutfitEdit::onPlusBtnClicked(void)
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index d8c34d5c40..af06de379d 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -28,19 +28,19 @@
 
 #include "llpaneloutfitsinventory.h"
 
-#include "llnotificationsutil.h"
-#include "lltabcontainer.h"
-
+#include "llagentwearables.h"
+#include "llappearancemgr.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
-#include "llagentwearables.h"
-#include "llappearancemgr.h"
-#include "lloutfitobserver.h"
+#include "llnotificationsutil.h"
 #include "lloutfitgallery.h"
+#include "lloutfitobserver.h"
 #include "lloutfitslist.h"
+#include "llpanelappearancetab.h"
 #include "llpanelwearing.h"
 #include "llsidepanelappearance.h"
+#include "lltabcontainer.h"
 #include "llviewercontrol.h"
 #include "llviewerfoldertype.h"
 
@@ -159,25 +159,12 @@ void LLPanelOutfitsInventory::onSearchEdit(const std::string& string)
 {
 	if (!mActivePanel) return;
 
-	mFilterSubString = string;
-
-	if (string == "")
-	{
-		mActivePanel->setFilterSubString(LLStringUtil::null);
-	}
-
     if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
     {
         llassert(false); // this should have been done on startup
         LLInventoryModelBackgroundFetch::instance().start();
     }
 
-	if (mActivePanel->getFilterSubString().empty() && string.empty())
-	{
-		// current filter and new filter empty, do nothing
-		return;
-	}
-
 	// set new filter string
 	mActivePanel->setFilterSubString(string);
 }
@@ -302,6 +289,7 @@ bool LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata)
 {
 	return mActivePanel && mActivePanel->isActionEnabled(userdata);
 }
+
 // List Commands                                                                //
 //////////////////////////////////////////////////////////////////////////////////
 
@@ -330,7 +318,7 @@ void LLPanelOutfitsInventory::onTabChange()
 	mActivePanel = dynamic_cast<LLPanelAppearanceTab*>(mAppearanceTabs->getCurrentPanel());
 	if (!mActivePanel) return;
 
-	mActivePanel->setFilterSubString(mFilterSubString);
+	mActivePanel->checkFilterSubString();
 	mActivePanel->onOpen(LLSD());
 
 	updateVerbs();
@@ -357,8 +345,6 @@ bool LLPanelOutfitsInventory::isOutfitsGalleryPanelActive() const
 	return mActivePanel->getName() == OUTFIT_GALLERY_TAB_NAME;
 }
 
-
-
 void LLPanelOutfitsInventory::setWearablesLoading(bool val)
 {
 	updateVerbs();
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
index 50d7074d4b..91873a427a 100644
--- a/indra/newview/llpaneloutfitsinventory.h
+++ b/indra/newview/llpaneloutfitsinventory.h
@@ -66,7 +66,6 @@ protected:
 
 private:
 	LLTabContainer*			mAppearanceTabs;
-	std::string 			mFilterSubString;
 
 	//////////////////////////////////////////////////////////////////////////////////
 	// tab panels                                                                   //
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index 5242c4fef9..bfdb0fbc88 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -209,8 +209,6 @@ protected:
 
 //////////////////////////////////////////////////////////////////////////
 
-std::string LLPanelAppearanceTab::sFilterSubString = LLStringUtil::null;
-
 static LLPanelInjector<LLPanelWearing> t_panel_wearing("panel_wearing");
 
 LLPanelWearing::LLPanelWearing()
@@ -328,10 +326,11 @@ void LLPanelWearing::startUpdateTimer()
 }
 
 // virtual
-void LLPanelWearing::setFilterSubString(const std::string& string)
+void LLPanelWearing::onFilterSubStringChanged(const std::string& new_string, const std::string& old_string)
 {
-	sFilterSubString = string;
-	mCOFItemsList->setFilterSubString(sFilterSubString);
+	mCOFItemsList->setFilterSubString(new_string, true);
+
+	mAccordionCtrl->arrange();
 }
 
 // virtual
diff --git a/indra/newview/llpanelwearing.h b/indra/newview/llpanelwearing.h
index 18e543eec6..2f3f14956a 100644
--- a/indra/newview/llpanelwearing.h
+++ b/indra/newview/llpanelwearing.h
@@ -61,7 +61,7 @@ public:
 
 	/*virtual*/ void onOpen(const LLSD& info);
 
-	/*virtual*/ void setFilterSubString(const std::string& string);
+	/*virtual*/ void onFilterSubStringChanged(const std::string& new_string, const std::string& old_string);
 
 	/*virtual*/ bool isActionEnabled(const LLSD& userdata);
 
-- 
cgit v1.2.3


From c6a82a44f8c2efcad535c941bd00567a23f4fe7b Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 11 Oct 2023 14:31:21 +0200
Subject: SL-20432 Buildfix

---
 indra/llui/llflatlistview.cpp         |  2 --
 indra/newview/llwearableitemslist.cpp | 29 +++++++++++++----------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index e4f2dd11a4..fd4c33df30 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1405,8 +1405,6 @@ bool LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
 
 void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
 {
-	typedef std::vector <LLPanel*> item_panel_list_t;
-
 	std::string cur_filter = mFilterSubString;
 	LLStringUtil::toUpper(cur_filter);
 
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 8681f7c14e..a684cdc86e 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -781,30 +781,27 @@ void LLWearableItemsList::updateList(const LLUUID& category_id)
 void LLWearableItemsList::updateChangedItems(const uuid_vec_t& changed_items_uuids)
 {
 	// nothing to update
-	if (changed_items_uuids.empty()) return;
-
-	typedef std::vector<LLPanel*> item_panel_list_t;
-
-	item_panel_list_t items;
-	getItems(items);
+	if (changed_items_uuids.empty())
+		return;
 
-	for (item_panel_list_t::iterator items_iter = items.begin();
-			items_iter != items.end();
-			++items_iter)
+	pairs_const_iterator_t pairs_iter = getItemPairs().begin(), pairs_end = getItemPairs().end();
+	while (pairs_iter != pairs_end)
 	{
-		LLPanelInventoryListItemBase* item = dynamic_cast<LLPanelInventoryListItemBase*>(*items_iter);
-		if (!item) continue;
+		LLPanel* panel = (*(pairs_iter++))->first;
+		LLPanelInventoryListItemBase* item = dynamic_cast<LLPanelInventoryListItemBase*>(panel);
+		if (!item)
+			continue;
 
 		LLViewerInventoryItem* inv_item = item->getItem();
-		if (!inv_item) continue;
+		if (!inv_item)
+			continue;
 
 		LLUUID linked_uuid = inv_item->getLinkedUUID();
 
-		for (uuid_vec_t::const_iterator iter = changed_items_uuids.begin();
-				iter != changed_items_uuids.end();
-				++iter)
+		uuid_vec_t::const_iterator uuids_iter = changed_items_uuids.begin(), uuids_end = changed_items_uuids.end();
+		while (uuids_iter != uuids_end)
 		{
-			if (linked_uuid == *iter)
+			if (linked_uuid == *(uuids_iter++))
 			{
 				item->setNeedsRefresh(true);
 				break;
-- 
cgit v1.2.3


From ef2a7fee113c33387a0c7aff2aa862f715a564af Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 11 Oct 2023 15:20:07 +0200
Subject: SL-20432 Minor polishing in LLWearableItemsList::updateChangedItems

---
 indra/newview/llwearableitemslist.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index a684cdc86e..83d2b16a86 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -784,6 +784,7 @@ void LLWearableItemsList::updateChangedItems(const uuid_vec_t& changed_items_uui
 	if (changed_items_uuids.empty())
 		return;
 
+	uuid_vec_t::const_iterator uuids_begin = changed_items_uuids.begin(), uuids_end = changed_items_uuids.end();
 	pairs_const_iterator_t pairs_iter = getItemPairs().begin(), pairs_end = getItemPairs().end();
 	while (pairs_iter != pairs_end)
 	{
@@ -797,16 +798,10 @@ void LLWearableItemsList::updateChangedItems(const uuid_vec_t& changed_items_uui
 			continue;
 
 		LLUUID linked_uuid = inv_item->getLinkedUUID();
-
-		uuid_vec_t::const_iterator uuids_iter = changed_items_uuids.begin(), uuids_end = changed_items_uuids.end();
-		while (uuids_iter != uuids_end)
-		{
-			if (linked_uuid == *(uuids_iter++))
-			{
-				item->setNeedsRefresh(true);
-				break;
-			}
-		}
+        if (std::find(uuids_begin, uuids_end, linked_uuid) != uuids_end)
+        {
+            item->setNeedsRefresh(true);
+        }
 	}
 }
 
-- 
cgit v1.2.3


From 366d4439996cdb6cb5b3f116fedcb4c5ee8b4425 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 11 Oct 2023 15:08:38 +0200
Subject: SL-20370 Change PDT to SLT on menu bar

---
 indra/llcommon/llstring.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index f6629803ee..f40e7ad45f 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -1235,9 +1235,17 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token,
 		}
 		else
 		{
+#if 0
+			// EXT-1565 : Zai Lynch, James Linden : 15/Oct/09
+			// [BSI] Feedback: Viewer clock mentions SLT, but would prefer it to show PST/PDT
 			// "slt" = Second Life Time, which is deprecated.
 			// If not utc or user local time, fallback to Pacific time
 			replacement = LLStringOps::getPacificDaylightTime() ? "PDT" : "PST";
+#else
+			// SL-20370 : Steeltoe Linden : 29/Sep/23
+			// Change "PDT" to "SLT" on menu bar
+			replacement = "SLT";
+#endif
 		}
 		return true;
 	}
-- 
cgit v1.2.3


From 3e4fd9a20cb681da67952dcd49c3e12e6017832b Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 11 Oct 2023 15:43:23 +0200
Subject: SL-20378 Add menu bar entry and keyboard shortcut to open
 Notifications floater

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6a6546ff0a..e2c102086f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -64,6 +64,14 @@
          function="Floater.ToggleOrBringToFront"
          parameter="camera" />
       </menu_item_call>
+      <menu_item_call
+       label="Notifications..."
+       name="Notifications"
+       shortcut="alt|shift|N">
+        <menu_item_call.on_click
+         function="Floater.ToggleOrBringToFront"
+         parameter="notification_well_window" />
+      </menu_item_call>
 
       <menu_item_separator/>
       <menu_item_check
-- 
cgit v1.2.3


From b134e91d2a2e7ff97e6f906d6ef36177e1dddeab Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 11 Oct 2023 20:56:25 +0200
Subject: SL-20419 Receiving new objects or items, etc causes inventory to
 switch from recent to my inventory tab

---
 indra/llui/lltabcontainer.cpp         | 16 +++++-----
 indra/newview/llinventorybridge.cpp   |  4 +--
 indra/newview/llinventorypanel.cpp    | 56 ++++++++++++++++++-----------------
 indra/newview/llinventorypanel.h      | 10 +++----
 indra/newview/llmeshrepository.cpp    |  2 +-
 indra/newview/llviewerassetupload.cpp |  2 +-
 indra/newview/llviewermessage.cpp     | 19 ++++++++----
 indra/newview/llwearableitemslist.cpp |  2 +-
 8 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 76b9e448a1..8767c3f916 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1516,25 +1516,23 @@ BOOL LLTabContainer::selectTab(S32 which)
 
 	LLTabTuple* selected_tuple = getTab(which);
 	if (!selected_tuple)
-	{
 		return FALSE;
-	}
-	
+
 	LLSD cbdata;
 	if (selected_tuple->mTabPanel)
 		cbdata = selected_tuple->mTabPanel->getName();
 
-	BOOL res = FALSE;
-	if( !mValidateSignal || (*mValidateSignal)( this, cbdata ) )
+	BOOL result = FALSE;
+	if (!mValidateSignal || (*mValidateSignal)(this, cbdata))
 	{
-		res = setTab(which);
-		if (res && mCommitSignal)
+		result = setTab(which);
+		if (result && mCommitSignal)
 		{
 			(*mCommitSignal)(this, cbdata);
 		}
 	}
-	
-	return res;
+
+	return result;
 }
 
 // private
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 73005d6903..adbfa1b6ae 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1764,7 +1764,7 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action)
 	}
 	else if ("show_in_main_panel" == action)
 	{
-		LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mUUID, TRUE);
+		LLInventoryPanel::openInventoryPanelAndSetSelection(true, mUUID, true);
 		return;
 	}
 	else if ("cut" == action)
@@ -3395,7 +3395,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 	}
 	else if ("show_in_main_panel" == action)
 	{
-		LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mUUID, TRUE);
+		LLInventoryPanel::openInventoryPanelAndSetSelection(true, mUUID, true);
 		return;
 	}
 	else if ("cut" == action)
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 54f91451ac..a7d39b1ef6 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1922,46 +1922,52 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open)
 }
 
 //static
-void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const LLUUID& obj_id, BOOL use_main_panel, BOOL take_keyboard_focus, BOOL reset_filter)
+void LLInventoryPanel::openInventoryPanelAndSetSelection(bool auto_open, const LLUUID& obj_id,
+	bool use_main_panel, bool take_keyboard_focus, bool reset_filter)
 {
 	LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
 	sidepanel_inventory->showInventoryPanel();
 
-	bool in_inbox = (gInventory.isObjectDescendentOf(obj_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX)));
-
-	if (!in_inbox && (use_main_panel || !sidepanel_inventory->getMainInventoryPanel()->isRecentItemsPanelSelected()))
+	LLUUID cat_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX);
+	bool in_inbox = gInventory.isObjectDescendentOf(obj_id, cat_id);
+	if (!in_inbox && use_main_panel)
 	{
 		sidepanel_inventory->selectAllItemsPanel();
 	}
 
-    LLFloater* inventory_floater = LLFloaterSidePanelContainer::getTopmostInventoryFloater();
-    if(!auto_open && inventory_floater && inventory_floater->getVisible())
+    if (!auto_open)
     {
-        LLSidepanelInventory *inventory_panel = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
-        LLPanelMainInventory* main_panel = inventory_panel->getMainInventoryPanel();
-        if(main_panel->isSingleFolderMode() && main_panel->isGalleryViewMode())
+        LLFloater* inventory_floater = LLFloaterSidePanelContainer::getTopmostInventoryFloater();
+        if (inventory_floater && inventory_floater->getVisible())
         {
-            LL_DEBUGS("Inventory") << "Opening gallery panel for item" << obj_id << LL_ENDL;
-            main_panel->setGallerySelection(obj_id);
-            return;
+            LLSidepanelInventory *inventory_panel = inventory_floater->findChild<LLSidepanelInventory>("main_panel");
+            LLPanelMainInventory* main_panel = inventory_panel->getMainInventoryPanel();
+            if (main_panel->isSingleFolderMode() && main_panel->isGalleryViewMode())
+            {
+                LL_DEBUGS("Inventory") << "Opening gallery panel for item" << obj_id << LL_ENDL;
+                main_panel->setGallerySelection(obj_id);
+                return;
+            }
         }
     }
 
-    LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
-    if (main_inventory && main_inventory->isSingleFolderMode()
-        && use_main_panel)
+    if (use_main_panel)
     {
-        const LLInventoryObject *obj = gInventory.getObject(obj_id);
-        if (obj)
+        LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
+        if (main_inventory && main_inventory->isSingleFolderMode())
         {
-            LL_DEBUGS("Inventory") << "Opening main inventory panel for item" << obj_id << LL_ENDL;
-            main_inventory->setSingleFolderViewRoot(obj->getParentUUID(), false);
-            main_inventory->setGallerySelection(obj_id);
-            return;
+            const LLInventoryObject *obj = gInventory.getObject(obj_id);
+            if (obj)
+            {
+                LL_DEBUGS("Inventory") << "Opening main inventory panel for item" << obj_id << LL_ENDL;
+                main_inventory->setSingleFolderViewRoot(obj->getParentUUID(), false);
+                main_inventory->setGallerySelection(obj_id);
+                return;
+            }
         }
     }
-	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
 
+	LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open);
 	if (active_panel)
 	{
 		LL_DEBUGS("Messaging", "Inventory") << "Highlighting" << obj_id  << LL_ENDL;
@@ -1973,11 +1979,8 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
 
 		if (in_inbox)
 		{
-			
-			LLInventoryPanel * inventory_panel = NULL;
 			sidepanel_inventory->openInbox();
-			inventory_panel = sidepanel_inventory->getInboxPanel();
-
+			LLInventoryPanel* inventory_panel = sidepanel_inventory->getInboxPanel();
 			if (inventory_panel)
 			{
 				inventory_panel->setSelection(obj_id, take_keyboard_focus);
@@ -2002,7 +2005,6 @@ void LLInventoryPanel::openInventoryPanelAndSetSelection(BOOL auto_open, const L
 
 void LLInventoryPanel::setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id)
 {
-
     LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("inventory");
     for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin(); iter != inst_list.end(); ++iter)
     {
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 341be0cf86..2c35bdcd11 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -244,12 +244,12 @@ public:
 	// "Auto_open" determines if we open an inventory panel if none are open.
 	static LLInventoryPanel *getActiveInventoryPanel(BOOL auto_open = TRUE);
 
-	static void openInventoryPanelAndSetSelection(BOOL auto_open,
+	static void openInventoryPanelAndSetSelection(bool auto_open,
 													const LLUUID& obj_id,
-													BOOL use_main_panel = FALSE,
-													BOOL take_keyboard_focus = TAKE_FOCUS_YES,
-													BOOL reset_filter = FALSE);
-    static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id);
+													bool use_main_panel = false,
+													bool take_keyboard_focus = true,
+													bool reset_filter = false);
+	static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id);
 	void addItemID(const LLUUID& id, LLFolderViewItem* itemp);
 	void removeItemID(const LLUUID& id);
 	LLFolderViewItem* getItemByID(const LLUUID& id);
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index d6eba6b4bf..549962ea86 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -5446,7 +5446,7 @@ void on_new_single_inventory_upload_complete(
         }
         else
         {
-            LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, server_response["new_inventory_item"].asUUID(), TRUE, TAKE_FOCUS_NO, TRUE);
+            LLInventoryPanel::openInventoryPanelAndSetSelection(true, server_response["new_inventory_item"].asUUID(), true, false, true);
         }
 
         // restore keyboard focus
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index 13491114b9..036cef5c94 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -847,7 +847,7 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti
             // Show the preview panel for textures and sounds to let
             // user know that the image (or snapshot) arrived intact.
             LLInventoryPanel* panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
-            LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, FALSE, TAKE_FOCUS_NO, (panel == NULL));
+            LLInventoryPanel::openInventoryPanelAndSetSelection(true, serverInventoryItem, false, false, !panel);
 
             // restore keyboard focus
             gFocusMgr.setKeyboardFocus(focus);
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f3288a5300..1b3c426067 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1557,15 +1557,22 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
         }
         else
         {
-		// Highlight item
-		const BOOL auto_open = 
-			gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false
-			!from_name.empty(); // don't open if it's not from anyone.
-            if(auto_open)
+            // Highlight item
+            bool show_in_inventory = gSavedSettings.get<bool>("ShowInInventory");
+            bool auto_open =
+                show_in_inventory && // don't open if ShowInInventory is FALSE
+                !from_name.empty();  // don't open if it's not from anyone
+
+            // SL-20419 : Don't change active tab if floater is visible
+            LLFloater* instance = LLFloaterReg::findInstance("inventory");
+            bool use_main_panel = instance && instance->getVisible();
+
+            if (auto_open)
             {
                 LLFloaterReg::showInstance("inventory");
             }
-		LLInventoryPanel::openInventoryPanelAndSetSelection(auto_open, obj_id, true);
+
+            LLInventoryPanel::openInventoryPanelAndSetSelection(auto_open, obj_id, use_main_panel);
         }
 	}
 }
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 83d2b16a86..948fe55e0d 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -797,7 +797,7 @@ void LLWearableItemsList::updateChangedItems(const uuid_vec_t& changed_items_uui
 		if (!inv_item)
 			continue;
 
-		LLUUID linked_uuid = inv_item->getLinkedUUID();
+        const LLUUID& linked_uuid = inv_item->getLinkedUUID();
         if (std::find(uuids_begin, uuids_end, linked_uuid) != uuids_end)
         {
             item->setNeedsRefresh(true);
-- 
cgit v1.2.3


From 70988ede9e924960c37cd01797c9a435b557acec Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 12 Oct 2023 17:02:47 +0200
Subject: SL-20422 Clicking the 'Bring it back' link on Aditi displays a
 teleport alert

---
 indra/newview/llslurl.cpp         | 7 +++++++
 indra/newview/llslurl.h           | 5 +++--
 indra/newview/llurldispatcher.cpp | 5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index a3a8247268..a9b7b0e417 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -112,6 +112,13 @@ LLSLURL::LLSLURL(const std::string& slurl)
 		// and the slurl type (APP or LOCATION)
 		if(slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
 		{
+			if (path_array.size() == 0)
+			{
+				// um, we need a path...
+				mType = EMPTY;
+				return;
+			}
+
 			// parse a maingrid style slurl.  We know the grid is maingrid
 			// so grab it.
 			// A location slurl for maingrid (with the special schemes) can be in the form
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h
index b86cf7949b..6132a4a8b0 100644
--- a/indra/newview/llslurl.h
+++ b/indra/newview/llslurl.h
@@ -52,13 +52,14 @@ public:
 	static const char* SLURL_REGION_PATH;	
 	
 	// if you modify this enumeration, update typeName as well
-	enum SLURL_TYPE { 
-		INVALID, 
+	enum SLURL_TYPE {
+		INVALID,
 		LOCATION,
 		HOME_LOCATION,
 		LAST_LOCATION,
 		APP,
 		HELP,
+		EMPTY,
 		NUM_SLURL_TYPES // must be last
 	};
 		
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 76fb138768..07ea8a4ec6 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -134,6 +134,11 @@ bool LLURLDispatcherImpl::dispatch(const LLSLURL& slurl,
 								   LLMediaCtrl* web,
 								   bool trusted_browser)
 {
+    // SL-20422 : Clicking the "Bring it back" link on Aditi displays a teleport alert
+    // Stop further processing empty urls like [secondlife:/// Bring it back.]
+    if (slurl.getType() == LLSLURL::EMPTY)
+        return true;
+
 	const bool right_click = false;
 	return dispatchCore(slurl, nav_type, right_click, web, trusted_browser);
 }
-- 
cgit v1.2.3


From cdbca65653c3717d5833e66f1a37f5b0b4559bd3 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 13 Oct 2023 01:11:38 +0200
Subject: SL-20422 Unit-tests fix

---
 indra/newview/llslurl.cpp            | 823 +++++++++++++++++------------------
 indra/newview/tests/llslurl_test.cpp |   6 +
 2 files changed, 412 insertions(+), 417 deletions(-)

diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index a9b7b0e417..3858a1b9ce 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llurlsimstring.cpp (was llsimurlstring.cpp)
  * @brief Handles "SLURL fragments" like Ahern/123/45 for
  * startup processing, login screen, prefs, etc.
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -36,7 +36,7 @@
 #include "curl/curl.h"
 const char* LLSLURL::SLURL_HTTP_SCHEME		 = "http";
 const char* LLSLURL::SLURL_HTTPS_SCHEME		 = "https";
-const char* LLSLURL::SLURL_SECONDLIFE_SCHEME	 = "secondlife";
+const char* LLSLURL::SLURL_SECONDLIFE_SCHEME = "secondlife";
 const char* LLSLURL::SLURL_SECONDLIFE_PATH	 = "secondlife";
 const char* LLSLURL::SLURL_COM		         = "slurl.com";
 // For DnD - even though www.slurl.com redirects to slurl.com in a browser, you  can copy and drag
@@ -54,480 +54,469 @@ const char* LLSLURL::SIM_LOCATION_LAST           = "last";
 // resolve a simstring from a slurl
 LLSLURL::LLSLURL(const std::string& slurl)
 {
-	// by default we go to agni.
-	mType = INVALID;
-
-	if(slurl == SIM_LOCATION_HOME)
-	{
-		mType = HOME_LOCATION;
-	}
-	else if(slurl.empty() || (slurl == SIM_LOCATION_LAST))
-	{
-		mType = LAST_LOCATION;
-	}
-	else
-	{
-		LLURI slurl_uri;
-		// parse the slurl as a uri
-		if(slurl.find(':') == std::string::npos)
-		{
-			// There may be no scheme ('secondlife:' etc.) passed in.  In that case
-			// we want to normalize the slurl by putting the appropriate scheme
-			// in front of the slurl.  So, we grab the appropriate slurl base
-			// from the grid manager which may be http://slurl.com/secondlife/ for maingrid, or
-			// https://<hostname>/region/ for Standalone grid (the word region, not the region name)
-			// these slurls are typically passed in from the 'starting location' box on the login panel,
-			// where the user can type in <regionname>/<x>/<y>/<z>
-			std::string fixed_slurl = LLGridManager::getInstance()->getSLURLBase();
-
-			// the slurl that was passed in might have a prepended /, or not.  So,
-			// we strip off the prepended '/' so we don't end up with http://slurl.com/secondlife/<region>/<x>/<y>/<z>
-			// or some such.
-			
-			if(slurl[0] == '/')
-		    {
-				fixed_slurl += slurl.substr(1);
-		    }
-			else
-		    {
-				fixed_slurl += slurl;
-		    }
-			// We then load the slurl into a LLURI form
-			slurl_uri = LLURI(fixed_slurl);
-		}
-		else
-		{
-		    // as we did have a scheme, implying a URI style slurl, we
-		    // simply parse it as a URI
-		    slurl_uri = LLURI(slurl);
-		}
-		
-		LLSD path_array = slurl_uri.pathArray();
-		
-		// determine whether it's a maingrid URI or an Standalone/open style URI
-		// by looking at the scheme.  If it's a 'secondlife:' slurl scheme or
-		// 'sl:' scheme, we know it's maingrid
-		
-		// At the end of this if/else block, we'll have determined the grid,
-		// and the slurl type (APP or LOCATION)
-		if(slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
-		{
-			if (path_array.size() == 0)
-			{
-				// um, we need a path...
-				mType = EMPTY;
-				return;
-			}
-
-			// parse a maingrid style slurl.  We know the grid is maingrid
-			// so grab it.
-			// A location slurl for maingrid (with the special schemes) can be in the form
-			// secondlife://<regionname>/<x>/<y>/<z>
-			// or
-			// secondlife://<Grid>/secondlife/<region>/<x>/<y>/<z>
-			// where if grid is empty, it specifies Agni
-			
-			// An app style slurl for maingrid can be
-			// secondlife://<Grid>/app/<app parameters>
-			// where an empty grid implies Agni
-			
-			// we'll start by checking the top of the 'path' which will be 
-			// either 'app', 'secondlife', or <x>.
-			
-			// default to maingrid
-			
-			mGrid = MAINGRID;
-			
-			if ((path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH) ||
-				(path_array[0].asString() == LLSLURL::SLURL_APP_PATH))
-		    {
-				// it's in the form secondlife://<grid>/(app|secondlife)
-				// so parse the grid name to derive the grid ID
-				if (!slurl_uri.hostName().empty())
-				{
-					mGrid = LLGridManager::getInstance()->getGridId(slurl_uri.hostName());
-				}
-				else if(path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH)
-				{
-					// If the slurl is in the form secondlife:///secondlife/<region> form, 
-					// then we are in fact on maingrid.  
-					mGrid = MAINGRID;
-				}
-				else if(path_array[0].asString() == LLSLURL::SLURL_APP_PATH)
-				{
-					// for app style slurls, where no grid name is specified, assume the currently
-					// selected or logged in grid.
-					mGrid =  LLGridManager::getInstance()->getGridId();
-				}
-
-				if(mGrid.empty())
-				{
-					// we couldn't find the grid in the grid manager, so bail
-					LL_WARNS("AppInit")<<"unable to find grid"<<LL_ENDL;
-					return;
-				}
-				// set the type as appropriate.
-				if(path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH)
-				{
-					mType = LOCATION;
-				}
-				else
-				{
-					mType = APP;
-				}
-				path_array.erase(0);
-		    }
-			else
-		    {
-				if(slurl_uri.hostName() == LLSLURL::SLURL_APP_PATH)
+    // by default we go to agni.
+    mType = INVALID;
+
+    if (slurl.empty() || (slurl == SIM_LOCATION_LAST))
+    {
+        mType = LAST_LOCATION;
+    }
+    else if (slurl == SIM_LOCATION_HOME)
+    {
+        mType = HOME_LOCATION;
+    }
+    else
+    {
+        LLURI slurl_uri;
+        // parse the slurl as a uri
+        if (slurl.find(':') == std::string::npos)
+        {
+            // There may be no scheme ('secondlife:' etc.) passed in.  In that case
+            // we want to normalize the slurl by putting the appropriate scheme
+            // in front of the slurl.  So, we grab the appropriate slurl base
+            // from the grid manager which may be http://slurl.com/secondlife/ for maingrid, or
+            // https://<hostname>/region/ for Standalone grid (the word region, not the region name)
+            // these slurls are typically passed in from the 'starting location' box on the login panel,
+            // where the user can type in <regionname>/<x>/<y>/<z>
+            std::string fixed_slurl = LLGridManager::getInstance()->getSLURLBase();
+
+            // the slurl that was passed in might have a prepended /, or not.  So,
+            // we strip off the prepended '/' so we don't end up with http://slurl.com/secondlife/<region>/<x>/<y>/<z>
+            // or some such.
+
+            if (slurl[0] == '/')
+            {
+                fixed_slurl += slurl.substr(1);
+            }
+            else
+            {
+                fixed_slurl += slurl;
+            }
+            // We then load the slurl into a LLURI form
+            slurl_uri = LLURI(fixed_slurl);
+        }
+        else
+        {
+            // as we did have a scheme, implying a URI style slurl, we
+            // simply parse it as a URI
+            slurl_uri = LLURI(slurl);
+        }
+
+        LLSD path_array = slurl_uri.pathArray();
+
+        // determine whether it's a maingrid URI or an Standalone/open style URI
+        // by looking at the scheme.  If it's a 'secondlife:' slurl scheme or
+        // 'sl:' scheme, we know it's maingrid
+
+        // At the end of this if/else block, we'll have determined the grid,
+        // and the slurl type (APP or LOCATION)
+        if (slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
+        {
+            if (path_array.size() == 0)
+            {
+                if (slurl_uri.authority().empty() && slurl_uri.escapedQuery().empty())
+                {
+                    mType = EMPTY;
+                }
+                // um, we need a path...
+                return;
+            }
+
+            // parse a maingrid style slurl.  We know the grid is maingrid
+            // so grab it.
+            // A location slurl for maingrid (with the special schemes) can be in the form
+            // secondlife://<regionname>/<x>/<y>/<z>
+            // or
+            // secondlife://<Grid>/secondlife/<region>/<x>/<y>/<z>
+            // where if grid is empty, it specifies Agni
+
+            // An app style slurl for maingrid can be
+            // secondlife://<Grid>/app/<app parameters>
+            // where an empty grid implies Agni
+
+            // we'll start by checking the top of the 'path' which will be
+            // either 'app', 'secondlife', or <x>.
+
+            // default to maingrid
+
+            mGrid = MAINGRID;
+
+            if ((path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH) ||
+                (path_array[0].asString() == LLSLURL::SLURL_APP_PATH))
+            {
+                // it's in the form secondlife://<grid>/(app|secondlife)
+                // so parse the grid name to derive the grid ID
+                if (!slurl_uri.hostName().empty())
+                {
+                    mGrid = LLGridManager::getInstance()->getGridId(slurl_uri.hostName());
+                }
+                else if(path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH)
+                {
+                    // If the slurl is in the form secondlife:///secondlife/<region> form,
+                    // then we are in fact on maingrid.
+                    mGrid = MAINGRID;
+                }
+                else if(path_array[0].asString() == LLSLURL::SLURL_APP_PATH)
+                {
+                    // for app style slurls, where no grid name is specified, assume the currently
+                    // selected or logged in grid.
+                    mGrid =  LLGridManager::getInstance()->getGridId();
+                }
+
+                if (mGrid.empty())
+                {
+                    // we couldn't find the grid in the grid manager, so bail
+                    LL_WARNS("AppInit")<<"unable to find grid"<<LL_ENDL;
+                    return;
+                }
+                // set the type as appropriate.
+                if (path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH)
+                {
+                    mType = LOCATION;
+                }
+                else
+                {
+                    mType = APP;
+                }
+                path_array.erase(0);
+            }
+            else
+            {
+                if (slurl_uri.hostName() == LLSLURL::SLURL_APP_PATH)
                 {
                     mType = APP;
                 }
                 else
                 {
                     // it wasn't a /secondlife/<region> or /app/<params>, so it must be secondlife://<region>
-				// therefore the hostname will be the region name, and it's a location type
-				mType = LOCATION;
-				// 'normalize' it so the region name is in fact the head of the path_array
-				path_array.insert(0, slurl_uri.hostName());
+                    // therefore the hostname will be the region name, and it's a location type
+                    mType = LOCATION;
+                    // 'normalize' it so the region name is in fact the head of the path_array
+                    path_array.insert(0, slurl_uri.hostName());
+                }
+            }
+        }
+        else if ((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME) ||
+            (slurl_uri.scheme() == LLSLURL::SLURL_HTTPS_SCHEME) ||
+            (slurl_uri.scheme() == LLSLURL::SLURL_X_GRID_LOCATION_INFO_SCHEME))
+        {
+            // We're dealing with either a Standalone style slurl or slurl.com slurl
+            if ((slurl_uri.hostName() == LLSLURL::SLURL_COM) ||
+                (slurl_uri.hostName() == LLSLURL::WWW_SLURL_COM) ||
+                (slurl_uri.hostName() == LLSLURL::MAPS_SECONDLIFE_COM))
+            {
+                // slurl.com implies maingrid
+                mGrid = MAINGRID;
+            }
+            else
+            {
+                // Don't try to match any old http://<host>/ URL as a SLurl.
+                // SLE SLurls will have the grid hostname in the URL, so only
+                // match http URLs if the hostname matches the grid hostname
+                // (or its a slurl.com or maps.secondlife.com URL).
+                if ((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME ||
+                     slurl_uri.scheme() == LLSLURL::SLURL_HTTPS_SCHEME) &&
+                    slurl_uri.hostName() != LLGridManager::getInstance()->getGrid())
+                {
+                    return;
                 }
-		    }
-		}
-		else if((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME) ||
-		   (slurl_uri.scheme() == LLSLURL::SLURL_HTTPS_SCHEME) || 
-		   (slurl_uri.scheme() == LLSLURL::SLURL_X_GRID_LOCATION_INFO_SCHEME))
-		{
-		    // We're dealing with either a Standalone style slurl or slurl.com slurl
-		  if ((slurl_uri.hostName() == LLSLURL::SLURL_COM) ||
-		      (slurl_uri.hostName() == LLSLURL::WWW_SLURL_COM) || 
-		      (slurl_uri.hostName() == LLSLURL::MAPS_SECONDLIFE_COM))
-			{
-				// slurl.com implies maingrid
-				mGrid = MAINGRID;
-			}
-		    else
-			{
-				// Don't try to match any old http://<host>/ URL as a SLurl.
-				// SLE SLurls will have the grid hostname in the URL, so only
-				// match http URLs if the hostname matches the grid hostname
-				// (or its a slurl.com or maps.secondlife.com URL).
-				if ((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME ||
-					 slurl_uri.scheme() == LLSLURL::SLURL_HTTPS_SCHEME) &&
-					slurl_uri.hostName() != LLGridManager::getInstance()->getGrid())
-				{
-					return;
-				}
-
-				// As it's a Standalone grid/open, we will always have a hostname, as Standalone/open  style
-				// urls are properly formed, unlike the stinky maingrid style
-				mGrid = slurl_uri.hostName();
-			}
-		    if (path_array.size() == 0)
-			{
-				// um, we need a path...
-				return;
-			}
-			
-			// we need to normalize the urls so
-			// the path portion starts with the 'command' that we want to do
-			// it can either be region or app.  
-		    if ((path_array[0].asString() == LLSLURL::SLURL_REGION_PATH) ||
-				(path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH))
-			{
-				// strip off 'region' or 'secondlife'
-				path_array.erase(0);
-				// it's a location
-				mType = LOCATION;
-			}
-			else if (path_array[0].asString() == LLSLURL::SLURL_APP_PATH)
-			{
-				mType = APP;
-				path_array.erase(0);
-				// leave app appended.  
-			}
-			else
-			{
-				// not a valid https/http/x-grid-location-info slurl, so it'll likely just be a URL
-				return;
-			}
-		}
-		else
-		{
-		    // invalid scheme, so bail
-		    return;
-		}
-		
-		
-		if(path_array.size() == 0)
-		{
-			// we gotta have some stuff after the specifier as to whether it's a region or command
-			return;
-		}
-		
-		// now that we know whether it's an app slurl or a location slurl,
-		// parse the slurl into the proper data structures.
-		if(mType == APP)
-		{		
-			// grab the app command type and strip it (could be a command to jump somewhere, 
-			// or whatever )
-			mAppCmd = path_array[0].asString();
-			path_array.erase(0);
-			
-			// Grab the parameters
-			mAppPath = path_array;
-			// and the query
-			mAppQuery = slurl_uri.query();
-			mAppQueryMap = slurl_uri.queryMap();
-			return;
-		}
-		else if(mType == LOCATION)
-		{
-			// at this point, head of the path array should be [ <region>, <x>, <y>, <z> ] where x, y and z 
-			// are collectively optional
-			// are optional
-
-			mRegion = LLURI::unescape(path_array[0].asString());
-
-			if(LLStringUtil::containsNonprintable(mRegion))
-			{
-				LLStringUtil::stripNonprintable(mRegion);
-			}
-
-			path_array.erase(0);
-			
-			// parse the x, y, and optionally z
-			if(path_array.size() >= 2)
-			{	
-			  
-			  mPosition = LLVector3(path_array); // this construction handles LLSD without all components (values default to 0.f)
-			  if((F32(mPosition[VX]) < 0.f) || 
-                             (mPosition[VX] > REGION_WIDTH_METERS) ||
-			     (F32(mPosition[VY]) < 0.f) || 
-                             (mPosition[VY] > REGION_WIDTH_METERS) ||
-			     (F32(mPosition[VZ]) < 0.f) || 
-                             (mPosition[VZ] > REGION_HEIGHT_METERS))
-			    {
-			      mType = INVALID;
-			      return;
-			    }
- 
-			}
-			else
-			{
-				// if x, y and z were not fully passed in, go to the middle of the region.
-				// teleport will adjust the actual location to make sure you're on the ground
-				// and such
-				mPosition = LLVector3(REGION_WIDTH_METERS/2, REGION_WIDTH_METERS/2, 0);
-			}
-		}
-	}
-}
 
+                // As it's a Standalone grid/open, we will always have a hostname, as Standalone/open  style
+                // urls are properly formed, unlike the stinky maingrid style
+                mGrid = slurl_uri.hostName();
+            }
+            if (path_array.size() == 0)
+            {
+                // um, we need a path...
+                return;
+            }
+
+            // we need to normalize the urls so
+            // the path portion starts with the 'command' that we want to do
+            // it can either be region or app.
+            if ((path_array[0].asString() == LLSLURL::SLURL_REGION_PATH) ||
+                (path_array[0].asString() == LLSLURL::SLURL_SECONDLIFE_PATH))
+            {
+                // strip off 'region' or 'secondlife'
+                path_array.erase(0);
+                // it's a location
+                mType = LOCATION;
+            }
+            else if (path_array[0].asString() == LLSLURL::SLURL_APP_PATH)
+            {
+                mType = APP;
+                path_array.erase(0);
+                // leave app appended.
+            }
+            else
+            {
+                // not a valid https/http/x-grid-location-info slurl, so it'll likely just be a URL
+                return;
+            }
+        }
+        else
+        {
+            // invalid scheme, so bail
+            return;
+        }
+
+        if (path_array.size() == 0)
+        {
+            // we gotta have some stuff after the specifier as to whether it's a region or command
+            return;
+        }
+
+        // now that we know whether it's an app slurl or a location slurl,
+        // parse the slurl into the proper data structures.
+        if (mType == APP)
+        {
+            // grab the app command type and strip it (could be a command to jump somewhere,
+            // or whatever )
+            mAppCmd = path_array[0].asString();
+            path_array.erase(0);
+
+            // Grab the parameters
+            mAppPath = path_array;
+            // and the query
+            mAppQuery = slurl_uri.query();
+            mAppQueryMap = slurl_uri.queryMap();
+            return;
+        }
+        else if (mType == LOCATION)
+        {
+            // at this point, head of the path array should be [ <region>, <x>, <y>, <z> ] where x, y and z
+            // are collectively optional
+            // are optional
+
+            mRegion = LLURI::unescape(path_array[0].asString());
+
+            if (LLStringUtil::containsNonprintable(mRegion))
+            {
+                LLStringUtil::stripNonprintable(mRegion);
+            }
+
+            path_array.erase(0);
+
+            // parse the x, y, and optionally z
+            if (path_array.size() >= 2)
+            {
+                mPosition = LLVector3(path_array); // this construction handles LLSD without all components (values default to 0.f)
+                if ((F32(mPosition[VX]) < 0.f) || (mPosition[VX] > REGION_WIDTH_METERS) ||
+                    (F32(mPosition[VY]) < 0.f) || (mPosition[VY] > REGION_WIDTH_METERS) ||
+                    (F32(mPosition[VZ]) < 0.f) || (mPosition[VZ] > REGION_HEIGHT_METERS))
+                {
+                    mType = INVALID;
+                    return;
+                }
+            }
+            else
+            {
+                // if x, y and z were not fully passed in, go to the middle of the region.
+                // teleport will adjust the actual location to make sure you're on the ground
+                // and such
+                mPosition = LLVector3(REGION_WIDTH_METERS / 2, REGION_WIDTH_METERS / 2, 0);
+            }
+        }
+    }
+}
 
 // Create a slurl for the middle of the region
-LLSLURL::LLSLURL(const std::string& grid, 
-				 const std::string& region)
+LLSLURL::LLSLURL(const std::string& grid, const std::string& region)
 {
-	mGrid = grid;
-	mRegion = region;
-	mType = LOCATION;
-	mPosition = LLVector3((F64)REGION_WIDTH_METERS/2, (F64)REGION_WIDTH_METERS/2, 0);
+    mGrid = grid;
+    mRegion = region;
+    mType = LOCATION;
+    mPosition = LLVector3((F64)REGION_WIDTH_METERS / 2, (F64)REGION_WIDTH_METERS / 2, 0);
 }
 
-
-
 // create a slurl given the position.  The position will be modded with the region
 // width handling global positions as well
-LLSLURL::LLSLURL(const std::string& grid, 
-		 const std::string& region, 
-		 const LLVector3& position)
+LLSLURL::LLSLURL(const std::string& grid,
+        const std::string& region,
+        const LLVector3& position)
 {
-	mGrid = grid;
-	mRegion = region;
-	S32 x = ll_round( (F32)fmod( position[VX], (F32)REGION_WIDTH_METERS ) );
-	S32 y = ll_round( (F32)fmod( position[VY], (F32)REGION_WIDTH_METERS ) );
-	S32 z = ll_round( (F32)position[VZ] );
-	mType = LOCATION;
-	mPosition = LLVector3(x, y, z);
+    mGrid = grid;
+    mRegion = region;
+    S32 x = ll_round((F32)fmod(position[VX], (F32)REGION_WIDTH_METERS));
+    S32 y = ll_round((F32)fmod(position[VY], (F32)REGION_WIDTH_METERS));
+    S32 z = ll_round((F32)position[VZ]);
+    mType = LOCATION;
+    mPosition = LLVector3(x, y, z);
 }
 
-
 // create a simstring
-LLSLURL::LLSLURL(const std::string& region, 
-		 const LLVector3& position)
+LLSLURL::LLSLURL(const std::string& region,
+        const LLVector3& position)
 {
-  *this = LLSLURL(LLGridManager::getInstance()->getGridId(),
-		  region, position);
+    *this = LLSLURL(LLGridManager::getInstance()->getGridId(), region, position);
 }
 
 // create a slurl from a global position
-LLSLURL::LLSLURL(const std::string& grid, 
-		 const std::string& region, 
-		 const LLVector3d& global_position)
+LLSLURL::LLSLURL(const std::string& grid,
+         const std::string& region,
+         const LLVector3d& global_position)
 {
-	*this = LLSLURL(LLGridManager::getInstance()->getGridId(grid),
-		  region, LLVector3(global_position.mdV[VX],
-				    global_position.mdV[VY],
-				    global_position.mdV[VZ]));
+    *this = LLSLURL(LLGridManager::getInstance()->getGridId(grid), region,
+        LLVector3(global_position.mdV[VX], global_position.mdV[VY], global_position.mdV[VZ]));
 }
 
 // create a slurl from a global position
-LLSLURL::LLSLURL(const std::string& region, 
-		 const LLVector3d& global_position)
+LLSLURL::LLSLURL(const std::string& region,
+        const LLVector3d& global_position)
 {
-  *this = LLSLURL(LLGridManager::getInstance()->getGridId(),
-		  region, global_position);
+    *this = LLSLURL(LLGridManager::getInstance()->getGridId(),
+        region, global_position);
 }
 
 LLSLURL::LLSLURL(const std::string& command, const LLUUID&id, const std::string& verb)
 {
-  mType = APP;
-  mAppCmd = command;
-  mAppPath = LLSD::emptyArray();
-  mAppPath.append(LLSD(id));
-  mAppPath.append(LLSD(verb));
+    mType = APP;
+    mAppCmd = command;
+    mAppPath = LLSD::emptyArray();
+    mAppPath.append(LLSD(id));
+    mAppPath.append(LLSD(verb));
 }
 
-
 std::string LLSLURL::getSLURLString() const
 {
-	switch(mType)
-	{
-		case HOME_LOCATION:
-			return SIM_LOCATION_HOME;
-		case LAST_LOCATION:
-			return SIM_LOCATION_LAST;
-		case LOCATION:
-			{
-				// lookup the grid
-				S32 x = ll_round( (F32)mPosition[VX] );
-				S32 y = ll_round( (F32)mPosition[VY] );
-				S32 z = ll_round( (F32)mPosition[VZ] );	
-				return LLGridManager::getInstance()->getSLURLBase(mGrid) + 
-				LLURI::escape(mRegion) + llformat("/%d/%d/%d",x,y,z); 
-			}
-		case APP:
-		{
-			std::ostringstream app_url;
-			app_url << LLGridManager::getInstance()->getAppSLURLBase() << "/" << mAppCmd;
-			for(LLSD::array_const_iterator i = mAppPath.beginArray();
-				i != mAppPath.endArray();
-				i++)
-			{
-				app_url << "/" << i->asString();
-			}
-			if(mAppQuery.length() > 0)
-			{
-				app_url << "?" << mAppQuery;
-			}
-			return app_url.str();
-		}	
-		default:
-			LL_WARNS("AppInit") << "Unexpected SLURL type for SLURL string" << (int)mType << LL_ENDL;			
-			return std::string();
-	}
+    switch (mType)
+    {
+        case HOME_LOCATION:
+            return SIM_LOCATION_HOME;
+        case LAST_LOCATION:
+            return SIM_LOCATION_LAST;
+        case LOCATION:
+        {
+            // lookup the grid
+            S32 x = ll_round((F32)mPosition[VX]);
+            S32 y = ll_round((F32)mPosition[VY]);
+            S32 z = ll_round((F32)mPosition[VZ]);
+            return LLGridManager::getInstance()->getSLURLBase(mGrid) +
+                LLURI::escape(mRegion) + llformat("/%d/%d/%d", x, y, z);
+        }
+        case APP:
+        {
+            std::ostringstream app_url;
+            app_url << LLGridManager::getInstance()->getAppSLURLBase() << "/" << mAppCmd;
+            for (LLSD::array_const_iterator i = mAppPath.beginArray();
+                i != mAppPath.endArray();
+                i++)
+            {
+                app_url << "/" << i->asString();
+            }
+            if (mAppQuery.length() > 0)
+            {
+                app_url << "?" << mAppQuery;
+            }
+            return app_url.str();
+        }
+        default:
+            LL_WARNS("AppInit") << "Unexpected SLURL type for SLURL string" << (int)mType << LL_ENDL;
+            return std::string();
+    }
 }
 
 std::string LLSLURL::getLoginString() const
 {
-	
-	std::stringstream unescaped_start;
-	switch(mType)
-	{
-		case LOCATION:
-			unescaped_start << "uri:" 
-			<< mRegion << "&" 
-			<< ll_round(mPosition[0]) << "&" 
-			<< ll_round(mPosition[1]) << "&" 
-			<< ll_round(mPosition[2]);
-			break;
-		case HOME_LOCATION:
-			unescaped_start << "home";
-			break;
-		case LAST_LOCATION:
-			unescaped_start << "last";
-			break;
-		default:
-			LL_WARNS("AppInit") << "Unexpected SLURL type ("<<(int)mType <<")for login string"<< LL_ENDL;
-			break;
-	}
-	return  xml_escape_string(unescaped_start.str());
+    std::stringstream unescaped_start;
+    switch (mType)
+    {
+        case LOCATION:
+            unescaped_start << "uri:"
+                << mRegion << "&"
+                << ll_round(mPosition[0]) << "&"
+                << ll_round(mPosition[1]) << "&"
+                << ll_round(mPosition[2]);
+            break;
+        case HOME_LOCATION:
+            unescaped_start << "home";
+            break;
+        case LAST_LOCATION:
+            unescaped_start << "last";
+            break;
+        default:
+            LL_WARNS("AppInit") << "Unexpected SLURL type (" << (int)mType << ")for login string" << LL_ENDL;
+            break;
+    }
+    return  xml_escape_string(unescaped_start.str());
 }
 
-bool LLSLURL::operator==(const LLSLURL& rhs)
+bool LLSLURL::operator ==(const LLSLURL& rhs)
 {
-	if(rhs.mType != mType) return false;
-	switch(mType)
-	{
-		case LOCATION:
-			return ((mGrid == rhs.mGrid) &&
-					(mRegion == rhs.mRegion) &&
-					(mPosition == rhs.mPosition));
-		case APP:
-			return getSLURLString() == rhs.getSLURLString();
-			
-		case HOME_LOCATION:
-		case LAST_LOCATION:
-			return true;
-		default:
-			return false;
-	}
+    if (rhs.mType != mType)
+        return false;
+
+    switch (mType)
+    {
+        case LOCATION:
+            return (mGrid == rhs.mGrid) &&
+                    (mRegion == rhs.mRegion) &&
+                    (mPosition == rhs.mPosition);
+
+        case APP:
+            return getSLURLString() == rhs.getSLURLString();
+
+        case HOME_LOCATION:
+        case LAST_LOCATION:
+            return true;
+    }
+
+    return false;
 }
 
 bool LLSLURL::operator !=(const LLSLURL& rhs)
 {
-	return !(*this == rhs);
+    return !(*this == rhs);
 }
 
 std::string LLSLURL::getLocationString() const
 {
-	return llformat("%s/%d/%d/%d",
-					mRegion.c_str(),
-					(int)ll_round(mPosition[0]),
-					(int)ll_round(mPosition[1]),
-					(int)ll_round(mPosition[2]));						 
+    return llformat("%s/%d/%d/%d",
+        mRegion.c_str(),
+        (int)ll_round(mPosition[0]),
+        (int)ll_round(mPosition[1]),
+        (int)ll_round(mPosition[2]));
 }
 
 // static
-const std::string LLSLURL::typeName[NUM_SLURL_TYPES] = 
+const std::string LLSLURL::typeName[NUM_SLURL_TYPES] =
 {
-	"INVALID", 
-	"LOCATION",
-	"HOME_LOCATION",
-	"LAST_LOCATION",
-	"APP",
-	"HELP"
+    "INVALID",
+    "LOCATION",
+    "HOME_LOCATION",
+    "LAST_LOCATION",
+    "APP",
+    "HELP",
+    "EMPTY"
 };
-		
+
 std::string LLSLURL::getTypeString(SLURL_TYPE type)
 {
-	std::string name;
-	if ( type >= INVALID && type < NUM_SLURL_TYPES )
-	{
-		name = LLSLURL::typeName[type];
-	}
-	else
-	{
-		name = llformat("Out of Range (%d)",type);
-	}
-	return name;
+    std::string name;
+    if (type >= INVALID && type < NUM_SLURL_TYPES)
+    {
+        name = LLSLURL::typeName[type];
+    }
+    else
+    {
+        name = llformat("Out of Range (%d)", type);
+    }
+    return name;
 }
 
-
 std::string LLSLURL::asString() const
 {
     std::ostringstream result;
     result
-		<< "   mType: " << LLSLURL::getTypeString(mType)
-		<< "   mGrid: " + getGrid()
-		<< "   mRegion: " + getRegion()
-		<< "   mPosition: " << mPosition
-		<< "   mAppCmd:"  << getAppCmd()
-		<< "   mAppPath:" + getAppPath().asString()
-		<< "   mAppQueryMap:" + getAppQueryMap().asString()
-		<< "   mAppQuery: " + getAppQuery()
-		;
-	
+        << "   mType: " << LLSLURL::getTypeString(mType)
+        << "   mGrid: " + getGrid()
+        << "   mRegion: " + getRegion()
+        << "   mPosition: " << mPosition
+        << "   mAppCmd:"  << getAppCmd()
+        << "   mAppPath:" + getAppPath().asString()
+        << "   mAppQueryMap:" + getAppQueryMap().asString()
+        << "   mAppQuery: " + getAppQuery()
+        ;
+
     return result.str();
 }
-
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index eabf922875..8d21b6ed69 100644
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -187,6 +187,12 @@ namespace tut
 		ensure_equals("maps.secondlife.com slurl, region + coords", slurl.getSLURLString(),
 					  "http://maps.secondlife.com/secondlife/myregion/1/2/3");
 
+		slurl = LLSLURL("secondlife://");
+		ensure_equals("secondlife: slurl, empty - type", slurl.getType(), LLSLURL::EMPTY);
+
+		slurl = LLSLURL("secondlife:///");
+		ensure_equals("secondlife: slurl, root - type", slurl.getType(), LLSLURL::EMPTY);
+
 		slurl = LLSLURL("secondlife://myregion");
 		ensure_equals("secondlife: slurl, region only - type", slurl.getType(), LLSLURL::LOCATION);
 		ensure_equals("secondlife: slurl, region only", slurl.getSLURLString(),
-- 
cgit v1.2.3


From 8d27c7db426f9a1b5d994d93247318100865c368 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 13 Oct 2023 19:18:39 +0200
Subject: SL-20422 Mac build fix

---
 indra/newview/llslurl.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index 3858a1b9ce..262ea3ca1f 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -459,9 +459,10 @@ bool LLSLURL::operator ==(const LLSLURL& rhs)
         case HOME_LOCATION:
         case LAST_LOCATION:
             return true;
-    }
 
-    return false;
+        default:
+            return false;
+    }
 }
 
 bool LLSLURL::operator !=(const LLSLURL& rhs)
-- 
cgit v1.2.3


From f635fe087089cd6ef420ce37d8f639209efd7e69 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Mon, 16 Oct 2023 16:21:20 -0500
Subject: SL-20473 Add GenericStreamingMessage and dummy handler to suppress
 packet loss and log spam noise when visiting GLTF enabled regions.

---
 indra/newview/llstartup.cpp                |  1 +
 indra/newview/llviewergenericmessage.cpp   |  5 +++++
 indra/newview/llviewergenericmessage.h     |  1 +
 scripts/messages/message_template.msg      | 19 +++++++++++++++++++
 scripts/messages/message_template.msg.sha1 |  2 +-
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index f63e65c1ad..2ac699de32 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2779,6 +2779,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
 	msg->setHandlerFunc("InitiateDownload", process_initiate_download);
 	msg->setHandlerFunc("LandStatReply", LLFloaterTopObjects::handle_land_reply);
     msg->setHandlerFunc("GenericMessage", process_generic_message);
+    msg->setHandlerFunc("GenericStreamingMessage", process_generic_streaming_message);
     msg->setHandlerFunc("LargeGenericMessage", process_large_generic_message);
 
 	msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message);
diff --git a/indra/newview/llviewergenericmessage.cpp b/indra/newview/llviewergenericmessage.cpp
index d3de9d72bf..7d33fc0d84 100644
--- a/indra/newview/llviewergenericmessage.cpp
+++ b/indra/newview/llviewergenericmessage.cpp
@@ -92,6 +92,11 @@ void process_generic_message(LLMessageSystem* msg, void**)
 	}
 }
 
+void process_generic_streaming_message(LLMessageSystem* msg, void**)
+{
+    // placeholder to suppress packet loss reports and log spam (SL-20473)
+}
+
 void process_large_generic_message(LLMessageSystem* msg, void**)
 {
     LLUUID agent_id;
diff --git a/indra/newview/llviewergenericmessage.h b/indra/newview/llviewergenericmessage.h
index 170f38a485..96a73a3d5f 100644
--- a/indra/newview/llviewergenericmessage.h
+++ b/indra/newview/llviewergenericmessage.h
@@ -38,6 +38,7 @@ void send_generic_message(const std::string& method,
 						  const LLUUID& invoice = LLUUID::null);
 
 void process_generic_message(LLMessageSystem* msg, void**);
+void process_generic_streaming_message(LLMessageSystem* msg, void**);
 void process_large_generic_message(LLMessageSystem* msg, void**);
 
 
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index a3ddc6d336..c019a76793 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -5790,6 +5790,25 @@ version 2.0
 	}
 }
 
+// GenericStreamingMessage
+// Optimized generic message for streaming arbitrary data to viewer
+// Avoid payloads over 7KB (8KB ceiling)
+// Method -- magic number indicating method to use to decode payload:
+//      0x4175 - GLTF material override data
+// Payload -- data to be decoded
+{
+    GenericStreamingMessage High 31 Trusted Unencoded
+    {
+        MethodData Single
+        { Method    U16 }
+    }
+
+    {
+        DataBlock Single
+        { Data Variable 2 }
+    }
+}
+
 // LargeGenericMessage
 // Similar to the above messages, but can handle larger payloads and serialized 
 // LLSD.  Uses HTTP transport 
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 4712a03e8d..5ad85458e9 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-dddb11f7e45f1779ff536819f36a20e63d572ba8
\ No newline at end of file
+e3bd0529a647d938ab6d48f26d21dd52c07ebc6e
\ No newline at end of file
-- 
cgit v1.2.3


From 052be579b6bb19c5a321e4c2d8c9173bcf5b9c34 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 19 Oct 2023 23:03:13 +0300
Subject: SL-20422 Unit test fix

---
 indra/newview/llslurl.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index 262ea3ca1f..e43fb993ce 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -112,12 +112,11 @@ LLSLURL::LLSLURL(const std::string& slurl)
         // and the slurl type (APP or LOCATION)
         if (slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
         {
-            if (path_array.size() == 0)
+            if (path_array.size() == 0
+                && slurl_uri.authority().empty()
+                && slurl_uri.escapedQuery().empty())
             {
-                if (slurl_uri.authority().empty() && slurl_uri.escapedQuery().empty())
-                {
-                    mType = EMPTY;
-                }
+                mType = EMPTY;
                 // um, we need a path...
                 return;
             }
-- 
cgit v1.2.3


From a1695760821b4d19af204918a1764d9fca3e99b9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 24 Oct 2023 19:31:20 +0300
Subject: SL-20468 Add ability to overwrite an existing outfit

---
 indra/newview/lloutfitgallery.cpp                  |  12 +-
 indra/newview/lloutfitgallery.h                    |   1 -
 indra/newview/lloutfitslist.cpp                    |  57 +++++++--
 indra/newview/lloutfitslist.h                      |   4 +
 .../default/xui/en/menu_gallery_inventory.xml      |   6 +-
 .../default/xui/en/menu_gallery_outfit_tab.xml     |  94 ++++++++------
 .../skins/default/xui/en/menu_inventory.xml        |   6 +-
 .../skins/default/xui/en/menu_outfit_gear.xml      | 138 ++++++++++++---------
 .../skins/default/xui/en/menu_outfit_tab.xml       |  37 ++++--
 .../newview/skins/default/xui/en/notifications.xml |  16 +++
 10 files changed, 230 insertions(+), 141 deletions(-)

diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index de988555c5..b26aabca4f 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -1155,22 +1155,13 @@ LLContextMenu* LLOutfitGalleryContextMenu::createMenu()
     registrar.add("Outfit.Delete", boost::bind(LLOutfitGallery::onRemoveOutfit, selected_id));
     registrar.add("Outfit.Create", boost::bind(&LLOutfitGalleryContextMenu::onCreate, this, _2));
     registrar.add("Outfit.Thumbnail", boost::bind(&LLOutfitGalleryContextMenu::onThumbnail, this, selected_id));
+    registrar.add("Outfit.Save", boost::bind(&LLOutfitGalleryContextMenu::onSave, this, selected_id));
     enable_registrar.add("Outfit.OnEnable", boost::bind(&LLOutfitGalleryContextMenu::onEnable, this, _2));
     enable_registrar.add("Outfit.OnVisible", boost::bind(&LLOutfitGalleryContextMenu::onVisible, this, _2));
     
     return createFromFile("menu_gallery_outfit_tab.xml");
 }
 
-void LLOutfitGalleryContextMenu::onThumbnail(const LLUUID& outfit_cat_id)
-{
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    if (gallery && outfit_cat_id.notNull())
-    {
-        LLSD data(outfit_cat_id);
-        LLFloaterReg::showInstance("change_item_thumbnail", data);
-    }
-}
-
 void LLOutfitGalleryContextMenu::onCreate(const LLSD& data)
 {
     LLWearableType::EType type = LLWearableType::getInstance()->typeNameToType(data.asString());
@@ -1205,7 +1196,6 @@ void LLOutfitGalleryGearMenu::onUpdateItemsVisibility()
     mMenu->setItemVisible("expand", FALSE);
     mMenu->setItemVisible("collapse", FALSE);
     mMenu->setItemVisible("thumbnail", have_selection);
-    mMenu->setItemVisible("sepatator3", TRUE);
     mMenu->setItemVisible("sort_folders_by_name", TRUE);
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
 }
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 9915752962..d27352eb3b 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -202,7 +202,6 @@ protected:
     /* virtual */ LLContextMenu* createMenu();
     bool onEnable(LLSD::String param);
     bool onVisible(LLSD::String param);
-    void onThumbnail(const LLUUID& outfit_cat_id);
     void onCreate(const LLSD& data);
 private:
     LLOutfitListBase*	mOutfitList;
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 5c7792b0df..fbb442a992 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -1028,6 +1028,8 @@ LLContextMenu* LLOutfitContextMenu::createMenu()
     registrar.add("Outfit.Edit", boost::bind(editOutfit));
     registrar.add("Outfit.Rename", boost::bind(renameOutfit, selected_id));
     registrar.add("Outfit.Delete", boost::bind(&LLOutfitListBase::removeSelected, mOutfitList));
+    registrar.add("Outfit.Thumbnail", boost::bind(&LLOutfitContextMenu::onThumbnail, this, selected_id));
+    registrar.add("Outfit.Save", boost::bind(&LLOutfitContextMenu::onSave, this, selected_id));
 
     enable_registrar.add("Outfit.OnEnable", boost::bind(&LLOutfitContextMenu::onEnable, this, _2));
     enable_registrar.add("Outfit.OnVisible", boost::bind(&LLOutfitContextMenu::onVisible, this, _2));
@@ -1092,6 +1094,31 @@ void LLOutfitContextMenu::renameOutfit(const LLUUID& outfit_cat_id)
     LLAppearanceMgr::instance().renameOutfit(outfit_cat_id);
 }
 
+void LLOutfitContextMenu::onThumbnail(const LLUUID &outfit_cat_id)
+{
+    if (outfit_cat_id.notNull())
+    {
+        LLSD data(outfit_cat_id);
+        LLFloaterReg::showInstance("change_item_thumbnail", data);
+    }
+}
+
+void LLOutfitContextMenu::onSave(const LLUUID &outfit_cat_id)
+{
+    if (outfit_cat_id.notNull())
+    {
+        LLNotificationsUtil::add("ConfirmOverwriteOutfit", LLSD(), LLSD(),
+            [outfit_cat_id](const LLSD &notif, const LLSD &resp)
+        {
+            S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp);
+            if (opt == 0)
+            {
+                LLAppearanceMgr::getInstance()->onOutfitFolderCreated(outfit_cat_id, true);
+            }
+        });
+    }
+}
+
 LLOutfitListGearMenuBase::LLOutfitListGearMenuBase(LLOutfitListBase* olist)
     :   mOutfitList(olist),
         mMenu(NULL)
@@ -1110,6 +1137,7 @@ LLOutfitListGearMenuBase::LLOutfitListGearMenuBase(LLOutfitListBase* olist)
     registrar.add("Gear.Expand", boost::bind(&LLOutfitListBase::onExpandAllFolders, mOutfitList));
 
     registrar.add("Gear.WearAdd", boost::bind(&LLOutfitListGearMenuBase::onAdd, this));
+    registrar.add("Gear.Save", boost::bind(&LLOutfitListGearMenuBase::onSave, this));
 
     registrar.add("Gear.Thumbnail", boost::bind(&LLOutfitListGearMenuBase::onThumbnail, this));
     registrar.add("Gear.SortByName", boost::bind(&LLOutfitListGearMenuBase::onChangeSortOrder, this));
@@ -1135,8 +1163,7 @@ void LLOutfitListGearMenuBase::onUpdateItemsVisibility()
     if (!mMenu) return;
 
     bool have_selection = getSelectedOutfitID().notNull();
-    mMenu->setItemVisible("sepatator1", have_selection);
-    mMenu->setItemVisible("sepatator2", have_selection);
+    mMenu->setItemVisible("wear_separator", have_selection);
     mMenu->arrangeAndClear(); // update menu height
 }
 
@@ -1181,6 +1208,20 @@ void LLOutfitListGearMenuBase::onAdd()
     }
 }
 
+void LLOutfitListGearMenuBase::onSave()
+{
+    const LLUUID &selected_id = getSelectedOutfitID();
+    LLNotificationsUtil::add("ConfirmOverwriteOutfit", LLSD(), LLSD(),
+        [selected_id](const LLSD &notif, const LLSD &resp)
+    {
+        S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp);
+        if (opt == 0)
+        {
+            LLAppearanceMgr::getInstance()->onOutfitFolderCreated(selected_id, true);
+        }
+    });
+}
+
 void LLOutfitListGearMenuBase::onTakeOff()
 {
     // Take off selected outfit.
@@ -1234,15 +1275,6 @@ bool LLOutfitListGearMenuBase::onVisible(LLSD::String param)
         return false;
     }
 
-    // *TODO This condition leads to menu item behavior inconsistent with
-    // "Wear" button behavior and should be modified or removed.
-    bool is_worn = LLAppearanceMgr::instance().getBaseOutfitUUID() == selected_outfit_id;
-
-    if ("wear" == param)
-    {
-        return !is_worn;
-    }
-
     return true;
 }
 
@@ -1270,8 +1302,7 @@ void LLOutfitListGearMenu::onUpdateItemsVisibility()
     if (!mMenu) return;
     mMenu->setItemVisible("expand", TRUE);
     mMenu->setItemVisible("collapse", TRUE);
-    mMenu->setItemVisible("thumbnail", FALSE); // Never visible?
-    mMenu->setItemVisible("sepatator3", FALSE);
+    mMenu->setItemVisible("thumbnail", getSelectedOutfitID().notNull());
     mMenu->setItemVisible("sort_folders_by_name", FALSE);
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
 }
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index 66b3165169..49f77e945d 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -147,6 +147,9 @@ protected:
 
     static void renameOutfit(const LLUUID& outfit_cat_id);
 
+    void onThumbnail(const LLUUID &outfit_cat_id);
+    void onSave(const LLUUID &outfit_cat_id);
+
 private:
     LLOutfitListBase*	mOutfitList;
 };
@@ -178,6 +181,7 @@ private:
     void onAdd();
     void onTakeOff();
     void onRename();
+    void onSave();
     void onCreate(const LLSD& data);
     bool onEnable(LLSD::String param);
     bool onVisible(LLSD::String param);
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index d82c453e5f..8cf0479b27 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -35,7 +35,7 @@
      layout="topleft"
      name="Folder Wearables Separator" />
     <menu_item_call
-     label="Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="Replace Outfit">
         <menu_item_call.on_click
@@ -43,7 +43,7 @@
          parameter="replaceoutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Add To Current Outfit"
+     label="Add folder items"
      layout="topleft"
      name="Add To Outfit">
         <menu_item_call.on_click
@@ -51,7 +51,7 @@
          parameter="addtooutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Remove From Current Outfit"
+     label="Take off folder items"
      layout="topleft"
      name="Remove From Outfit">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 0ca505dd5d..c93a92b2b7 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -3,7 +3,7 @@
     layout="topleft"
     name="Outfit">
     <menu_item_call
-        label="Wear - Replace Current Outfit"
+        label="Replace current outfit"
         layout="topleft"
         name="wear_replace">
         <on_click
@@ -16,7 +16,7 @@
         parameter="wear_replace" />
     </menu_item_call>
     <menu_item_call
-        label="Wear - Add to Current Outfit"
+        label="Add outfit items"
         layout="topleft"
         name="wear_add">
         <on_click
@@ -29,7 +29,7 @@
         parameter="wear_add" />
     </menu_item_call>
     <menu_item_call
-        label="Take Off - Remove from Current Outfit"
+        label="Take off outfit items"
         layout="topleft"
         name="take_off">
         <on_click
@@ -41,17 +41,60 @@
         function="Outfit.OnVisible"
         parameter="take_off" />
     </menu_item_call>
+    <menu_item_separator/>
     <menu_item_call
-     label="Image..."
-     layout="topleft"
-     name="thumbnail">
+        label="Image..."
+        layout="topleft"
+        name="thumbnail">
+        <on_click
+        function="Outfit.Thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+        label="Edit outfit"
+        layout="topleft"
+        name="edit">
+        <on_click
+        function="Outfit.Edit" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="edit" />
+    </menu_item_call>
+    <menu_item_call
+        label="Rename outfit"
+        layout="topleft"
+        name="rename">
+        <on_click
+        function="Outfit.Rename" />
+        <on_enable
+        function="Outfit.OnEnable"
+        parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+        label="Save to this outfit"
+        layout="topleft"
+        name="save">
+        <on_click
+         function="Outfit.Save" />
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="delete" />
+    </menu_item_separator>
+    <menu_item_call
+        label="Delete outfit"
+        layout="topleft"
+        name="delete">
         <on_click
-         function="Outfit.Thumbnail" />
+        function="Outfit.Delete" />
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="delete" />
     </menu_item_call>
-    <menu_item_separator name="sepatator1" />
+    <menu_item_separator/>
     <menu
         height="175"
-        label="New Clothes"
+        label="New clothes"
         layout="topleft"
         left_delta="0"
         mouse_opaque="false"
@@ -157,7 +200,7 @@
     </menu>
     <menu
         height="85"
-        label="New Body Parts"
+        label="New body parts"
         layout="topleft"
         left_delta="0"
         mouse_opaque="false"
@@ -197,35 +240,4 @@
             parameter="eyes" />
         </menu_item_call>
     </menu>
-    <menu_item_separator name="sepatator2" />
-    <menu_item_call
-        label="Edit Outfit"
-        layout="topleft"
-        name="edit">
-        <on_click
-        function="Outfit.Edit" />
-        <on_visible
-        function="Outfit.OnVisible"
-        parameter="edit" />
-    </menu_item_call>
-    <menu_item_call
-        label="Rename Outfit"
-        layout="topleft"
-        name="rename">
-        <on_click
-        function="Outfit.Rename" />
-        <on_enable
-        function="Outfit.OnEnable"
-        parameter="rename" />
-    </menu_item_call>
-    <menu_item_call
-        label="Delete Outfit"
-        layout="topleft"
-        name="delete">
-        <on_click
-        function="Outfit.Delete" />
-        <on_visible
-        function="Outfit.OnVisible"
-        parameter="delete" />
-    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index e650c10603..b8adafbaaf 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -272,7 +272,7 @@
      layout="topleft"
      name="Folder Wearables Separator" />
     <menu_item_call
-     label="Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="Replace Outfit">
         <menu_item_call.on_click
@@ -280,7 +280,7 @@
          parameter="replaceoutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Add To Current Outfit"
+     label="Add folder items"
      layout="topleft"
      name="Add To Outfit">
         <menu_item_call.on_click
@@ -288,7 +288,7 @@
          parameter="addtooutfit" />
     </menu_item_call>
     <menu_item_call
-     label="Remove From Current Outfit"
+     label="Take off folder items"
      layout="topleft"
      name="Remove From Outfit">
         <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index e216962d12..e7a453766b 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -4,7 +4,7 @@
  visible="false"
  name="Gear Outfit">
     <menu_item_call
-     label="Wear - Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="wear">
         <on_click
@@ -17,7 +17,7 @@
          parameter="wear" />
     </menu_item_call>
     <menu_item_call
-     label="Wear - Add to Current Outfit"
+     label="Add outfit items"
      layout="topleft"
      name="wear_add">
         <on_click
@@ -25,9 +25,11 @@
         <on_enable
          function="Gear.OnEnable"
          parameter="wear_add" />
+        <on_visible
+         function="Gear.OnVisible"/>
     </menu_item_call>
     <menu_item_call
-     label="Take Off - Remove from Current Outfit"
+     label="Take off outfit items"
      layout="topleft"
      name="take_off">
         <on_click
@@ -39,19 +41,88 @@
          function="Gear.OnVisible"
          parameter="take_off" />
     </menu_item_call>
+    <menu_item_separator name="wear_separator" />
     <menu_item_call
      label="Image..."
      layout="topleft"
      name="thumbnail">
+       <on_click
+        function="Gear.Thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+     label="Rename outfit"
+     layout="topleft"
+     name="rename">
+        <on_click
+         function="Gear.Rename" />
+        <on_enable
+         function="Gear.OnEnable"
+         parameter="rename" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+     label="Save to this outfit"
+     layout="topleft"
+     name="save">
+        <on_click
+         function="Gear.Save" />
+        <on_visible
+         function="Gear.OnVisible"/>
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+        function="Gear.OnVisible"
+        parameter="delete" />
+    </menu_item_separator>
+    <menu_item_call
+     label="Delete outfit"
+     layout="topleft"
+     name="delete_outfit">
+        <on_click
+         function="Gear.Delete" />
+        <on_enable
+         function="Gear.OnEnable"
+         parameter="delete" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+         function="Gear.OnVisible"/>
+    </menu_item_separator>
+    <menu_item_check
+     label="Sort folders always by name"
+     layout="topleft"
+     name="sort_folders_by_name">
+        <on_click
+         function="Gear.SortByName" />
+        <on_check
+         function="CheckControl"
+         parameter="OutfitGallerySortByName" />
+    </menu_item_check>
+        <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Gear.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse">
         <on_click
-         function="Gear.Thumbnail" />
+         function="Gear.Collapse" />
     </menu_item_call>
-  <menu_item_separator name="sepatator1" />
+  <menu_item_separator/>
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
             <menu
              height="175"
-             label="New Clothes"
+             label="New clothes"
              layout="topleft"
              left_delta="0"
              mouse_opaque="false"
@@ -165,7 +236,7 @@
             </menu>
             <menu
              height="85"
-             label="New Body Parts"
+             label="New body parts"
              layout="topleft"
              left_delta="0"
              mouse_opaque="false"
@@ -206,57 +277,4 @@
                 </menu_item_call>
             </menu>
             <!-- copied from menu_inventory_add.xml -->
-
-    <menu_item_separator name="sepatator2" />
-    <menu_item_call
-     label="Expand all folders"
-     layout="topleft"
-     name="expand">
-        <on_click
-         function="Gear.Expand" />
-    </menu_item_call>
-    <menu_item_call
-     label="Collapse all folders"
-     layout="topleft"
-     name="collapse">
-        <on_click
-         function="Gear.Collapse" />
-    </menu_item_call>
-    <menu_item_call
-     label="Rename Outfit"
-     layout="topleft"
-     name="rename">
-        <on_click
-         function="Gear.Rename" />
-        <on_enable
-         function="Gear.OnEnable"
-         parameter="rename" />
-        <on_visible
-         function="Gear.OnVisible"
-         parameter="rename" />
-    </menu_item_call>
-    <menu_item_call
-     label="Delete Outfit"
-     layout="topleft"
-     name="delete_outfit">
-        <on_click
-         function="Gear.Delete" />
-        <on_enable
-         function="Gear.OnEnable"
-         parameter="delete" />
-        <on_visible
-         function="Gear.OnVisible"
-         parameter="delete" />
-    </menu_item_call>
-    <menu_item_separator name="sepatator3" />
-    <menu_item_check
-     label="Sort Folders Always by Name"
-     layout="topleft"
-     name="sort_folders_by_name">
-        <on_click
-         function="Gear.SortByName" />
-        <on_check
-         function="CheckControl"
-         parameter="OutfitGallerySortByName" />
-    </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 8c8bb29baf..522e41df42 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -3,7 +3,7 @@
  layout="topleft"
  name="Outfit">
     <menu_item_call
-     label="Wear - Replace Current Outfit"
+     label="Replace current outfit"
      layout="topleft"
      name="wear_replace">
         <on_click
@@ -16,7 +16,7 @@
          parameter="wear_replace" />
     </menu_item_call>
     <menu_item_call
-     label="Wear - Add to Current Outfit"
+     label="Add outfit items"
      layout="topleft"
      name="wear_add">
         <on_click
@@ -29,7 +29,7 @@
          parameter="wear_add" />
     </menu_item_call>
     <menu_item_call
-     label="Take Off - Remove from Current Outfit"
+     label="Take off outfit items"
      layout="topleft"
      name="take_off">
         <on_click
@@ -41,19 +41,26 @@
          function="Outfit.OnVisible"
          parameter="take_off" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_call
-     label="Edit Outfit"
-     layout="topleft"
-     name="edit">
+        label="Image..."
+        layout="topleft"
+        name="thumbnail">
+        <on_click
+        function="Outfit.Thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+        label="Edit outfit"
+        layout="topleft"
+        name="edit">
         <on_click
          function="Outfit.Edit" />
         <on_visible
          function="Outfit.OnVisible"
          parameter="edit" />
     </menu_item_call>
-    <menu_item_separator />
     <menu_item_call
-     label="Rename Outfit"
+     label="Rename outfit"
      layout="topleft"
      name="rename">
         <on_click
@@ -63,7 +70,19 @@
          parameter="rename" />
     </menu_item_call>
     <menu_item_call
-     label="Delete Outfit"
+     label="Save to this outfit"
+     layout="topleft"
+     name="save">
+        <on_click
+         function="Outfit.Save" />
+    </menu_item_call>
+    <menu_item_separator>
+        <on_visible
+        function="Outfit.OnVisible"
+        parameter="delete" />
+    </menu_item_separator>
+    <menu_item_call
+     label="Delete outfit"
      layout="topleft"
      name="delete">
         <on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 204fead7e0..d0c73f0973 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -12098,5 +12098,21 @@ Would you like to save them first?
        notext="No"
        yestext="Yes"/>
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmOverwriteOutfit"
+   type="alertmodal">
+      <unique/>
+This will replace the items in the
+selected outfit with the items you
+are wearing now.
+      <tag>confirm</tag>
+      <usetemplate
+       ignoretext="Confirm before overwriting outfit"
+       name="okcancelignore"
+       notext="Cancel"
+       yestext="Save"/>
+  </notification>
     
 </notifications>
-- 
cgit v1.2.3


From 936b66b8307fee405a43a11b579a0178958111a4 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 23 Oct 2023 14:42:19 -0700
Subject: SL-20517: When attempting to find orphans, if an object claims to be
 its own parent the viewer logs a warning and then continues the loop without
 incrementing the iterator.  This increments the iterator so that loop
 processing can continue and the viewer does not get stuck on the bad object.

---
 indra/newview/llviewerobjectlist.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index c479afaa52..e3658b9368 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -2200,6 +2200,7 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
 			{
 				LL_WARNS() << objectp->mID << " has self as parent, skipping!" 
 					<< LL_ENDL;
+                ++iter;
 				continue;
 			}
 
-- 
cgit v1.2.3


From 29dd53310ad35f297ea10c9a73745298d214a7d5 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 25 Oct 2023 22:15:43 +0300
Subject: SL-20109 Add inventory_thumbnails_helper floater to
 blacklist_untrusted

---
 indra/newview/llviewerfloaterreg.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 08029b5446..b38d468c60 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -244,6 +244,7 @@ public:
                 "group_picker",
                 "hud",
                 "incoming_call",
+                "inventory_thumbnails_helper",
                 "linkreplace",
                 "mem_leaking",
                 "marketplace_validation",
-- 
cgit v1.2.3


From 272da5c01abd84f5e39ac3396e4e10ebe73b40b0 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 26 Oct 2023 02:01:11 +0300
Subject: SL-20401 FIXED Popping out conversation floater second time moves
 location

---
 indra/llui/llfloater.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 2303cd24b7..c67db54ea6 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1772,6 +1772,8 @@ void LLFloater::onClickTearOff(LLFloater* self)
 		{
 			if (self->mSaveRect)
 			{
+                LLRect screen_rect = self->calcScreenRect();
+                self->mPosition = LLCoordGL(screen_rect.getCenterX(), screen_rect.getCenterY()).convert();
 				self->storeRectControl();
 			}
 			self->setMinimized(FALSE); // to reenable minimize button if it was minimized
-- 
cgit v1.2.3


From 0e10127081c97cfb7931ab9c99eb0e07ad42860a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 27 Oct 2023 23:37:33 +0300
Subject: SL-20496 FIXED Auto-adjust causes incorrect UI value of Max number of
 non-impostors

---
 indra/newview/llperfstats.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llperfstats.cpp b/indra/newview/llperfstats.cpp
index 7ff363c3c1..6ee14c1420 100644
--- a/indra/newview/llperfstats.cpp
+++ b/indra/newview/llperfstats.cpp
@@ -64,7 +64,7 @@ namespace LLPerfStats
     {
         assert_main_thread();
         // these following variables are proxies for pipeline statics we do not need a two way update (no llviewercontrol handler)
-        if( tuningFlag & NonImpostors ){ gSavedSettings.setU32("IndirectMaxNonImpostors", nonImpostors); };
+        if( tuningFlag & NonImpostors ){ gSavedSettings.setU32("RenderAvatarMaxNonImpostors", nonImpostors); };
         if( tuningFlag & ReflectionDetail ){ gSavedSettings.setS32("RenderReflectionDetail", reflectionDetail); };
         if( tuningFlag & FarClip ){ gSavedSettings.setF32("RenderFarClip", farClip); };
         if( tuningFlag & UserMinDrawDistance ){ gSavedSettings.setF32("AutoTuneRenderFarClipMin", userMinDrawDistance); };
@@ -388,7 +388,7 @@ namespace LLPerfStats
             auto count = countNearbyAvatars(std::min(LLPipeline::RenderFarClip, tunables.userImpostorDistance));
             if( count != tunables.nonImpostors )
             {
-                tunables.updateNonImposters( (count < LLVOAvatar::NON_IMPOSTORS_MAX_SLIDER)?count : LLVOAvatar::NON_IMPOSTORS_MAX_SLIDER );
+                tunables.updateNonImposters( (count < LLVOAvatar::NON_IMPOSTORS_MAX_SLIDER)?count : 0 );
                 LL_DEBUGS("AutoTune") << "There are " << count << "avatars within " << std::min(LLPipeline::RenderFarClip, tunables.userImpostorDistance) << "m of the camera" << LL_ENDL;
             }
         }
-- 
cgit v1.2.3


From f71662225eadf1589f5331e763e02e0bb1b72137 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 31 Oct 2023 10:50:39 -0400
Subject: SL-20546: Add viewer channel and full version to GitHub release page.

---
 .github/workflows/build.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1cd0c2526f..3a32a03b3f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -360,6 +360,11 @@ jobs:
           # name the release page for the build number so we can find it
           # easily (analogous to looking up a codeticket build page)
           name: "v${{ github.run_id }}"
+          # SL-20546: want the channel and version to be visible on the
+          # release page
+          body: |
+            ${{ needs.build.outputs.viewer_channel }}
+            ${{ needs.build.outputs.viewer_version }}
           prerelease: true
           generate_release_notes: true
           # the only reason we generate a GH release is to post build products
-- 
cgit v1.2.3


From 6fb9a4640bad7bc88a52014ce23f7f8ad4a39c23 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 31 Oct 2023 12:03:03 -0400
Subject: DRTVWR-588: Try to make threadsafequeue timing more robust.

The test was coded to push (what's intended to be) the third entry with
timestamp (now + 200ms), then (what's intended to be) the second entry with
timestamp (now + 100ms).

The trouble is that it was re-querying "now" each time. On a slow CI host, the
clock might have advanced by more than 100ms between the first push and the
second -- meaning that the second push would actually have a _later_
timestamp, and thus, even with the queue sorting properly, fail the test's
order validation.

Capture the timestamp once, then add both time deltas to the same time point
to get the relative order right regardless of elapsed real time.
---
 indra/llcommon/tests/threadsafeschedule_test.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/tests/threadsafeschedule_test.cpp b/indra/llcommon/tests/threadsafeschedule_test.cpp
index c421cc7b1c..8851590189 100644
--- a/indra/llcommon/tests/threadsafeschedule_test.cpp
+++ b/indra/llcommon/tests/threadsafeschedule_test.cpp
@@ -46,11 +46,12 @@ namespace tut
         // the real time required for each push() call. Explicitly increment
         // the timestamp for each one -- but since we're passing explicit
         // timestamps, make the queue reorder them.
-        queue.push(Queue::TimeTuple(Queue::Clock::now() + 200ms, "ghi"));
+        auto now{ Queue::Clock::now() };
+        queue.push(Queue::TimeTuple(now + 200ms, "ghi"));
         // Given the various push() overloads, you have to match the type
         // exactly: conversions are ambiguous.
         queue.push("abc"s);
-        queue.push(Queue::Clock::now() + 100ms, "def");
+        queue.push(now + 100ms, "def");
         queue.close();
         auto entry = queue.pop();
         ensure_equals("failed to pop first", std::get<0>(entry), "abc"s);
-- 
cgit v1.2.3


From 5f1008ab6b5dd59a80123be7580b7a1f1da4c259 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 31 Oct 2023 12:05:07 -0400
Subject: DRTVWR-588: Enlarge default coroutine stack size.

On a Windows CI host, we got the dreaded rc 3221225725 aka c00000fd aka stack
overflow.
---
 indra/llcommon/llcoros.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp
index cfaf3415e7..191c1a9037 100644
--- a/indra/llcommon/llcoros.cpp
+++ b/indra/llcommon/llcoros.cpp
@@ -123,7 +123,7 @@ LLCoros::LLCoros():
     // Previously we used
     // boost::context::guarded_stack_allocator::default_stacksize();
     // empirically this is insufficient.
-    mStackSize(768*1024),
+    mStackSize(900*1024),
     // mCurrent does NOT own the current CoroData instance -- it simply
     // points to it. So initialize it with a no-op deleter.
     mCurrent{ [](CoroData*){} }
-- 
cgit v1.2.3


From afc08372b10d9c07c90d176dc45f8db8244215c9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 31 Oct 2023 23:01:16 +0200
Subject: SL-20537 Add hover-preview for My Outfit list

---
 indra/llui/lltooltip.cpp           | 10 ++++++++--
 indra/newview/llinspecttexture.cpp |  5 ++++-
 indra/newview/lloutfitslist.cpp    | 26 ++++++++++++++++++++++++--
 indra/newview/lloutfitslist.h      | 23 ++++++++++++++++++++++-
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index a6552d4ff1..328d36c6e1 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -440,7 +440,13 @@ void LLToolTipMgr::createToolTip(const LLToolTip::Params& params)
 	tooltip_params.rect = LLRect (0, 1, 1, 0);
 
 	if (tooltip_params.create_callback.isProvided())
-		mToolTip = tooltip_params.create_callback()(tooltip_params);
+    {
+        mToolTip = tooltip_params.create_callback()(tooltip_params);
+        if (mToolTip == NULL) 
+        {
+            return;
+        }
+    }
 	else
 		mToolTip = LLUICtrlFactory::create<LLToolTip> (tooltip_params);
 
@@ -492,7 +498,7 @@ void LLToolTipMgr::show(const LLToolTip::Params& params)
 {
 	if (!params.styled_message.isProvided() 
 		&& (!params.message.isProvided() || params.message().empty())
-		&& !params.image.isProvided()) return;
+		&& !params.image.isProvided() && !params.create_callback.isProvided()) return;
 
 	// fill in default tooltip params from tool_tip.xml
 	LLToolTip::Params params_with_defaults(params);
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index da4e3c0949..76e428b7d0 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -84,7 +84,10 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
                         }
                     }
 				}
-
+                if ((!p.message.isProvided() || p.message().empty())) 
+                {
+                    return NULL;
+                }
 				// No or more than one texture found => show default tooltip
 				return LLUICtrlFactory::create<LLToolTip>(p);
 			}
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index fbb442a992..676444397f 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -37,6 +37,7 @@
 #include "llappearancemgr.h"
 #include "llfloaterreg.h"
 #include "llfloatersidepanelcontainer.h"
+#include "llinspecttexture.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
 #include "llmenubutton.h"
@@ -62,7 +63,7 @@ bool LLOutfitTabNameComparator::compare(const LLAccordionCtrlTab* tab1, const LL
     return (LLStringUtil::compareDict(name1, name2) < 0);
 }
 
-struct outfit_accordion_tab_params : public LLInitParam::Block<outfit_accordion_tab_params, LLAccordionCtrlTab::Params>
+struct outfit_accordion_tab_params : public LLInitParam::Block<outfit_accordion_tab_params, LLOutfitAccordionCtrlTab::Params>
 {
 	Mandatory<LLWearableItemsList::Params> wearable_list;
 
@@ -144,7 +145,8 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
     std::string name = cat->getName();
 
     outfit_accordion_tab_params tab_params(get_accordion_tab_params());
-    LLAccordionCtrlTab* tab = LLUICtrlFactory::create<LLAccordionCtrlTab>(tab_params);
+    tab_params.cat_id = cat_id;
+    LLOutfitAccordionCtrlTab *tab = LLUICtrlFactory::create<LLOutfitAccordionCtrlTab>(tab_params);
     if (!tab) return;
     LLWearableItemsList* wearable_list = LLUICtrlFactory::create<LLWearableItemsList>(tab_params.wearable_list);
     wearable_list->setShape(tab->getLocalRect());
@@ -1307,4 +1309,24 @@ void LLOutfitListGearMenu::onUpdateItemsVisibility()
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
 }
 
+BOOL LLOutfitAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
+{
+    if (y >= getLocalRect().getHeight() - getHeaderHeight()) 
+    {
+        LLSD params;
+        params["inv_type"] = LLInventoryType::IT_CATEGORY;
+        params["thumbnail_id"] = gInventory.getCategory(mFolderID)->getThumbnailUUID();
+        params["item_id"] = mFolderID;
+
+        LLToolTipMgr::instance().show(LLToolTip::Params()
+                                    .message(getToolTip())
+                                    .sticky_rect(calcScreenRect())
+                                    .delay_time(LLView::getTooltipTimeout())
+                                    .create_callback(boost::bind(&LLInspectTextureUtil::createInventoryToolTip, _1))
+                                    .create_params(params));
+        return TRUE;
+    }
+
+    return LLAccordionCtrlTab::handleToolTip(x, y, mask);
+}
 // EOF
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index 49f77e945d..6eeccddb07 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -31,6 +31,7 @@
 #include "llpanel.h"
 
 // newview
+#include "llaccordionctrltab.h"
 #include "llinventorymodel.h"
 #include "lllistcontextmenu.h"
 #include "llpanelappearancetab.h"
@@ -197,7 +198,27 @@ protected:
     /*virtual*/ void onUpdateItemsVisibility();
 };
 
-/**
+class LLOutfitAccordionCtrlTab : public LLAccordionCtrlTab
+{
+public:
+    struct Params : public LLInitParam::Block<Params, LLAccordionCtrlTab::Params>
+    {
+        Optional<LLUUID> cat_id;
+        Params() : cat_id("cat_id") {}
+    };
+
+    virtual BOOL handleToolTip(S32 x, S32 y, MASK mask);
+
+ protected:
+    LLOutfitAccordionCtrlTab(const LLOutfitAccordionCtrlTab::Params &p) 
+        : LLAccordionCtrlTab(p), 
+          mFolderID(p.cat_id)
+    {}
+    friend class LLUICtrlFactory;
+
+    LLUUID mFolderID;
+};
+  /**
  * @class LLOutfitsList
  *
  * A list of agents's outfits from "My Outfits" inventory category
-- 
cgit v1.2.3


From be823ebc0a54313dbfb9021a8c4f546784187bc3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 1 Nov 2023 22:23:55 +0200
Subject: SL-20462 show two decimal digits for Density Exponent

---
 indra/newview/skins/default/xui/en/panel_settings_water.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 1aa42af3a8..45e611022a 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -65,7 +65,7 @@
                 Density Exponent:
             </text>
             <slider
-                    decimal_digits="1"
+                    decimal_digits="2"
                     follows="left|top"
                     height="16"
                     increment="0.01"
-- 
cgit v1.2.3


From 54bfff622d025b29216aca8d134c0f5cad89597d Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 2 Nov 2023 01:23:33 +0200
Subject: DRTVWR-594 Update LLCA to v202311020117.0-0f5d9c3

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 569b9f7c28..5adcc59475 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1468,11 +1468,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e50ea94bbaa4ff41bf53b84b7192df1a694c5337</string>
+              <string>d3c1f7f947a2d8e89a98af816be2492afb42dfbc</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/llca/releases/download/v202310121525.0-d22bd98/llca-202310121530.0-common-d22bd98.tar.zst</string>
+              <string>https://github.com/secondlife/llca/releases/download/v202311020117.0-0f5d9c3/llca-202311012318.0-common-0f5d9c3.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
-- 
cgit v1.2.3


From 0ab4edd019d84aa5683b9cc77c66e81be2fa58a4 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 2 Nov 2023 02:07:38 +0200
Subject: DRTVWR-594 Mac buildfix (remove unused field)

---
 indra/newview/lloutfitgallery.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index d27352eb3b..b18151599f 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -195,16 +195,13 @@ public:
     
     friend class LLOutfitGallery;
     LLOutfitGalleryContextMenu(LLOutfitListBase* outfit_list)
-    : LLOutfitContextMenu(outfit_list),
-    mOutfitList(outfit_list){}
+    : LLOutfitContextMenu(outfit_list){}
 
 protected:
     /* virtual */ LLContextMenu* createMenu();
     bool onEnable(LLSD::String param);
     bool onVisible(LLSD::String param);
     void onCreate(const LLSD& data);
-private:
-    LLOutfitListBase*	mOutfitList;
 };
 
 
-- 
cgit v1.2.3


From d079c11c99c381a3e9aae292e132c67f39d038ff Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 6 Nov 2023 15:28:26 +0200
Subject: SL-20565 Places floater -- allow dragging a folder into a folder
 (#491)

---
 indra/newview/llinventorybridge.cpp      |  2 +-
 indra/newview/llplacesinventorypanel.cpp | 10 ++++++++++
 indra/newview/llplacesinventorypanel.h   |  3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 73005d6903..fddf5179fa 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2796,7 +2796,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
             is_movable = can_move_folder_to_marketplace(master_folder, dest_folder, inv_cat, tooltip_msg, bundle_size);
 		}
 
-		if (is_movable)
+		if (is_movable && !move_is_into_landmarks)
 		{
 			LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
 			is_movable = active_panel != NULL;
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index 1c14acd843..f3455bb4f0 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -120,3 +120,13 @@ S32	LLPlacesInventoryPanel::notify(const LLSD& info)
 	}
 	return 0;
 }
+
+BOOL LLPlacesInventoryPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
+                                                      EAcceptance *accept, std::string &tooltip_msg)
+{
+    if (mAcceptsDragAndDrop) 
+    {
+        return LLInventoryPanel::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg);
+    }
+    return FALSE;
+}
diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h
index 5629438415..467eee91af 100644
--- a/indra/newview/llplacesinventorypanel.h
+++ b/indra/newview/llplacesinventorypanel.h
@@ -53,6 +53,9 @@ public:
 
 	virtual S32	notify(const LLSD& info) ;
 
+    BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
+                            EAcceptance *accept, std::string &tooltip_msg) override;
+
 private:
 	LLSaveFolderState*			mSavedFolderState;
 };
-- 
cgit v1.2.3


From 8262c4201ec2ce2781d917e73597a00c779a7658 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 6 Nov 2023 21:01:03 +0200
Subject: mac build fix

---
 indra/newview/llplacesinventorypanel.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h
index 467eee91af..c6a4cb66b2 100644
--- a/indra/newview/llplacesinventorypanel.h
+++ b/indra/newview/llplacesinventorypanel.h
@@ -47,11 +47,11 @@ public:
 	LLPlacesInventoryPanel(const Params& p);
 	~LLPlacesInventoryPanel();
 
-    LLFolderView * createFolderRoot(LLUUID root_id );
+    LLFolderView * createFolderRoot(LLUUID root_id ) override;
 	void saveFolderState();
 	void restoreFolderState();
 
-	virtual S32	notify(const LLSD& info) ;
+	virtual S32	notify(const LLSD& info) override;
 
     BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
                             EAcceptance *accept, std::string &tooltip_msg) override;
-- 
cgit v1.2.3


From 2e0892e53041f75fc991b77870a4f2f4672fefb1 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 7 Nov 2023 08:55:15 +0100
Subject: SL-20356 Show tooltip for the empty-recent textbox

---
 indra/newview/llfloaterimsessiontab.cpp | 3 ++-
 indra/newview/llfloaterimsessiontab.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index c188bbdce9..04385409ca 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -264,7 +264,8 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mEmojiRecentPanel = getChild<LLLayoutPanel>("emoji_recent_layout_panel");
 	mEmojiRecentPanel->setVisible(false);
 
-	mEmojiRecentEmptyText = getChildView("emoji_recent_empty_text");
+	mEmojiRecentEmptyText = getChild<LLTextBox>("emoji_recent_empty_text");
+	mEmojiRecentEmptyText->setToolTip(mEmojiRecentEmptyText->getText());
 	mEmojiRecentEmptyText->setVisible(false);
 
 	mEmojiRecentIconsCtrl = getChild<LLPanelEmojiComplete>("emoji_recent_icons_ctrl");
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 0ff3d0b38c..1b34b242c7 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -172,7 +172,7 @@ protected:
 	LLLayoutPanel* mToolbarPanel;
 	LLLayoutPanel* mInputButtonPanel;
 	LLLayoutPanel* mEmojiRecentPanel;
-	LLView* mEmojiRecentEmptyText;
+	LLTextBox* mEmojiRecentEmptyText;
 	LLPanelEmojiComplete* mEmojiRecentIconsCtrl;
 	LLParticipantList* getParticipantList();
 	conversations_widgets_map mConversationsWidgets;
-- 
cgit v1.2.3


From e4b9cbcdd3195b9841864463ea6ca8c02105a06d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 6 Nov 2023 23:15:16 +0200
Subject: SL-20566 Allow removal of a teleport history locations

---
 indra/newview/llpanelteleporthistory.cpp                    |  9 ++++++++-
 .../skins/default/xui/en/menu_teleport_history_item.xml     | 13 +++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index b938b30479..3ed444a5af 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -1067,6 +1067,12 @@ void LLTeleportHistoryPanel::onGearMenuAction(const LLSD& userdata)
         LLLandmarkActions::getSLURLfromPosGlobal(globalPos,
             boost::bind(&LLTeleportHistoryPanel::gotSLURLCallback, _1));
     }
+    else if ("remove" == command_name)
+    {
+        LLTeleportHistoryStorage::getInstance()->removeItem(index);
+        LLTeleportHistoryStorage::getInstance()->save();
+        showTeleportHistory();
+    }
 }
 
 bool LLTeleportHistoryPanel::isActionEnabled(const LLSD& userdata) const
@@ -1121,7 +1127,8 @@ bool LLTeleportHistoryPanel::isActionEnabled(const LLSD& userdata) const
     if ("teleport" == command_name
         || "view" == command_name
         || "show_on_map" == command_name
-        || "copy_slurl" == command_name)
+        || "copy_slurl" == command_name
+        || "remove" == command_name)
     {
         if (!mLastSelectedFlatlList)
         {
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
index 153e5a70a9..9bbfdd4291 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
@@ -49,4 +49,17 @@
          function="TeleportHistory.GearMenu.Enable"
          parameter="copy_slurl" />
     </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Remove from history"
+     layout="topleft"
+     name="remove_from_history">
+        <on_click
+         function="TeleportHistory.GearMenu.Action"
+         parameter="remove" />
+        <on_enable
+         function="TeleportHistory.GearMenu.Enable"
+         parameter="remove" />
+    </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 4d4abdd76971d7b4b128d8e7a3cf6eebe0861d79 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 8 Nov 2023 05:41:49 +0200
Subject: SL-20579 Added "--outfile" and "--files" options to the translation
 export script

---
 scripts/code_tools/modified_strings.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/code_tools/modified_strings.py b/scripts/code_tools/modified_strings.py
index e7a9d239dc..20ed1b0555 100644
--- a/scripts/code_tools/modified_strings.py
+++ b/scripts/code_tools/modified_strings.py
@@ -162,6 +162,8 @@ def make_translation_table(mod_tree, base_tree, lang, args):
         filename = mod_blob.path
         if mod_blob.type == "tree": # directory, skip
             continue
+        if args.files and os.path.basename(filename) not in args.files:
+            continue # process only the specified files
 
         if args.verbose:
             print(filename)
@@ -325,9 +327,11 @@ if __name__ == "__main__":
     parser.add_argument("--deleted", action="store_true", default = False, help="show all translated entities which don't exist in english")
     parser.add_argument("--skip_spreadsheet", action="store_true", default = False, help="skip creating the translation spreadsheet")
     parser.add_argument("--rev", help="revision with modified strings, default HEAD", default="HEAD")
-    parser.add_argument("--rev_base", help="previous revision to compare against, default master", default="master")
+    parser.add_argument("--rev_base", help="previous revision to compare against, default main", default="main")
     parser.add_argument("--base_lang", help="base language, default en (normally leave unchanged - other values are only useful for testing)", default="en")
     parser.add_argument("--lang", help="target languages, or 'all_valid' or 'supported'; default is 'supported'", nargs="+", default = ["supported"])
+    parser.add_argument("--files", help='list of files to process', metavar='F', type=str, nargs='*')
+    parser.add_argument("--outfile", help='name of the output file', type=str, nargs='?', default="SL_Translations.xlsx")
     args = parser.parse_args()
 
     cwd = os.getcwd()
@@ -370,7 +374,7 @@ if __name__ == "__main__":
     print("Target language(s) are", ",".join(sorted(langs)))
     sys.stdout.flush()
 
-    outfile = "SL_Translations.xlsx"
+    outfile = args.outfile
     try:
         f = open(outfile,"a+")
         f.close()
-- 
cgit v1.2.3


From 716b9af35d0dbc3ba8048a1bcca2c8c8f703bed0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 7 Nov 2023 23:13:00 +0100
Subject: SL-20356 EmojiPicker - Implement arrow keys navigation

---
 indra/llui/llscrollcontainer.cpp                   |  23 ++-
 indra/llui/llscrollcontainer.h                     |   4 +-
 indra/llui/llscrollingpanellist.h                  |   2 +-
 indra/newview/llfloateremojipicker.cpp             | 194 ++++++++++++++++++++-
 indra/newview/llfloateremojipicker.h               |  13 ++
 indra/newview/llviewerwindow.cpp                   |   1 +
 .../skins/default/xui/en/floater_emoji_picker.xml  |   1 +
 7 files changed, 230 insertions(+), 8 deletions(-)

diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index ad32f7186c..22d27b1f2a 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -70,6 +70,7 @@ LLScrollContainer::Params::Params()
 	bg_color("color"),
 	border_visible("border_visible"),
 	hide_scrollbar("hide_scrollbar"),
+	ignore_arrow_keys("ignore_arrow_keys"),
 	min_auto_scroll_rate("min_auto_scroll_rate", 100),
 	max_auto_scroll_rate("max_auto_scroll_rate", 1000),
 	max_auto_scroll_zone("max_auto_scroll_zone", 16),
@@ -86,6 +87,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
 	mBackgroundColor(p.bg_color()),
 	mIsOpaque(p.is_opaque),
 	mHideScrollbar(p.hide_scrollbar),
+	mIgnoreArrowKeys(p.ignore_arrow_keys),
 	mReserveScrollCorner(p.reserve_scroll_corner),
 	mMinAutoScrollRate(p.min_auto_scroll_rate),
 	mMaxAutoScrollRate(p.max_auto_scroll_rate),
@@ -204,10 +206,29 @@ void LLScrollContainer::reshape(S32 width, S32 height,
 	}
 }
 
+// virtual
 BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask)
 {
+    if (mIgnoreArrowKeys)
+    {
+        switch(key)
+        {
+        case KEY_LEFT:
+        case KEY_RIGHT:
+        case KEY_UP:
+        case KEY_DOWN:
+        case KEY_PAGE_UP:
+        case KEY_PAGE_DOWN:
+        case KEY_HOME:
+        case KEY_END:
+            return FALSE;
+        default:
+            break;
+        }
+    }
+
 	// allow scrolled view to handle keystrokes in case it delegated keyboard focus
-	// to the scroll container.  
+	// to the scroll container.
 	// NOTE: this should not recurse indefinitely as handleKeyHere
 	// should not propagate to parent controls, so mScrolledView should *not*
 	// call LLScrollContainer::handleKeyHere in turn
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index dacea2a987..79dc70cac9 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -63,7 +63,8 @@ public:
 		Optional<bool>		is_opaque,
 							reserve_scroll_corner,
 							border_visible,
-							hide_scrollbar;
+							hide_scrollbar,
+							ignore_arrow_keys;
 		Optional<F32>		min_auto_scroll_rate,
 							max_auto_scroll_rate;
 		Optional<U32>		max_auto_scroll_zone;
@@ -149,6 +150,7 @@ private:
 	F32			mMaxAutoScrollRate;
 	U32			mMaxAutoScrollZone;
 	bool		mHideScrollbar;
+	bool		mIgnoreArrowKeys;
 };
 
 
diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h
index 9dc65dabb5..d625039427 100644
--- a/indra/llui/llscrollingpanellist.h
+++ b/indra/llui/llscrollingpanellist.h
@@ -45,7 +45,7 @@ public:
 
 
 /*
- * A set of panels that are displayed in a vertical sequence inside a scroll container.
+ * A set of panels that are displayed in a sequence inside a scroll container.
  */
 class LLScrollingPanelList : public LLUICtrl
 {
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 10013c907d..45c33728e5 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -399,6 +399,13 @@ void LLFloaterEmojiPicker::moveGroups()
     mBadge->setRect(rect);
 }
 
+void LLFloaterEmojiPicker::showPreview(bool show)
+{
+    mPreview->setEmoji(nullptr);
+    mDummy->setVisible(show ? FALSE : TRUE);
+    mPreview->setVisible(show ? TRUE : FALSE);
+}
+
 void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
 {
     mRecentGridWidth = mEmojiScroll->getRect().getWidth();
@@ -423,6 +430,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
 
     mRecentMaxIcons = maxIcons;
 
+    mFocusedIconRow = 0;
+    mFocusedIconCol = 0;
+    mFocusedIcon = nullptr;
     mHoveredIcon = nullptr;
     mEmojiGrid->clearPanels();
     mPreview->setEmoji(nullptr);
@@ -599,15 +609,17 @@ void LLFloaterEmojiPicker::onFilterChanged()
 
 void LLFloaterEmojiPicker::onGridMouseEnter()
 {
-    mDummy->setVisible(FALSE);
-    mPreview->setEmoji(nullptr);
-    mPreview->setVisible(TRUE);
+    LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
+    if (focus == mEmojiGrid)
+    {
+        exitArrowMode();
+    }
+    showPreview(true);
 }
 
 void LLFloaterEmojiPicker::onGridMouseLeave()
 {
-    mPreview->setVisible(FALSE);
-    mDummy->setVisible(TRUE);
+    showPreview(false);
 }
 
 void LLFloaterEmojiPicker::onGroupButtonMouseEnter(LLUICtrl* ctrl)
@@ -630,6 +642,13 @@ void LLFloaterEmojiPicker::onEmojiMouseEnter(LLUICtrl* ctrl)
 {
     if (ctrl)
     {
+        LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
+        if (focus == mEmojiGrid)
+        {
+            exitArrowMode();
+            showPreview(true);
+        }
+
         if (mHoveredIcon && mHoveredIcon != ctrl)
         {
             unselectGridIcon(mHoveredIcon);
@@ -679,6 +698,113 @@ void LLFloaterEmojiPicker::onEmojiMouseUp(LLUICtrl* ctrl)
     }
 }
 
+bool LLFloaterEmojiPicker::enterArrowMode()
+{
+    S32 rowCount = mEmojiGrid->getPanelList().size();
+    if (rowCount)
+    {
+        mFocusedIconRow = -1;
+        mFocusedIconCol = 0;
+        if (moveFocusedIconDown())
+        {
+            showPreview(true);
+            mEmojiScroll->goToTop();
+            mEmojiGrid->setFocus(TRUE);
+            return true;
+        }
+    }
+    return false;
+}
+
+void LLFloaterEmojiPicker::exitArrowMode()
+{
+    if (mFocusedIcon)
+    {
+        unselectGridIcon(mFocusedIcon);
+        mFocusedIcon = nullptr;
+    }
+
+    showPreview(false);
+    mEmojiScroll->goToTop();
+    mFocusedIconRow = mFocusedIconCol = 0;
+    mFilter->setFocus(TRUE);
+}
+
+void LLFloaterEmojiPicker::selectFocusedIcon()
+{
+    if (mHoveredIcon)
+    {
+        unselectGridIcon(mHoveredIcon);
+    }
+
+    if (mFocusedIcon)
+    {
+        unselectGridIcon(mFocusedIcon);
+    }
+
+    // Both mFocusedIconRow and mFocusedIconCol should be already verified
+    LLEmojiGridRow* row = (LLEmojiGridRow*)mEmojiGrid->getPanelList()[mFocusedIconRow];
+    mFocusedIcon = row->mList->getPanelList()[mFocusedIconCol];
+    selectGridIcon(mFocusedIcon);
+}
+
+bool LLFloaterEmojiPicker::moveFocusedIconUp()
+{
+    for (S32 i = mFocusedIconRow - 1; i >= 0; --i)
+    {
+        LLScrollingPanel* panel = mEmojiGrid->getPanelList()[i];
+        LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
+        if (row && row->mList->getPanelList().size() > mFocusedIconCol)
+        {
+            mEmojiScroll->scrollToShowRect(row->getBoundingRect());
+            mFocusedIconRow = i;
+            selectFocusedIcon();
+            return true;
+        }
+    }
+    return false;
+}
+
+bool LLFloaterEmojiPicker::moveFocusedIconDown()
+{
+    S32 rowCount = mEmojiGrid->getPanelList().size();
+    for (S32 i = mFocusedIconRow + 1; i < rowCount; ++i)
+    {
+        LLScrollingPanel* panel = mEmojiGrid->getPanelList()[i];
+        LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
+        if (row && row->mList->getPanelList().size() > mFocusedIconCol)
+        {
+            mEmojiScroll->scrollToShowRect(row->getBoundingRect());
+            mFocusedIconRow = i;
+            selectFocusedIcon();
+            return true;
+        }
+    }
+    return false;
+}
+
+bool LLFloaterEmojiPicker::moveFocusedIconLeft()
+{
+    if (mFocusedIconCol <= 0)
+        return false;
+
+    mFocusedIconCol--;
+    selectFocusedIcon();
+    return true;
+}
+
+bool LLFloaterEmojiPicker::moveFocusedIconRight()
+{
+    LLEmojiGridRow* row = (LLEmojiGridRow*)mEmojiGrid->getPanelList()[mFocusedIconRow];
+    S32 colCount = row->mList->getPanelList().size();
+    if (mFocusedIconCol >= colCount - 1)
+        return false;
+
+    mFocusedIconCol++;
+    selectFocusedIcon();
+    return true;
+}
+
 void LLFloaterEmojiPicker::selectGridIcon(LLUICtrl* ctrl)
 {
     if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
@@ -697,6 +823,64 @@ void LLFloaterEmojiPicker::unselectGridIcon(LLUICtrl* ctrl)
     }
 }
 
+// virtual
+BOOL LLFloaterEmojiPicker::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+{
+    if (mask == MASK_NONE)
+    {
+        LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
+        if (focus == mEmojiGrid)
+        {
+            if (key == KEY_RETURN)
+            {
+                if (mFocusedIcon)
+                {
+                    onEmojiMouseDown(mFocusedIcon);
+                    onEmojiMouseUp(mFocusedIcon);
+                    closeFloater();
+                    return TRUE;
+                }
+            }
+            else if (key == KEY_TAB)
+            {
+                exitArrowMode();
+                return TRUE;
+            }
+            else if (key == KEY_UP)
+            {
+                if (!moveFocusedIconUp())
+                    exitArrowMode();
+                return TRUE;
+            }
+            else if (key == KEY_DOWN)
+            {
+                if (moveFocusedIconDown())
+                    return TRUE;
+            }
+            else if (key == KEY_LEFT)
+            {
+                if (moveFocusedIconLeft())
+                    return TRUE;
+            }
+            else if (key == KEY_RIGHT)
+            {
+                if (moveFocusedIconRight())
+                    return TRUE;
+            }
+        }
+        else // if (focus != mEmojiGrid)
+        {
+            if (key == KEY_DOWN)
+            {
+                if (enterArrowMode())
+                    return TRUE;
+            }
+        }
+    }
+
+    return super::handleKey(key, mask, called_from_parent);
+}
+
 // virtual
 BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
 {
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index b8e3190bf3..48f66d7950 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -63,6 +63,7 @@ public:
 private:
     void fillGroups();
     void moveGroups();
+    void showPreview(bool show);
     void fillEmojis(bool fromResize = false);
 
     void onGroupButtonClick(LLUICtrl* ctrl);
@@ -76,9 +77,18 @@ private:
     void onEmojiMouseDown(LLUICtrl* ctrl);
     void onEmojiMouseUp(LLUICtrl* ctrl);
 
+    bool enterArrowMode();
+    void exitArrowMode();
+    void selectFocusedIcon();
+    bool moveFocusedIconUp();
+    bool moveFocusedIconDown();
+    bool moveFocusedIconLeft();
+    bool moveFocusedIconRight();
+
     void selectGridIcon(LLUICtrl* ctrl);
     void unselectGridIcon(LLUICtrl* ctrl);
 
+    virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
     virtual BOOL handleKeyHere(KEY key, MASK mask) override;
 
     class LLPanel* mGroups { nullptr };
@@ -97,6 +107,9 @@ private:
     S32 mRecentBadgeWidth { 0 };
     S32 mRecentGridWidth { 0 };
     S32 mRecentMaxIcons { 0 };
+    S32 mFocusedIconRow { 0 };
+    S32 mFocusedIconCol { 0 };
+    LLUICtrl* mFocusedIcon { nullptr };
     LLUICtrl* mHoveredIcon { nullptr };
 };
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 39b4075596..ad177cdb85 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3054,6 +3054,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 					case KEY_PAGE_UP:
 					case KEY_PAGE_DOWN:
 					case KEY_HOME:
+					case KEY_END:
 						// when chatbar is empty or ArrowKeysAlwaysMove set,
 						// pass arrow keys on to avatar...
 						return FALSE;
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index e15c304851..a89d97d8e9 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -25,6 +25,7 @@
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
+      ignore_arrow_keys="true"
       top="50"
       left="0"
       height="300"
-- 
cgit v1.2.3


From bee1a78f5a2e6c455dfe7cb940ee26df77e51cff Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 8 Nov 2023 11:56:13 +0100
Subject: SL-20415 Activating an already active category button should move
 focus to search field

---
 indra/newview/llfloateremojipicker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 45c33728e5..df973a15b5 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -577,6 +577,8 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
 {
     if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
     {
+        mFilter->setFocus(TRUE);
+
         if (button == mGroupButtons[sSelectedGroupIndex] || button->getToggleState())
             return;
 
@@ -595,8 +597,6 @@ void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
         rect.mRight = button->getRect().mRight;
         mBadge->setRect(rect);
 
-        mFilter->setFocus(TRUE);
-
         fillEmojis();
     }
 }
-- 
cgit v1.2.3


From 93e4d069d1a9d003664f23f842cf100f635607ed Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 8 Nov 2023 17:53:16 +0100
Subject: SL-20518 EmojiPicker - The 'More' button is overlapped the recently
 used emojis row after narrowing back the 'Conversations' floater

---
 indra/newview/llfloaterimsessiontab.cpp | 12 ++++++------
 indra/newview/llpanelemojicomplete.cpp  | 13 +++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 04385409ca..5804d8701b 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -495,11 +495,11 @@ void LLFloaterIMSessionTab::initEmojiRecentPanel(bool moveFocus)
     std::list<llwchar>& recentlyUsed = LLFloaterEmojiPicker::getRecentlyUsed();
     if (recentlyUsed.empty())
     {
-        mEmojiRecentEmptyText->setVisible(true);
-        mEmojiRecentIconsCtrl->setVisible(false);
+        mEmojiRecentEmptyText->setVisible(TRUE);
+        mEmojiRecentIconsCtrl->setVisible(FALSE);
         if (moveFocus)
         {
-            mEmojiPickerToggleBtn->setFocus(true);
+            mEmojiPickerToggleBtn->setFocus(TRUE);
         }
     }
     else
@@ -510,11 +510,11 @@ void LLFloaterIMSessionTab::initEmojiRecentPanel(bool moveFocus)
             emojis += emoji;
         }
         mEmojiRecentIconsCtrl->setEmojis(emojis);
-        mEmojiRecentEmptyText->setVisible(false);
-        mEmojiRecentIconsCtrl->setVisible(true);
+        mEmojiRecentEmptyText->setVisible(FALSE);
+        mEmojiRecentIconsCtrl->setVisible(TRUE);
         if (moveFocus)
         {
-            mEmojiRecentIconsCtrl->setFocus(true);
+            mEmojiRecentIconsCtrl->setFocus(TRUE);
         }
     }
 }
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 29e1a29ed3..9bfe04fc31 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -285,7 +285,14 @@ void LLPanelEmojiComplete::onCommit()
 void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
     LLUICtrl::reshape(width, height, called_from_parent);
-    updateConstraints();
+    if (mAutoSize)
+    {
+        updateConstraints();
+    }
+    else
+    {
+        onEmojisChanged();
+    }
 }
 
 void LLPanelEmojiComplete::setEmojis(const LLWString& emojis)
@@ -373,7 +380,9 @@ void LLPanelEmojiComplete::onEmojisChanged()
     }
     else
     {
-        mVisibleEmojis = mVertical ? getRect().getHeight() / mEmojiHeight : getRect().getWidth() / mEmojiWidth;
+        mVisibleEmojis = mVertical ?
+            mEmojiHeight ? getRect().getHeight() / mEmojiHeight : 0 :
+            mEmojiWidth ? getRect().getWidth() / mEmojiWidth : 0;
     }
 
     updateConstraints();
-- 
cgit v1.2.3


From 1e7643eea5883db5b773db99b37440eb06b63e3e Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 9 Nov 2023 17:51:32 +0100
Subject: SL-20438 Emoji picker will dock with edge of screen if the
 Conversations floater is dragged there

---
 indra/llui/llfloater.cpp               | 96 +++++++++++++++++++++++++---------
 indra/llui/llfloater.h                 |  7 +--
 indra/llui/llview.cpp                  | 41 +++++++++------
 indra/llui/llview.h                    |  1 +
 indra/newview/llfloateremojipicker.cpp |  6 +--
 5 files changed, 103 insertions(+), 48 deletions(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 98895d56dd..23d3a66631 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -829,6 +829,24 @@ void LLFloater::reshape(S32 width, S32 height, BOOL called_from_parent)
 	LLPanel::reshape(width, height, called_from_parent);
 }
 
+// virtual
+void LLFloater::translate(S32 x, S32 y)
+{
+    LLView::translate(x, y);
+
+    if (!mTranslateWithDependents || mDependents.empty())
+        return;
+
+    for (const LLHandle<LLFloater>& handle : mDependents)
+    {
+        LLFloater* floater = handle.get();
+        if (floater && floater->getSnapTarget() == getHandle())
+        {
+            floater->LLView::translate(x, y);
+        }
+    }
+}
+
 void LLFloater::releaseFocus()
 {
 	LLUI::getInstance()->removePopup(this);
@@ -1117,9 +1135,9 @@ BOOL LLFloater::canSnapTo(const LLView* other_view)
 
 	if (other_view != getParent())
 	{
-		const LLFloater* other_floaterp = dynamic_cast<const LLFloater*>(other_view);		
-		if (other_floaterp 
-			&& other_floaterp->getSnapTarget() == getHandle() 
+		const LLFloater* other_floaterp = dynamic_cast<const LLFloater*>(other_view);
+		if (other_floaterp
+			&& other_floaterp->getSnapTarget() == getHandle()
 			&& mDependents.find(other_floaterp->getHandle()) != mDependents.end())
 		{
 			// this is a dependent that is already snapped to us, so don't snap back to it
@@ -1552,6 +1570,44 @@ void LLFloater::removeDependentFloater(LLFloater* floaterp)
 	floaterp->mDependeeHandle = LLHandle<LLFloater>();
 }
 
+void LLFloater::fitWithDependentsOnScreen(const LLRect& left, const LLRect& bottom, const LLRect& right, const LLRect& constraint, S32 min_overlap_pixels)
+{
+    LLRect total_rect = getRect();
+
+    for (const LLHandle<LLFloater>& handle : mDependents)
+    {
+        LLFloater* floater = handle.get();
+        if (floater && floater->getSnapTarget() == getHandle())
+        {
+            total_rect.unionWith(floater->getRect());
+        }
+    }
+
+	S32 delta_left = left.notEmpty() ? left.mRight - total_rect.mRight : 0;
+	S32 delta_bottom = bottom.notEmpty() ? bottom.mTop - total_rect.mTop : 0;
+	S32 delta_right = right.notEmpty() ? right.mLeft - total_rect.mLeft : 0;
+
+	// move floater with dependings fully onscreen
+    mTranslateWithDependents = true;
+    if (translateRectIntoRect(total_rect, constraint, min_overlap_pixels))
+    {
+        clearSnapTarget();
+    }
+    else if (delta_left > 0 && total_rect.mTop < left.mTop && total_rect.mBottom > left.mBottom)
+    {
+        translate(delta_left, 0);
+    }
+    else if (delta_bottom > 0 && total_rect.mLeft > bottom.mLeft && total_rect.mRight < bottom.mRight)
+    {
+        translate(0, delta_bottom);
+    }
+    else if (delta_right < 0 && total_rect.mTop < right.mTop    && total_rect.mBottom > right.mBottom)
+    {
+        translate(delta_right, 0);
+    }
+    mTranslateWithDependents = false;
+}
+
 BOOL LLFloater::offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButton index)
 {
 	if( mButtonsEnabled[index] )
@@ -2862,10 +2918,17 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out
 		// floater is hosted elsewhere, so ignore
 		return;
 	}
+
+	if (floater->getDependee() &&
+		floater->getDependee() == floater->getSnapTarget().get())
+	{
+		// floater depends on other and snaps to it, so ignore
+		return;
+	}
+
 	LLRect::tCoordType screen_width = getSnapRect().getWidth();
 	LLRect::tCoordType screen_height = getSnapRect().getHeight();
 
-	
 	// only automatically resize non-minimized, resizable floaters
 	if( floater->isResizable() && !floater->isMinimized() )
 	{
@@ -2907,29 +2970,10 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out
 		}
 	}
 
-	const LLRect& floater_rect = floater->getRect();
-
-	S32 delta_left = mToolbarLeftRect.notEmpty() ? mToolbarLeftRect.mRight - floater_rect.mRight : 0;
-	S32 delta_bottom = mToolbarBottomRect.notEmpty() ? mToolbarBottomRect.mTop - floater_rect.mTop : 0;
-	S32 delta_right = mToolbarRightRect.notEmpty() ? mToolbarRightRect.mLeft - floater_rect.mLeft : 0;
+    const LLRect& constraint = snap_in_toolbars ? getSnapRect() : gFloaterView->getRect();
+    S32 min_overlap_pixels = allow_partial_outside ? FLOATER_MIN_VISIBLE_PIXELS : S32_MAX;
 
-	// move window fully onscreen
-	if (floater->translateIntoRect( snap_in_toolbars ? getSnapRect() : gFloaterView->getRect(), allow_partial_outside ? FLOATER_MIN_VISIBLE_PIXELS : S32_MAX ))
-	{
-		floater->clearSnapTarget();
-	}
-	else if (delta_left > 0 && floater_rect.mTop < mToolbarLeftRect.mTop && floater_rect.mBottom > mToolbarLeftRect.mBottom)
-	{
-		floater->translate(delta_left, 0);
-	}
-	else if (delta_bottom > 0 && floater_rect.mLeft > mToolbarBottomRect.mLeft && floater_rect.mRight < mToolbarBottomRect.mRight)
-	{
-		floater->translate(0, delta_bottom);
-	}
-	else if (delta_right < 0 && floater_rect.mTop < mToolbarRightRect.mTop	&& floater_rect.mBottom > mToolbarRightRect.mBottom)
-	{
-		floater->translate(delta_right, 0);
-	}
+	floater->fitWithDependentsOnScreen(mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect, constraint, min_overlap_pixels);
 }
 
 void LLFloaterView::draw()
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 3699629ef8..08fc5f425f 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -113,8 +113,6 @@ struct LLCoordFloater : LLCoord<LL_COORD_FLOATER>
 	bool operator!=(const LLCoordFloater& other) const { return !(*this == other); }
 
 	void setFloater(LLFloater& floater);
-
-	
 };
 
 class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
@@ -237,6 +235,7 @@ public:
 	virtual void	closeHostedFloater();
 
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+	/*virtual*/ void translate(S32 x, S32 y);
 	
 	// Release keyboard and mouse focus
 	void			releaseFocus();
@@ -258,7 +257,8 @@ public:
 	void			addDependentFloater(LLFloater* dependent, BOOL reposition = TRUE, BOOL resize = FALSE);
 	void			addDependentFloater(LLHandle<LLFloater> dependent_handle, BOOL reposition = TRUE, BOOL resize = FALSE);
 	LLFloater*		getDependee() { return (LLFloater*)mDependeeHandle.get(); }
-	void		removeDependentFloater(LLFloater* dependent);
+	void			removeDependentFloater(LLFloater* dependent);
+	void			fitWithDependentsOnScreen(const LLRect& left, const LLRect& bottom, const LLRect& right, const LLRect& constraint, S32 min_overlap_pixels);
 	BOOL			isMinimized() const				{ return mMinimized; }
 	/// isShown() differs from getVisible() in that isShown() also considers
 	/// isMinimized(). isShown() is true only if visible and not minimized.
@@ -506,6 +506,7 @@ private:
 	typedef std::set<LLHandle<LLFloater> > handle_set_t;
 	typedef std::set<LLHandle<LLFloater> >::iterator handle_set_iter_t;
 	handle_set_t	mDependents;
+	bool			mTranslateWithDependents { false };
 
 	bool			mButtonsEnabled[BUTTON_COUNT];
 	F32				mButtonScale;
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index d8d605871f..0046105870 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1753,23 +1753,26 @@ LLCoordGL getNeededTranslation(const LLRect& input, const LLRect& constraint, S3
 	const S32 KEEP_ONSCREEN_PIXELS_WIDTH = llmin(min_overlap_pixels, input.getWidth());
 	const S32 KEEP_ONSCREEN_PIXELS_HEIGHT = llmin(min_overlap_pixels, input.getHeight());
 
-	if( input.mRight - KEEP_ONSCREEN_PIXELS_WIDTH < constraint.mLeft )
+	if (KEEP_ONSCREEN_PIXELS_WIDTH <= constraint.getWidth() &&
+		KEEP_ONSCREEN_PIXELS_HEIGHT <= constraint.getHeight())
 	{
-		delta.mX = constraint.mLeft - (input.mRight - KEEP_ONSCREEN_PIXELS_WIDTH);
-	}
-	else if( input.mLeft + KEEP_ONSCREEN_PIXELS_WIDTH > constraint.mRight )
-	{
-		delta.mX = constraint.mRight - (input.mLeft + KEEP_ONSCREEN_PIXELS_WIDTH);
-	}
+		if (input.mRight - KEEP_ONSCREEN_PIXELS_WIDTH < constraint.mLeft)
+		{
+			delta.mX = constraint.mLeft - (input.mRight - KEEP_ONSCREEN_PIXELS_WIDTH);
+		}
+		else if (input.mLeft + KEEP_ONSCREEN_PIXELS_WIDTH > constraint.mRight)
+		{
+			delta.mX = constraint.mRight - (input.mLeft + KEEP_ONSCREEN_PIXELS_WIDTH);
+		}
 
-	if( input.mTop > constraint.mTop )
-	{
-		delta.mY = constraint.mTop - input.mTop;
-	}
-	else
-	if( input.mTop - KEEP_ONSCREEN_PIXELS_HEIGHT < constraint.mBottom )
-	{
-		delta.mY = constraint.mBottom - (input.mTop - KEEP_ONSCREEN_PIXELS_HEIGHT);
+		if (input.mTop > constraint.mTop)
+		{
+			delta.mY = constraint.mTop - input.mTop;
+		}
+		else if (input.mTop - KEEP_ONSCREEN_PIXELS_HEIGHT < constraint.mBottom)
+		{
+			delta.mY = constraint.mBottom - (input.mTop - KEEP_ONSCREEN_PIXELS_HEIGHT);
+		}
 	}
 
 	return delta;
@@ -1780,13 +1783,19 @@ LLCoordGL getNeededTranslation(const LLRect& input, const LLRect& constraint, S3
 // (Why top and left?  That's where the drag bars are for floaters.)
 BOOL LLView::translateIntoRect(const LLRect& constraint, S32 min_overlap_pixels)
 {
-	LLCoordGL translation = getNeededTranslation(getRect(), constraint, min_overlap_pixels);
+    return translateRectIntoRect(getRect(), constraint, min_overlap_pixels);
+}
+
+BOOL LLView::translateRectIntoRect(const LLRect& rect, const LLRect& constraint, S32 min_overlap_pixels)
+{
+	LLCoordGL translation = getNeededTranslation(rect, constraint, min_overlap_pixels);
 
 	if (translation.mX != 0 || translation.mY != 0)
 	{
 		translate(translation.mX, translation.mY);
 		return TRUE;
 	}
+
 	return FALSE;
 }
 
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 3d52d3048f..b498451dce 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -369,6 +369,7 @@ public:
 	virtual void	translate( S32 x, S32 y );
 	void			setOrigin( S32 x, S32 y )	{ mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); }
 	BOOL			translateIntoRect( const LLRect& constraint, S32 min_overlap_pixels = S32_MAX);
+	BOOL			translateRectIntoRect( const LLRect& rect, const LLRect& constraint, S32 min_overlap_pixels = S32_MAX);
 	BOOL			translateIntoRectWithExclusion( const LLRect& inside, const LLRect& exclude, S32 min_overlap_pixels = S32_MAX);
 	void			centerWithin(const LLRect& bounds);
 
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index df973a15b5..a9bc0fd6bb 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -279,7 +279,7 @@ void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t
 }
 
 LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
-: LLFloater(key)
+: super(key)
 {
     loadState();
 }
@@ -894,14 +894,14 @@ BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
         }
     }
 
-    return LLFloater::handleKeyHere(key, mask);
+    return super::handleKeyHere(key, mask);
 }
 
 // virtual
 void LLFloaterEmojiPicker::closeFloater(bool app_quitting)
 {
     saveState();
-    LLFloater::closeFloater(app_quitting);
+    super::closeFloater(app_quitting);
     if (mFloaterCloseCallback)
     {
         mFloaterCloseCallback();
-- 
cgit v1.2.3


From dd694f0add587b8117c824a2bb4d6dc525c27304 Mon Sep 17 00:00:00 2001
From: Salad Dais <SaladDais@users.noreply.github.com>
Date: Thu, 9 Nov 2023 15:41:08 +0000
Subject: Fix BUG-225288: Detaching stops unrelated animations

This is to do with misunderstandings related to how .find()
works with multimaps. .find() will, in fact, return an iterator
to the first iterator it finds, and will iterate through all
elements in the multimap when incremented, not just items with
the same key.

Change code working with animation sources to be aware of this
fact, so unrelated animation sources do not have their animations
stopped.
---
 indra/newview/llviewermessage.cpp | 6 ++++++
 indra/newview/llvoavatarself.cpp  | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f3288a5300..7b91e4806f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4152,6 +4152,12 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 					LLVOAvatar::AnimSourceIterator anim_it = avatarp->mAnimationSources.find(object_id);
 					for (;anim_it != avatarp->mAnimationSources.end(); ++anim_it)
 					{
+						if (anim_it->first != object_id)
+						{
+							// elements with the same key are always contiguous, bail if we went past the
+							// end of this object's animations
+							break;
+						}
 						if (anim_it->second == animation_id)
 						{
 							anim_found = TRUE;
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 8fc1dcd81f..ea9bd248b1 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -834,7 +834,11 @@ void LLVOAvatarSelf::stopMotionFromSource(const LLUUID& source_id)
 	for (AnimSourceIterator motion_it = mAnimationSources.find(source_id); motion_it != mAnimationSources.end(); )
 	{
 		gAgent.sendAnimationRequest(motion_it->second, ANIM_REQUEST_STOP);
-		mAnimationSources.erase(motion_it++);
+		mAnimationSources.erase(motion_it);
+		// Must find() after each erase() to deal with potential iterator invalidation
+		// This also ensures that we don't go past the end of this source's animations
+		// into those of another source.
+		motion_it = mAnimationSources.find(source_id);
 	}
 
 
-- 
cgit v1.2.3


From e1fc7679f251a5cead135cbe78fcdfdfc749a3e2 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 9 Nov 2023 23:21:18 +0200
Subject: DRTVWR-594 Update contributions.txt

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3de668c1f0..46dbe54cf2 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -841,6 +841,7 @@ Kadah Coba
 Jondan Lundquist
 Joosten Briebers
     MAINT-7074
+    BUG-225288
 Josef Munster
 Josette Windlow
 Juilan Tripsa
-- 
cgit v1.2.3


From 88b15ff62c5225f48d60d5d49dafbd32417856c7 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 10 Nov 2023 01:15:27 +0100
Subject: SL-20521 Focus does not move to the Nearby Chat field

---
 indra/newview/llfloaterimsessiontab.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 5804d8701b..fcfd47b365 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -454,14 +454,15 @@ void LLFloaterIMSessionTab::onInputEditorClicked()
 
 void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self)
 {
-    bool restore_focus = (gFocusMgr.getLastKeyboardFocus() == self->mInputEditor);
+    bool show = !self->mEmojiRecentPanel->getVisible();
+    bool restore_focus = !show || (gFocusMgr.getLastKeyboardFocus() == self->mInputEditor);
 
-	BOOL show = !self->mEmojiRecentPanel->getVisible();
-	if (show)
-	{
+    if (show)
+    {
         self->initEmojiRecentPanel(!restore_focus);
-	}
-	self->mEmojiRecentPanel->setVisible(show);
+    }
+
+    self->mEmojiRecentPanel->setVisible(show ? TRUE : FALSE);
 
     if (restore_focus)
     {
-- 
cgit v1.2.3


From 1ef524986f598038c5ebdd38ea17d2f5a56c0626 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 10 Nov 2023 02:58:01 +0100
Subject: SL-20416 Choose emoji floater puts emoji in the chat window that
 opened it

---
 indra/newview/llfloaterimsessiontab.cpp | 32 +++++++++++++++++++++++---------
 indra/newview/llfloaterimsessiontab.h   |  6 +++---
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index fcfd47b365..0cb3d9ab47 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -273,7 +273,7 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mEmojiRecentIconsCtrl->setVisible(false);
 
 	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
-	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(this); });
+	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
 
 	mGearBtn = getChild<LLButton>("gear_btn");
 	mAddBtn = getChild<LLButton>("add_btn");
@@ -470,18 +470,18 @@ void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessio
     }
 }
 
-void LLFloaterIMSessionTab::onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab* self)
+void LLFloaterIMSessionTab::onEmojiPickerToggleBtnClicked()
 {
 	if (LLFloaterEmojiPicker* picker = LLFloaterEmojiPicker::getInstance())
 	{
 		if (!picker->isShown())
 		{
 			picker->show(
-				[self](llwchar emoji) { self->onEmojiPicked(emoji); },
-				[self]() { self->onEmojiPickerClosed(); });
-			if (LLFloater* root_floater = gFloaterView->getParentFloater(self))
+				[](llwchar emoji) { onEmojiPicked(emoji); },
+				[]() { onEmojiPickerClosed(); });
+			if (LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance())
 			{
-				root_floater->addDependentFloater(picker, TRUE, TRUE);
+				im_box->addDependentFloater(picker, TRUE, TRUE);
 			}
 		}
 		else
@@ -534,15 +534,29 @@ void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
 	}
 }
 
+// static
 void LLFloaterIMSessionTab::onEmojiPicked(llwchar emoji)
 {
-	mInputEditor->insertEmoji(emoji);
-	mInputEditor->setFocus(TRUE);
+    if (LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance())
+    {
+        if (LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(im_box->getSelectedSession()))
+        {
+            session_floater->mInputEditor->insertEmoji(emoji);
+            session_floater->mInputEditor->setFocus(TRUE);
+        }
+    }
 }
 
+// static
 void LLFloaterIMSessionTab::onEmojiPickerClosed()
 {
-	mInputEditor->setFocus(TRUE);
+    if (LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance())
+    {
+        if (LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(im_box->getSelectedSession()))
+        {
+            session_floater->mInputEditor->setFocus(TRUE);
+        }
+    }
 }
 
 void LLFloaterIMSessionTab::closeFloater(bool app_quitting)
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 1b34b242c7..ddffed57a3 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -216,11 +216,11 @@ private:
 	void onInputEditorClicked();
 
 	static void onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self);
-	static void onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab* self);
+	static void onEmojiPickerToggleBtnClicked();
 	void initEmojiRecentPanel(bool moveFocus);
 	void onRecentEmojiPicked(const LLSD& value);
-	void onEmojiPicked(llwchar emoji);
-	void onEmojiPickerClosed();
+	static void onEmojiPicked(llwchar emoji);
+	static void onEmojiPickerClosed();
 
 	bool checkIfTornOff();
 	bool mIsHostAttached;
-- 
cgit v1.2.3


From 9e99bb04a32f2ecc0f0b99686ce5a7adb356596d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 14 Nov 2023 04:09:56 -0500
Subject: SL-20546: Append generated release notes body to our explicit body.

For a tag build that generates a release page, try to deduce the git branch to
which the tag we're building corresponds and add that to release notes.
---
 .github/workflows/build.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3a32a03b3f..895fb00506 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,6 +24,7 @@ jobs:
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
       viewer_version: ${{ steps.build.outputs.viewer_version }}
+      viewer_branch:  ${{ steps.build.outputs.viewer_branch }}
       imagename: ${{ steps.build.outputs.imagename }}
     env:
       AUTOBUILD_ADDRSIZE: 64
@@ -176,9 +177,17 @@ jobs:
           if [[ "$GITHUB_REF_TYPE" == "tag" && "${GITHUB_REF_NAME:0:12}" == "Second_Life_" ]]
           then viewer_channel="${GITHUB_REF_NAME%#*}"
                export viewer_channel="${viewer_channel//_/ }"
+               # Since GITHUB_REF_NAME is a tag rather than a branch, we need
+               # to discover to what branch this tag corresponds. Get the tip
+               # commit (for the tag) and then ask for branches containing it.
+               # Assume GitHub cloned only this tag and its containing branch.
+               viewer_branch="$(git branch --contains "$(git log -n 1 --format=%h)" |
+                                grep -v '(HEAD')"
           else export viewer_channel="Second Life Test"
+               viewer_branch="${GITHUB_REF_NAME}"
           fi
           echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
+          echo "viewer_branch=$viewer_branch" >> "$GITHUB_OUTPUT"
 
           # On windows we need to point the build to the correct python
           # as neither CMake's FindPython nor our custom Python.cmake module
@@ -365,8 +374,10 @@ jobs:
           body: |
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
+            ${{ needs.build.outputs.viewer_branch }}
           prerelease: true
           generate_release_notes: true
+          append_body: true
           # the only reason we generate a GH release is to post build products
           fail_on_unmatched_files: true
           files: "assets/*"
-- 
cgit v1.2.3


From 59eeaed1187e7592fd83380045916f2d8b9d58e7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 14 Nov 2023 14:20:51 -0500
Subject: SL-20546: Try harder to infer the branch corresponding to build tag.

---
 .github/workflows/build.yaml      |  8 ++--
 .github/workflows/which_branch.py | 77 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/which_branch.py

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 895fb00506..abf14b015e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -178,11 +178,9 @@ jobs:
           then viewer_channel="${GITHUB_REF_NAME%#*}"
                export viewer_channel="${viewer_channel//_/ }"
                # Since GITHUB_REF_NAME is a tag rather than a branch, we need
-               # to discover to what branch this tag corresponds. Get the tip
-               # commit (for the tag) and then ask for branches containing it.
-               # Assume GitHub cloned only this tag and its containing branch.
-               viewer_branch="$(git branch --contains "$(git log -n 1 --format=%h)" |
-                                grep -v '(HEAD')"
+               # to discover to what branch this tag corresponds.
+               viewer_branch="$(python3 .github/workflows/which_branch.py \
+                                --token "${{ github.token }}" ${{ github.workflow_sha }})"
           else export viewer_channel="Second Life Test"
                viewer_branch="${GITHUB_REF_NAME}"
           fi
diff --git a/.github/workflows/which_branch.py b/.github/workflows/which_branch.py
new file mode 100644
index 0000000000..802ea44b5a
--- /dev/null
+++ b/.github/workflows/which_branch.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+"""\
+@file   which_branch.py
+@author Nat Goodspeed
+@date   2023-11-14
+@brief  Discover which git branch(es) correspond to a given commit hash.
+
+$LicenseInfo:firstyear=2023&license=viewerlgpl$
+Copyright (c) 2023, Linden Research, Inc.
+$/LicenseInfo$
+"""
+
+import github
+import re
+import sys
+import subprocess
+
+class Error(Exception):
+    pass
+
+def branches_for(token, commit, repo=None):
+    """
+    Use the GitHub REST API to discover which branch(es) correspond to the
+    passed commit hash. The commit string can actually be any of the ways git
+    permits to identify a commit:
+
+    https://git-scm.com/docs/gitrevisions#_specifying_revisions
+
+    branches_for() generates a (possibly empty) sequence of all the branches
+    of the specified repo for which the specified commit is the tip.
+
+    If repo is omitted or None, assume the current directory is a local clone
+    whose 'origin' remote is the GitHub repository of interest.
+    """
+    if not repo:
+        url = subprocess.check_output(['git', 'remote', 'get-url', 'origin'],
+                                      text=True)
+        parts = re.split(r'[:/]', url.rstrip())
+        repo = '/'.join(parts[-2:]).removesuffix('.git')
+
+    gh = github.MainClass.Github(token)
+    grepo = gh.get_repo(repo)
+    for branch in grepo.get_branches():
+        try:
+            delta = grepo.compare(base=commit, head=branch.name)
+        except github.GithubException:
+            continue
+
+        if delta.ahead_by == 0 and delta.behind_by == 0:
+            yield branch
+
+def main(*raw_args):
+    from argparse import ArgumentParser
+    parser = ArgumentParser(description=
+"%(prog)s reports the branch(es) for which the specified commit hash is the tip.",
+                            epilog="""\
+When GitHub Actions launches a tag build, it checks out the specific changeset
+identified by the tag, and so 'git branch' reports detached HEAD. But we use
+tag builds to build a GitHub 'release' of the tip of a particular branch, and
+it's useful to be able to identify which branch that is.
+""")
+    parser.add_argument('-t', '--token', required=True,
+                        help="""GitHub REST API access token""")
+    parser.add_argument('-r', '--repo',
+                        help="""GitHub repository name, in the form OWNER/REPOSITORY""")
+    parser.add_argument('commit',
+                        help="""commit hash at the tip of the sought branch""")
+
+    args = parser.parse_args(raw_args)
+    for branch in branches_for(token=args.token, commit=args.commit, repo=args.repo):
+        print(branch.name)
+
+if __name__ == "__main__":
+    try:
+        sys.exit(main(*sys.argv[1:]))
+    except Error as err:
+        sys.exit(str(err))
-- 
cgit v1.2.3


From 6654ad14eed674e894d2903e0f2ea37c4e806c0f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 14 Nov 2023 14:30:44 -0500
Subject: SL-20546: Add PyGithub to installed Python packages.

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index abf14b015e..ebcabe40c2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -81,7 +81,7 @@ jobs:
           path: .master-message-template
 
       - name: Install autobuild and python dependencies
-        run: pip3 install autobuild llsd
+        run: pip3 install autobuild PyGithub llsd
 
       - name: Cache autobuild packages
         uses: actions/cache@v3
-- 
cgit v1.2.3


From d255c3dda852731b6709ac4e9c9821b3be84ec86 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 14 Nov 2023 20:29:51 -0500
Subject: DRTVWR-588: Try to fix sporadic llrand test failures.

With GitHub viewer builds, every few weeks we've seen test failures when
ll_frand() returns exactly 1.0. This is a problem for a function that's
supposed to return [0.0 .. 1.0).

Monty suggests that the problem is likely to be conversion of F32 to F64 to
pass to fmod(), and then truncation of fmod()'s F64 result back to F32. Moved
the clamping code to each size-specific ll_internal_random specialization.

Monty also noted that a stateful static random number engine isn't
thread-safe. Added a mutex lock.
---
 indra/llcommon/llrand.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp
index 33afc50cf7..20e25177f0 100644
--- a/indra/llcommon/llrand.cpp
+++ b/indra/llcommon/llrand.cpp
@@ -28,6 +28,7 @@
 
 #include "llrand.h"
 #include "lluuid.h"
+#include "mutex.h"
 
 /**
  * Through analysis, we have decided that we want to take values which
@@ -58,8 +59,17 @@
  * to restore uniform distribution.
  */
 
+static std::mutex gRandomGeneratorMutex;
 static LLRandLagFib2281 gRandomGenerator(LLUUID::getRandomSeed());
 
+inline F64 ll_internal_random_unclamped()
+{
+	// gRandomGenerator is a stateful static object, which is therefore not
+	// inherently thread-safe. Lock it before use.
+	std::unique_lock lk(gRandomGeneratorMutex);
+	return gRandomGenerator();
+}
+
 // no default implementation, only specific F64 and F32 specializations
 template <typename REAL>
 inline REAL ll_internal_random();
@@ -71,7 +81,7 @@ inline F64 ll_internal_random<F64>()
 	// CPUs (or at least multi-threaded processes) seem to
 	// occasionally give an obviously incorrect random number -- like
 	// 5^15 or something. Sooooo, clamp it as described above.
-	F64 rv = gRandomGenerator();
+	F64 rv{ ll_internal_random_unclamped() };
 	if(!((rv >= 0.0) && (rv < 1.0))) return fmod(rv, 1.0);
 	return rv;
 }
@@ -79,7 +89,13 @@ inline F64 ll_internal_random<F64>()
 template <>
 inline F32 ll_internal_random<F32>()
 {
-    return F32(ll_internal_random<F64>());
+	// *HACK: clamp the result as described above.
+	// Per Monty, it's important to clamp using the correct fmodf() rather
+	// than expanding to F64 for fmod() and then truncating back to F32. Prior
+	// to this change, we were getting sporadic ll_frand() == 1.0 results.
+	F32 rv{ ll_internal_random_unclamped() };
+	if(!((rv >= 0.0) && (rv < 1.0))) return fmodf(rv, 1.0f);
+	return rv;
 }
 
 /*------------------------------ F64 aliases -------------------------------*/
-- 
cgit v1.2.3


From 819604d2cee6d4527cc436bebfacddf8642635ff Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Nov 2023 09:44:38 -0500
Subject: SL-20546: Make dependency on build job explicit, not indirect.

The release job has been dependent on sign-and-package-windows and
sign-and-package-mac, each of which depends on build. But that indirect
dependency doesn't convey access to ${{ needs.build.outputs.xxx }}. Add the
build job to direct dependencies so release can access its outputs.
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ebcabe40c2..0f590ad3a2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -331,7 +331,7 @@ jobs:
           version: ${{ needs.build.outputs.viewer_version }}
 
   release:
-    needs: [sign-and-package-windows, sign-and-package-mac]
+    needs: [build, sign-and-package-windows, sign-and-package-mac]
     runs-on: ubuntu-latest
     if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life_')
     steps:
-- 
cgit v1.2.3


From 6a206b1a61a983e626fd29a6f04d55eb2fe616c0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Nov 2023 09:45:10 -0500
Subject: SL-20546: Allow running build.sh even without GITHUB_OUTPUT set.

Default it to /dev/null, so output to $GITHUB_OUTPUT is permitted but
discarded.
---
 build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 22f9e0c78a..32e6fd8ca4 100755
--- a/build.sh
+++ b/build.sh
@@ -112,7 +112,8 @@ installer_CYGWIN()
   fi
 }
 
-[[ -n "$GITHUB_OUTPUT" ]] || fatal "Need to export GITHUB_OUTPUT"
+# if someone wants to run build.sh outside the GitHub environment
+[[ -n "$GITHUB_OUTPUT" ]] || export GITHUB_OUTPUT='/dev/null'
 # The following is based on the Warning for GitHub multiline output strings:
 # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
 EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-- 
cgit v1.2.3


From 96deda3f63ca12be734fb02e5f9406744bff3629 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Nov 2023 09:52:06 -0500
Subject: SL-20546: build-variables viewer branch no longer exists.

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0f590ad3a2..bfe1e1adb1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,7 +71,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: secondlife/build-variables
-          ref: viewer
+          ref: master
           path: .build-variables
 
       - name: Checkout master-message-template
-- 
cgit v1.2.3


From 7670f190827b7d1e1c2a424ec6aa3379cb42ed52 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Nov 2023 10:11:30 -0500
Subject: SL-20546: Rely on CTAD for 'narrow' class.

Now that we're building with C++17, we can use Class Template Argument
Deduction to infer the type passed to the constructor of the 'narrow' class.
We no longer require a narrow_holder class with a narrow() factory function.
---
 indra/llcommon/stdtypes.h | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h
index 0b43d7ad4b..3aba9dda00 100644
--- a/indra/llcommon/stdtypes.h
+++ b/indra/llcommon/stdtypes.h
@@ -156,18 +156,15 @@ typedef int intptr_t;
  * type.
  */
 // narrow_holder is a struct that accepts the passed value as its original
-// type and provides templated conversion functions to other types. Once we're
-// building with compilers that support Class Template Argument Deduction, we
-// can rename this class template 'narrow' and eliminate the narrow() factory
-// function below.
+// type and provides templated conversion functions to other types.
 template <typename FROM>
-class narrow_holder
+class narrow
 {
 private:
     FROM mValue;
 
 public:
-    narrow_holder(FROM value): mValue(value) {}
+    narrow(FROM value): mValue(value) {}
 
     /*---------------------- Narrowing unsigned to signed ----------------------*/
     template <typename TO,
@@ -207,13 +204,4 @@ public:
     }
 };
 
-/// narrow() factory function returns a narrow_holder<FROM>(), which can be
-/// implicitly converted to the target type.
-template <typename FROM>
-inline
-narrow_holder<FROM> narrow(FROM value)
-{
-    return { value };
-}
-
 #endif
-- 
cgit v1.2.3


From d427d5dbfa09f0bdec743e75a41e8ea0ee4abeea Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Nov 2023 10:12:12 -0500
Subject: SL-20546: Use narrow() explicit conversion from F64 to F32.

---
 indra/llcommon/llrand.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp
index 20e25177f0..702d6b34c9 100644
--- a/indra/llcommon/llrand.cpp
+++ b/indra/llcommon/llrand.cpp
@@ -93,7 +93,7 @@ inline F32 ll_internal_random<F32>()
 	// Per Monty, it's important to clamp using the correct fmodf() rather
 	// than expanding to F64 for fmod() and then truncating back to F32. Prior
 	// to this change, we were getting sporadic ll_frand() == 1.0 results.
-	F32 rv{ ll_internal_random_unclamped() };
+	F32 rv{ narrow(ll_internal_random_unclamped()) };
 	if(!((rv >= 0.0) && (rv < 1.0))) return fmodf(rv, 1.0f);
 	return rv;
 }
-- 
cgit v1.2.3


From 1c71a8e78e37d8605e009d623a5281ab4b509350 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Nov 2023 11:10:42 -0500
Subject: SL-20546: Even with C++17 CTAD, makeClassicCallback() still useful.

---
 indra/llcommon/classic_callback.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/classic_callback.h b/indra/llcommon/classic_callback.h
index 1ad6dbc58f..009c25d67c 100644
--- a/indra/llcommon/classic_callback.h
+++ b/indra/llcommon/classic_callback.h
@@ -119,11 +119,11 @@ public:
      * ClassicCallback must not itself be copied or moved! Once you've passed
      * get_userdata() to some API, this object MUST remain at that address.
      */
-    // However, we can't yet count on C++17 Class Template Argument Deduction,
-    // which means makeClassicCallback() is still useful, which means we MUST
-    // be able to return one to construct into caller's instance (move ctor).
-    // Possible defense: bool 'referenced' data member set by get_userdata(),
-    // with an llassert_always(! referenced) check in the move constructor.
+    // However, makeClassicCallback() is useful for deducing the CALLABLE
+    // type, which means we MUST be able to return one to construct into
+    // caller's instance (move ctor). Possible defense: bool 'referenced' data
+    // member set by get_userdata(), with an llassert_always(! referenced)
+    // check in the move constructor.
     ClassicCallback(ClassicCallback const&) = delete;
     ClassicCallback(ClassicCallback&&) = default; // delete;
     ClassicCallback& operator=(ClassicCallback const&) = delete;
-- 
cgit v1.2.3


From 6abeb9983e0f8a937c84f67a17a6dcc4d6484698 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 17 Nov 2023 02:20:28 +0200
Subject: SL-20607 Version folder was not created when copying folders to
 marketplace

---
 indra/newview/llinventoryfunctions.cpp   | 25 +++++++++++++--
 indra/newview/llmarketplacefunctions.cpp | 52 +++-----------------------------
 2 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 4aeacae6ed..6662f14b12 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -462,6 +462,13 @@ void copy_inventory_category(LLInventoryModel* model,
 	gInventory.createNewCategory(parent_id, LLFolderType::FT_NONE, cat->getName(), func, cat->getThumbnailUUID());
 }
 
+void copy_cb(const LLUUID& dest_folder, const LLUUID& root_id)
+{
+    // Decrement the count in root_id since that one item won't be copied over
+    LLMarketplaceData::instance().decrementValidationWaiting(root_id);
+    update_folder_cb(dest_folder);
+};
+
 void copy_inventory_category_content(const LLUUID& new_cat_uuid, LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& root_copy_id, bool move_no_copy_items)
 {
 	model->notifyObservers();
@@ -480,12 +487,21 @@ void copy_inventory_category_content(const LLUUID& new_cat_uuid, LLInventoryMode
 		LLMarketplaceData::instance().setValidationWaiting(root_id, count_descendants_items(cat->getUUID()));
 	}
 
+    LLPointer<LLInventoryCallback> cb;
+    if (root_copy_id.isNull())
+    {
+        cb = new LLBoostFuncInventoryCallback(boost::bind(copy_cb, new_cat_uuid, root_id));
+    }
+    else
+    {
+        cb = new LLBoostFuncInventoryCallback(boost::bind(update_folder_cb, new_cat_uuid));
+    }
+
 	// Copy all the items
 	LLInventoryModel::item_array_t item_array_copy = *item_array;
 	for (LLInventoryModel::item_array_t::iterator iter = item_array_copy.begin(); iter != item_array_copy.end(); iter++)
 	{
 		LLInventoryItem* item = *iter;
-		LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(update_folder_cb, new_cat_uuid));
 
 		if (item->getIsLinkType())
 		{
@@ -500,8 +516,11 @@ void copy_inventory_category_content(const LLUUID& new_cat_uuid, LLInventoryMode
 				LLViewerInventoryItem * viewer_inv_item = (LLViewerInventoryItem *)item;
 				gInventory.changeItemParent(viewer_inv_item, new_cat_uuid, true);
 			}
-			// Decrement the count in root_id since that one item won't be copied over
-			LLMarketplaceData::instance().decrementValidationWaiting(root_id);
+            if (root_copy_id.isNull())
+            {
+                // Decrement the count in root_id since that one item won't be copied over
+                LLMarketplaceData::instance().decrementValidationWaiting(root_id);
+            }
 		}
 		else
 		{
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 8784f403cb..d27ee941a6 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -611,27 +611,17 @@ private:
     static void onIdleProcessQueue(void *userdata);
 
     // doesn't hold just marketplace related ids
-    static std::set<LLUUID> sAddQueue;
     static std::set<LLUUID> sStructureQueue;
     static bool sProcessingQueue;
 };
 
-std::set<LLUUID> LLMarketplaceInventoryObserver::sAddQueue;
 std::set<LLUUID> LLMarketplaceInventoryObserver::sStructureQueue;
 bool LLMarketplaceInventoryObserver::sProcessingQueue = false;
 
 void LLMarketplaceInventoryObserver::changed(U32 mask)
 {
-	if (mask & LLInventoryObserver::ADD && LLMarketplaceData::instance().hasValidationWaiting())
-	{
-        // When things are added to the marketplace, we might need to re-validate and fix the containing listings
-        // just add whole list even if it contains items and non-marketplace folders
-        const std::set<LLUUID>& changed_items = gInventory.getChangedIDs();
-        sAddQueue.insert(changed_items.begin(), changed_items.end());
-	}
-    
-	if (mask & (LLInventoryObserver::INTERNAL | LLInventoryObserver::STRUCTURE))
-	{
+    if (mask & (LLInventoryObserver::INTERNAL | LLInventoryObserver::STRUCTURE))
+    {
         // When things are changed in the inventory, this can trigger a host of changes in the marketplace listings folder:
         // * stock counts changing : no copy items coming in and out will change the stock count on folders
         // * version and listing folders : moving those might invalidate the marketplace data itself
@@ -641,7 +631,7 @@ void LLMarketplaceInventoryObserver::changed(U32 mask)
         sStructureQueue.insert(changed_items.begin(), changed_items.end());
 	}
 
-    if (!sProcessingQueue && (!sAddQueue.empty() || !sStructureQueue.empty()))
+    if (!sProcessingQueue && !sStructureQueue.empty())
     {
         gIdleCallbacks.addFunction(onIdleProcessQueue, NULL);
         // can do without sProcessingQueue, but it's usufull for simplicity and reliability
@@ -655,40 +645,6 @@ void LLMarketplaceInventoryObserver::onIdleProcessQueue(void *userdata)
     const U64 MAX_PROCESSING_TIME = 1000;
     U64 stop_time = start_time + MAX_PROCESSING_TIME;
 
-    if (!sAddQueue.empty())
-    {
-        // Make a copy of sAddQueue since decrementValidationWaiting
-        // can theoretically add more items
-        std::set<LLUUID> add_queue(sAddQueue);
-        sAddQueue.clear();
-
-        std::set<LLUUID>::const_iterator id_it = add_queue.begin();
-        std::set<LLUUID>::const_iterator id_end = add_queue.end();
-        // First, count the number of items in this list...
-        S32 count = 0;
-        for (; id_it != id_end; ++id_it)
-        {
-            LLInventoryObject* obj = gInventory.getObject(*id_it);
-            if (obj && (LLAssetType::AT_CATEGORY != obj->getType()))
-            {
-                count++;
-            }
-        }
-        // Then, decrement the folders of that amount
-        // Note that of all of those, only one folder will be a listing folder (if at all).
-        // The other will be ignored by the decrement method.
-        id_it = add_queue.begin();
-        for (; id_it != id_end; ++id_it)
-        {
-            LLInventoryObject* obj = gInventory.getObject(*id_it);
-            if (obj && (LLAssetType::AT_CATEGORY == obj->getType()))
-            {
-                // can trigger notifyObservers
-                LLMarketplaceData::instance().decrementValidationWaiting(obj->getUUID(), count);
-            }
-        }
-    }
-
     while (!sStructureQueue.empty() && LLTimer::getTotalTime() < stop_time)
     {
         std::set<LLUUID>::const_iterator id_it = sStructureQueue.begin();
@@ -722,7 +678,7 @@ void LLMarketplaceInventoryObserver::onIdleProcessQueue(void *userdata)
         sStructureQueue.erase(id_it);
     }
 
-    if (LLApp::isExiting() || (sAddQueue.empty() && sStructureQueue.empty()))
+    if (LLApp::isExiting() || sStructureQueue.empty())
     {
         // Nothing to do anymore
         gIdleCallbacks.deleteFunction(onIdleProcessQueue, NULL);
-- 
cgit v1.2.3


From e7ae20c96fccdad06e39a3f8e5fe61a812029242 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 17 Nov 2023 10:24:14 -0500
Subject: SL-20546: Avoid promoting F32 to double just to compare bounds.

---
 indra/llcommon/llrand.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp
index 702d6b34c9..8206bf8e0c 100644
--- a/indra/llcommon/llrand.cpp
+++ b/indra/llcommon/llrand.cpp
@@ -94,7 +94,7 @@ inline F32 ll_internal_random<F32>()
 	// than expanding to F64 for fmod() and then truncating back to F32. Prior
 	// to this change, we were getting sporadic ll_frand() == 1.0 results.
 	F32 rv{ narrow(ll_internal_random_unclamped()) };
-	if(!((rv >= 0.0) && (rv < 1.0))) return fmodf(rv, 1.0f);
+	if(!((rv >= 0.0f) && (rv < 1.0f))) return fmodf(rv, 1.0f);
 	return rv;
 }
 
-- 
cgit v1.2.3


From 5fa7f69101a889009194eeddb927599d7536613f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 17 Nov 2023 14:31:21 -0500
Subject: SL-20546: Defend llrand's random generator against concurrent access

by making it thread_local.
---
 indra/llcommon/llrand.cpp   | 18 +++++-------------
 indra/llcommon/llthread.cpp | 13 +++++++------
 indra/llcommon/llthread.h   |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp
index 8206bf8e0c..e4065e23bf 100644
--- a/indra/llcommon/llrand.cpp
+++ b/indra/llcommon/llrand.cpp
@@ -28,7 +28,6 @@
 
 #include "llrand.h"
 #include "lluuid.h"
-#include "mutex.h"
 
 /**
  * Through analysis, we have decided that we want to take values which
@@ -59,16 +58,9 @@
  * to restore uniform distribution.
  */
 
-static std::mutex gRandomGeneratorMutex;
-static LLRandLagFib2281 gRandomGenerator(LLUUID::getRandomSeed());
-
-inline F64 ll_internal_random_unclamped()
-{
-	// gRandomGenerator is a stateful static object, which is therefore not
-	// inherently thread-safe. Lock it before use.
-	std::unique_lock lk(gRandomGeneratorMutex);
-	return gRandomGenerator();
-}
+// gRandomGenerator is a stateful static object, which is therefore not
+// inherently thread-safe.
+static thread_local LLRandLagFib2281 gRandomGenerator(LLUUID::getRandomSeed());
 
 // no default implementation, only specific F64 and F32 specializations
 template <typename REAL>
@@ -81,7 +73,7 @@ inline F64 ll_internal_random<F64>()
 	// CPUs (or at least multi-threaded processes) seem to
 	// occasionally give an obviously incorrect random number -- like
 	// 5^15 or something. Sooooo, clamp it as described above.
-	F64 rv{ ll_internal_random_unclamped() };
+	F64 rv{ gRandomGenerator() };
 	if(!((rv >= 0.0) && (rv < 1.0))) return fmod(rv, 1.0);
 	return rv;
 }
@@ -93,7 +85,7 @@ inline F32 ll_internal_random<F32>()
 	// Per Monty, it's important to clamp using the correct fmodf() rather
 	// than expanding to F64 for fmod() and then truncating back to F32. Prior
 	// to this change, we were getting sporadic ll_frand() == 1.0 results.
-	F32 rv{ narrow(ll_internal_random_unclamped()) };
+	F32 rv{ narrow(gRandomGenerator()) };
 	if(!((rv >= 0.0f) && (rv < 1.0f))) return fmodf(rv, 1.0f);
 	return rv;
 }
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index a807acc56e..a051c7f575 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -112,15 +112,16 @@ LL_COMMON_API bool on_main_thread()
     return (LLThread::currentID() == main_thread());
 }
 
-LL_COMMON_API void assert_main_thread()
+LL_COMMON_API bool assert_main_thread()
 {
     auto curr = LLThread::currentID();
     auto main = main_thread();
-    if (curr != main)
-    {
-        LL_WARNS() << "Illegal execution from thread id " << curr
-            << " outside main thread " << main << LL_ENDL;
-    }
+    if (curr == main)
+        return true;
+
+    LL_WARNS() << "Illegal execution from thread id " << curr
+               << " outside main thread " << main << LL_ENDL;
+    return false;
 }
 
 // this function has become moot
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 50202631e7..9f1c589fcd 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -152,7 +152,7 @@ public:
 
 //============================================================================
 
-extern LL_COMMON_API void assert_main_thread();
+extern LL_COMMON_API bool assert_main_thread();
 extern LL_COMMON_API bool on_main_thread();
 
 #endif // LL_LLTHREAD_H
-- 
cgit v1.2.3


From 9bd1ef1cf82d7fcbbcd8d942cc355d47b1fbe47f Mon Sep 17 00:00:00 2001
From: Miezhiko <Miezhiko@gmail.com>
Date: Tue, 31 Oct 2023 10:58:09 +0400
Subject: llmemory: use getrusage for getCurrentRSS on linux

---
 indra/llcommon/llmemory.cpp | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index d6ae1284d3..aa6519ea44 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -37,6 +37,7 @@
 # include <mach/mach_init.h>
 #elif LL_LINUX
 # include <unistd.h>
+# include <sys/resource.h>
 #endif
 
 #include "llmemory.h"
@@ -228,33 +229,16 @@ U64 LLMemory::getCurrentRSS()
 
 U64 LLMemory::getCurrentRSS()
 {
-	static const char statPath[] = "/proc/self/stat";
-	LLFILE *fp = LLFile::fopen(statPath, "r");
-	U64 rss = 0;
+	struct rusage usage;
 
-	if (fp == NULL)
-	{
-		LL_WARNS() << "couldn't open " << statPath << LL_ENDL;
+	if (getrusage(RUSAGE_SELF, &usage) != 0) {
+		// Error handling code could be here
 		return 0;
 	}
 
-	// Eee-yew!	 See Documentation/filesystems/proc.txt in your
-	// nearest friendly kernel tree for details.
-	
-	{
-		int ret = fscanf(fp, "%*d (%*[^)]) %*c %*d %*d %*d %*d %*d %*d %*d "
-						 "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %Lu",
-						 &rss);
-		if (ret != 1)
-		{
-			LL_WARNS() << "couldn't parse contents of " << statPath << LL_ENDL;
-			rss = 0;
-		}
-	}
-	
-	fclose(fp);
-
-	return rss;
+	// ru_maxrss (since Linux 2.6.32)
+	// This is the maximum resident set size used (in kilobytes).
+	return usage.ru_maxrss * 1024;
 }
 
 #else
-- 
cgit v1.2.3


From 649bfb52479bf0e72985cdb8752ed93fa5bb0b1e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 18 Nov 2023 01:53:26 +0200
Subject: SL-20550 Infinite loop test crashes intantly on MacOS.

---
 indra/newview/llappviewer.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 8f47aa8863..7ca4926f87 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5430,9 +5430,18 @@ void LLAppViewer::forceErrorBadMemoryAccess()
 void LLAppViewer::forceErrorInfiniteLoop()
 {
    	LL_WARNS() << "Forcing a deliberate infinite loop" << LL_ENDL;
+    // Loop is intentionally complicated to fool basic loop detection
+    LLTimer timer_total;
+    LLTimer timer_expiry;
+    const S32 report_frequency = 10;
+    timer_expiry.setTimerExpirySec(report_frequency);
     while(true)
     {
-        ;
+        if (timer_expiry.hasExpired())
+        {
+            LL_INFOS() << "Infinite loop time : " << timer_total.getElapsedSeconds() << LL_ENDL;
+            timer_expiry.setTimerExpirySec(report_frequency);
+        }
     }
     return;
 }
-- 
cgit v1.2.3


From bfcc7a92b3c5f62c79879b8234c7055a3a83d9a5 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 20 Nov 2023 20:38:41 +0200
Subject: SL-20564 reset camera when teleporting Home, so avatar points to the
 expected direction

---
 indra/newview/llagent.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 77fe601c1e..ac89acfdf8 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4344,6 +4344,10 @@ void LLAgent::teleportRequest(
 // Landmark ID = LLUUID::null means teleport home
 void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
 {
+    if (landmark_asset_id.isNull())
+    {
+        gAgentCamera.resetView();
+    }
 	mTeleportRequest = LLTeleportRequestPtr(new LLTeleportRequestViaLandmark(landmark_asset_id));
 	startTeleportRequest();
 }
-- 
cgit v1.2.3


From 426cf29278632149f8a30bd24c8866c49273df54 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 21 Nov 2023 15:34:26 -0500
Subject: DRTVWR-594: Update dictionaries, glh_linear, havok-source

per recent PRs. Actually the havok-source update is for a new havok-llvm build.
---
 autobuild.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5adcc59475..bb689c462e 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -408,11 +408,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>f6835c4d7745cd1cadfbce47b40331d08affb532</string>
+              <string>e03eb77224290c875ff84f75b7fe3d0e7c162c94</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-dictionaries/releases/download/v1.0.1-dev2.gf887629-f887629/dictionaries-common-None.tar.zst</string>
+              <string>https://github.com/secondlife/3p-dictionaries/releases/download/v1-a01bb6c/dictionaries-1.a01bb6c-common-a01bb6c.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
@@ -425,7 +425,7 @@
         <key>copyright</key>
         <string>Copyright 2014 Apache OpenOffice software</string>
         <key>version</key>
-        <string>None</string>
+        <string>1.a01bb6c</string>
         <key>name</key>
         <string>dictionaries</string>
         <key>description</key>
@@ -734,11 +734,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6604c1cca515d287e697997a8d5593d1cae172a9</string>
+              <string>066625e7aa7f697a4b6cd461aad960c57181011f</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev2.g3253ed7-3253ed7/glh_linear-common-None.tar.zst</string>
+              <string>https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev4-984c397/glh_linear-1.0.1-dev4-common-984c397.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
@@ -751,7 +751,7 @@
         <key>copyright</key>
         <string>Copyright (c) 2000 Cass Everitt</string>
         <key>version</key>
-        <string>None</string>
+        <string>1.0.1-dev4</string>
         <key>name</key>
         <string>glh_linear</string>
         <key>description</key>
@@ -882,11 +882,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>a193ff65d6db48626d65d96c6124c6efca85e8ec</string>
+              <string>505379a49dfd189b70025b8406a1a6044b4b7989</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912596</string>
+              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136763374</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -910,11 +910,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>ebfb82b6143874e7938b9d1e8a70d0a2e28aa818</string>
+              <string>c4df2599a6ad63c9c883f5b7026ab07086d5c3a2</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599</string>
+              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136763378</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From 8e3253dc1ac058dcce038ebc204a3367fe2b6ddc Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 21 Nov 2023 16:36:13 -0500
Subject: DRTVWR-594: Update kdu per recent PR

---
 autobuild.xml | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index bb689c462e..0870ddb8f0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1120,11 +1120,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>bcc7e2c34896fc9cbc41828dee8a4ddf54f10453</string>
+              <string>ad72fa1d103df777906f0d98f3e882b9916aeada</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298968</string>
+              <string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774118</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1136,11 +1136,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>9de772df2ed12e9c742df6c90670c7cbbb9c93a6</string>
+              <string>e46e4ac93a237b5c4a14183766f76ba5d58935a2</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298969</string>
+              <string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774125</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -1152,15 +1152,31 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>92533ff0f8c1881ad85e75800f9072c413ccf7b7</string>
+              <string>bb37557f78c72b26580a521f8b8dabfa1b34e6e6</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298970</string>
+              <string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774126</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>creds</key>
+              <string>github</string>
+              <key>hash</key>
+              <string>711b82f9f588d3a125af7dcd8c81f93d9c343a7d</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774121</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
         </map>
         <key>license</key>
         <string>Kakadu</string>
-- 
cgit v1.2.3


From fe30ed1b49ae74ba2fa1ad8c81db21d3ece26030 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 21 Nov 2023 17:02:52 -0500
Subject: DRTVWR-594: Update havok-source with havok-libs per recent PR.

---
 autobuild.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 0870ddb8f0..cf896e1af4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -882,11 +882,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>505379a49dfd189b70025b8406a1a6044b4b7989</string>
+              <string>ae2c2a215b1bc2e3f37a67e301926dc405902d1a</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136763374</string>
+              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778143</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -910,11 +910,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>c4df2599a6ad63c9c883f5b7026ab07086d5c3a2</string>
+              <string>0393dd75c58f7046bed47e62a8884a78cb02a5c3</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136763378</string>
+              <string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778145</string>
             </map>
             <key>name</key>
             <string>windows64</string>
-- 
cgit v1.2.3


From 1fae237c158a8f501ae80d030b1a8cfdd8d2d8a2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Nov 2023 00:37:43 +0200
Subject: SL-20610 Crash when unticking animesh on an attachment

---
 doc/contributions.txt                | 1 +
 indra/newview/llspatialpartition.cpp | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3de668c1f0..581dab379d 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -290,6 +290,7 @@ Beq Janus
 	SL-18637
 	SL-19317
 	SL-19660
+	SL-20610
 Beth Walcher
 Bezilon Kasei
 Biancaluce Robbiani
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index a3d8986c20..cafc82964c 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -868,10 +868,9 @@ void LLSpatialGroup::rebound()
             LLControlAvatar* controlAvatar = bridge->mDrawable->getVObj()->getControlAvatar();
             if (controlAvatar &&
                 controlAvatar->mDrawable &&
-                controlAvatar->mControlAVBridge)
+                controlAvatar->mControlAVBridge &&
+                controlAvatar->mControlAVBridge->mOctree)
             {
-                llassert(controlAvatar->mControlAVBridge->mOctree);
-
                 LLSpatialGroup* root = (LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0);
                 if (this == root)
                 {
-- 
cgit v1.2.3


From d3da20d63f6ddf6f3760208d7db130d15860e852 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Nov 2023 01:01:12 +0200
Subject: SL-20603 Crash on CoInitialize

Don't mix CoInitialize and CoInitializeEx, one is global, other is
threaded.
CoInitialize(0) is equal to CoInitializeEx(0, COINIT_APARTMENTTHREADED)
and MULTITHREADED is not compatible with APARTMENTTHREADED.
---
 indra/llwindow/lldxhardware.cpp | 8 ++++----
 indra/newview/llmachineid.cpp   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index 391a377280..07856edefc 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -71,7 +71,7 @@ HRESULT GetVideoMemoryViaWMI(WCHAR* strInputDeviceID, DWORD* pdwAdapterRam)
     BSTR pNamespace = nullptr;
 
     *pdwAdapterRam = 0;
-    hrCoInitialize = CoInitialize( 0 );
+    hrCoInitialize = CoInitializeEx(0, COINIT_MULTITHREADED);
 
     hr = CoCreateInstance( CLSID_WbemLocator,
                            nullptr,
@@ -234,7 +234,7 @@ std::string LLDXHardware::getDriverVersionWMI(EGPUVendor vendor)
 	std::string mDriverVersion;
 	HRESULT hrCoInitialize = S_OK;
 	HRESULT hres;
-	hrCoInitialize = CoInitialize(0);
+	hrCoInitialize = CoInitializeEx(0, COINIT_MULTITHREADED);
 	IWbemLocator *pLoc = NULL;
 
 	hres = CoCreateInstance(
@@ -687,7 +687,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
 	BOOL ok = FALSE;
     HRESULT       hr;
 
-    CoInitialize(NULL);
+    CoInitializeEx(NULL, COINIT_MULTITHREADED);
 
     IDxDiagProvider *dx_diag_providerp = NULL;
     IDxDiagContainer *dx_diag_rootp = NULL;
@@ -976,7 +976,7 @@ LLSD LLDXHardware::getDisplayInfo()
 	LLTimer hw_timer;
     HRESULT       hr;
 	LLSD ret;
-    CoInitialize(NULL);
+    CoInitializeEx(NULL, COINIT_MULTITHREADED);
 
     IDxDiagProvider *dx_diag_providerp = NULL;
     IDxDiagContainer *dx_diag_rootp = NULL;
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp
index 583742f970..8f03b13d2d 100644
--- a/indra/newview/llmachineid.cpp
+++ b/indra/newview/llmachineid.cpp
@@ -88,6 +88,7 @@ void LLWMIMethods::initCOMObjects()
     mHR = CoInitializeEx(0, COINIT_MULTITHREADED);
     if (FAILED(mHR))
     {
+        // if result S_FALSE, it's already initialized
         LL_DEBUGS("AppInit") << "Failed to initialize COM library. Error code = 0x" << std::hex << mHR << LL_ENDL;
         return;
     }
-- 
cgit v1.2.3


From 40157b90836056111aa404e83906e60df13a6db6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 22 Nov 2023 12:34:02 +0200
Subject: SL-20327 FIXED friend location on the map is not shown after right
 click>Map

---
 indra/newview/llfloaterworldmap.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 8f3ec8af05..e509e8cef1 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -290,6 +290,7 @@ void* LLFloaterWorldMap::createWorldMapView(void* data)
 BOOL LLFloaterWorldMap::postBuild()
 {
     mMapView = dynamic_cast<LLWorldMapView*>(getChild<LLPanel>("objects_mapview"));
+    mMapView->setPan(0, 0, true);
 	
 	LLComboBox *avatar_combo = getChild<LLComboBox>("friend combo");
 	avatar_combo->selectFirstItem();
-- 
cgit v1.2.3


From faadebbb6925d7f800146cfe3a4a185e91a451e8 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 22 Nov 2023 10:25:06 -0500
Subject: DRTVWR-594: Update kdu version from the updated package.

---
 autobuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autobuild.xml b/autobuild.xml
index cf896e1af4..2103364275 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1185,7 +1185,7 @@
         <key>copyright</key>
         <string>Kakadu software</string>
         <key>version</key>
-        <string>7.10.4.539108</string>
+        <string>7.10.4.4b9ec5f</string>
         <key>name</key>
         <string>kdu</string>
         <key>description</key>
-- 
cgit v1.2.3


From 7dbe4540196dcae10d728f8a15f3fa7c9225a650 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 22 Nov 2023 23:43:42 +0200
Subject: SL-17846 Crash at ~LLSearchEditor

A weird crash inside LLSearchEditor, try clearing it explicitly
---
 indra/llui/llfiltereditor.h   | 1 +
 indra/llui/llsearcheditor.cpp | 8 ++++++++
 indra/llui/llsearcheditor.h   | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llfiltereditor.h b/indra/llui/llfiltereditor.h
index 3a05bc05a1..52cad3bff4 100644
--- a/indra/llui/llfiltereditor.h
+++ b/indra/llui/llfiltereditor.h
@@ -43,6 +43,7 @@ class LLFilterEditor : public LLSearchEditor
 public:
 	struct Params : public LLInitParam::Block<Params, LLSearchEditor::Params>
 	{};
+    virtual ~LLFilterEditor() {}
 
 protected:
 	LLFilterEditor(const Params&);
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index bafeef41fb..7a88ecc76f 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -104,6 +104,14 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
 	}
 }
 
+LLSearchEditor::~LLSearchEditor()
+{
+    mSearchButton = NULL;
+    mClearButton = NULL;
+    mSearchEditor->deleteAllChildren();
+    deleteAllChildren();
+}
+
 //virtual
 void LLSearchEditor::draw()
 {
diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h
index c0f3c1d60c..bd51988d07 100644
--- a/indra/llui/llsearcheditor.h
+++ b/indra/llui/llsearcheditor.h
@@ -74,7 +74,7 @@ protected:
 	friend class LLUICtrlFactory;
 
 public:
-	virtual ~LLSearchEditor() {}
+	virtual ~LLSearchEditor();
 
 	/*virtual*/ void	draw();
 
-- 
cgit v1.2.3


From a1fed466f0cc0c08d3cdcba88e02230c94e763b0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Nov 2023 00:57:46 +0200
Subject: SL-17434 Crash clearing LLEventPumps

We actively use event pumps's connections in threads, make sure nothing
modifies list of connections during reset.
And in case this doesn't fix the issue list affected pump before it
crashes to have a better idea of what is going on.
---
 indra/llcommon/llevents.cpp   | 20 ++++++++++++++++++--
 indra/llcommon/llevents.h     |  5 +++--
 indra/newview/llappviewer.cpp |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index 0a213bddef..aa9a258723 100644
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -152,12 +152,21 @@ void LLEventPumps::clear()
     }
 }
 
-void LLEventPumps::reset()
+void LLEventPumps::reset(bool log_pumps)
 {
     // Reset every known LLEventPump instance. Leave it up to each instance to
     // decide what to do with the reset() call.
+    if (log_pumps)
+    {
+        LL_INFOS() << "Resetting " << (S32)mPumpMap.size() << " pumps" << LL_ENDL;
+    }
+
     for (PumpMap::value_type& pair : mPumpMap)
     {
+        if (log_pumps)
+        {
+            LL_INFOS() << "Resetting pump " << pair.first << LL_ENDL;
+        }
         pair.second->reset();
     }
 }
@@ -314,9 +323,11 @@ std::string LLEventPump::inventName(const std::string& pfx)
 
 void LLEventPump::clear()
 {
+    LLMutexLock lock(&mConnectionListMutex);
     // Destroy the original LLStandardSignal instance, replacing it with a
     // whole new one.
     mSignal = std::make_shared<LLStandardSignal>();
+
     mConnections.clear();
 }
 
@@ -324,6 +335,7 @@ void LLEventPump::reset()
 {
     // Resetting mSignal is supposed to disconnect everything on its own
     // But due to crash on 'reset' added explicit cleanup to get more data
+    LLMutexLock lock(&mConnectionListMutex);
     ConnectionMap::const_iterator iter = mConnections.begin();
     ConnectionMap::const_iterator end = mConnections.end();
     while (iter!=end)
@@ -348,6 +360,8 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL
         return LLBoundListener();
     }
 
+    LLMutexLock lock(&mConnectionListMutex);
+
     float nodePosition = 1.0;
 
     // if the supplied name is empty we are not interested in the ordering mechanism 
@@ -507,8 +521,9 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL
     return bound;
 }
 
-LLBoundListener LLEventPump::getListener(const std::string& name) const
+LLBoundListener LLEventPump::getListener(const std::string& name)
 {
+    LLMutexLock lock(&mConnectionListMutex);
     ConnectionMap::const_iterator found = mConnections.find(name);
     if (found != mConnections.end())
     {
@@ -520,6 +535,7 @@ LLBoundListener LLEventPump::getListener(const std::string& name) const
 
 void LLEventPump::stopListening(const std::string& name)
 {
+    LLMutexLock lock(&mConnectionListMutex);
     ConnectionMap::iterator found = mConnections.find(name);
     if (found != mConnections.end())
     {
diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h
index ae6e5aabc9..b5c4e58c9c 100644
--- a/indra/llcommon/llevents.h
+++ b/indra/llcommon/llevents.h
@@ -293,7 +293,7 @@ public:
      * Reset all known LLEventPump instances
      * workaround for DEV-35406 crash on shutdown
      */
-    void reset();
+    void reset(bool log_pumps = false);
 
 private:
     friend class LLEventPump;
@@ -519,7 +519,7 @@ public:
 
     /// Get the LLBoundListener associated with the passed name (dummy
     /// LLBoundListener if not found)
-    virtual LLBoundListener getListener(const std::string& name) const;
+    virtual LLBoundListener getListener(const std::string& name);
     /**
      * Instantiate one of these to block an existing connection:
      * @code
@@ -562,6 +562,7 @@ private:
     LLHandle<LLEventPumps> mRegistry;
 
     std::string mName;
+    LLMutex mConnectionListMutex;
 
 protected:
     virtual LLBoundListener listen_impl(const std::string& name, const LLEventListener&,
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5763ebe721..af8bceb7d8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1736,7 +1736,7 @@ bool LLAppViewer::cleanup()
     LLNotifications::instance().clear();
 
 	// workaround for DEV-35406 crash on shutdown
-	LLEventPumps::instance().reset();
+	LLEventPumps::instance().reset(true);
 
 	//dump scene loading monitor results
 	if (LLSceneMonitor::instanceExists())
-- 
cgit v1.2.3


From c81c15b74137e1471c6c1d95c421d3d69fe99fd4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Nov 2023 21:22:02 +0200
Subject: SL-18875 Crash at LLModel::writeModel

Looks like a crash iterating over
weight_list& weights = model[idx]->getJointInfluences(pos);
---
 indra/llprimitive/llmodel.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index fbd97b3de7..153b9a1d23 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -997,7 +997,12 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 	weight_map::iterator iterPos = mSkinWeights.begin();
 	weight_map::iterator iterEnd = mSkinWeights.end();
 
-    llassert(!mSkinWeights.empty());
+    if (mSkinWeights.empty())
+    {
+        // function calls iter->second on all return paths
+        // everything that calls this function should precheck that there is data.
+        LL_ERRS() << "called getJointInfluences with empty weights list" << LL_ENDL;
+    }
 	
 	for ( ; iterPos!=iterEnd; ++iterPos )
 	{
@@ -1024,11 +1029,16 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 		const F32 epsilon = 1e-5f;
 		weight_map::iterator iter_up = mSkinWeights.lower_bound(pos);
 		weight_map::iterator iter_down = iter_up;
-		if (iter_up != mSkinWeights.end())
-		{
-			iter_down = ++iter_up;
-		}
-		weight_map::iterator best = iter_up;
+        weight_map::iterator best = iter_up;
+        if (iter_up != mSkinWeights.end())
+        {
+            iter_down = ++iter_up;
+        }
+        else
+        {
+            // Assumes that there is at least one element
+            --best;
+        }
 
 		F32 min_dist = (iter->first - pos).magVec();
 
-- 
cgit v1.2.3


From 06c2c87bfaf364cb358b8a4b194e6369531a63c6 Mon Sep 17 00:00:00 2001
From: Yuzuru Jewell <46077079+YuzuruJewell@users.noreply.github.com>
Date: Fri, 24 Nov 2023 20:06:23 +0900
Subject: Suggestions for fixing problems in xui/en XML files (#534)

Co-authored-by: Yuzuru Kato <pascal.imac@gmail.com>
Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
---
 .../newview/skins/default/xui/en/alert_button.xml  |  2 +-
 .../skins/default/xui/en/alert_check_box.xml       |  4 +--
 indra/newview/skins/default/xui/en/alert_icon.xml  |  2 +-
 .../skins/default/xui/en/alert_line_editor.xml     |  2 +-
 .../xui/en/control_table_contents_camera.xml       |  2 +-
 .../en/control_table_contents_columns_basic.xml    |  2 +-
 .../xui/en/control_table_contents_editing.xml      |  2 +-
 .../xui/en/control_table_contents_media.xml        |  2 +-
 .../xui/en/control_table_contents_movement.xml     |  2 +-
 .../skins/default/xui/en/favorites_bar_button.xml  |  2 +-
 .../skins/default/xui/en/floater_360capture.xml    |  4 +--
 indra/newview/skins/default/xui/en/floater_aaa.xml |  2 +-
 .../newview/skins/default/xui/en/floater_about.xml |  2 +-
 .../skins/default/xui/en/floater_about_land.xml    |  4 +--
 .../skins/default/xui/en/floater_activeim.xml      |  2 +-
 .../default/xui/en/floater_add_payment_method.xml  |  2 +-
 .../xui/en/floater_animation_anim_preview.xml      |  2 +-
 .../xui/en/floater_animation_bvh_preview.xml       |  2 +-
 .../default/xui/en/floater_associate_listing.xml   |  2 +-
 .../skins/default/xui/en/floater_auction.xml       |  2 +-
 .../skins/default/xui/en/floater_autoreplace.xml   |  2 +-
 .../skins/default/xui/en/floater_avatar.xml        |  2 +-
 .../skins/default/xui/en/floater_avatar_picker.xml |  2 +-
 .../xui/en/floater_avatar_render_settings.xml      |  2 +-
 .../default/xui/en/floater_avatar_textures.xml     |  4 +--
 .../skins/default/xui/en/floater_ban_duration.xml  |  2 +-
 .../skins/default/xui/en/floater_beacons.xml       |  4 +--
 .../skins/default/xui/en/floater_big_preview.xml   |  2 +-
 .../skins/default/xui/en/floater_build_options.xml |  2 +-
 .../skins/default/xui/en/floater_bulk_perms.xml    |  2 +-
 .../newview/skins/default/xui/en/floater_bumps.xml |  2 +-
 .../skins/default/xui/en/floater_buy_contents.xml  |  2 +-
 .../default/xui/en/floater_buy_currency_html.xml   |  2 +-
 .../skins/default/xui/en/floater_buy_land.xml      |  2 +-
 .../skins/default/xui/en/floater_buy_object.xml    |  2 +-
 .../skins/default/xui/en/floater_camera.xml        |  2 +-
 .../default/xui/en/floater_camera_presets.xml      |  2 +-
 .../xui/en/floater_change_item_thumbnail.xml       |  2 +-
 .../skins/default/xui/en/floater_choose_group.xml  |  2 +-
 .../skins/default/xui/en/floater_color_picker.xml  |  2 +-
 .../default/xui/en/floater_conversation_log.xml    |  2 +-
 .../xui/en/floater_conversation_preview.xml        |  2 +-
 .../default/xui/en/floater_create_landmark.xml     |  2 +-
 .../skins/default/xui/en/floater_critical.xml      |  2 +-
 .../default/xui/en/floater_delete_pref_preset.xml  |  2 +-
 .../skins/default/xui/en/floater_destinations.xml  |  2 +-
 .../skins/default/xui/en/floater_display_name.xml  |  2 +-
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  2 +-
 .../default/xui/en/floater_edit_hover_height.xml   |  2 +-
 .../newview/skins/default/xui/en/floater_event.xml |  2 +-
 .../default/xui/en/floater_experience_search.xml   |  2 +-
 .../default/xui/en/floater_experienceprofile.xml   |  2 +-
 .../skins/default/xui/en/floater_experiences.xml   |  2 +-
 .../skins/default/xui/en/floater_fast_timers.xml   |  2 +-
 .../skins/default/xui/en/floater_fbc_web.xml       |  2 +-
 .../default/xui/en/floater_fixedenvironment.xml    |  2 +-
 .../skins/default/xui/en/floater_font_test.xml     |  2 +-
 .../skins/default/xui/en/floater_forget_user.xml   |  2 +-
 .../skins/default/xui/en/floater_gesture.xml       |  2 +-
 .../skins/default/xui/en/floater_god_tools.xml     |  2 +-
 .../skins/default/xui/en/floater_goto_line.xml     |  4 +--
 .../skins/default/xui/en/floater_grid_status.xml   |  2 +-
 .../skins/default/xui/en/floater_help_browser.xml  |  2 +-
 .../skins/default/xui/en/floater_how_to.xml        |  4 +--
 indra/newview/skins/default/xui/en/floater_hud.xml |  2 +-
 .../skins/default/xui/en/floater_im_container.xml  |  2 +-
 .../skins/default/xui/en/floater_im_session.xml    |  2 +-
 .../skins/default/xui/en/floater_image_preview.xml |  2 +-
 .../default/xui/en/floater_import_collada.xml      |  2 +-
 .../skins/default/xui/en/floater_incoming_call.xml |  2 +-
 .../skins/default/xui/en/floater_inspect.xml       |  2 +-
 .../xui/en/floater_inventory_item_properties.xml   |  2 +-
 .../default/xui/en/floater_inventory_settings.xml  |  2 +-
 .../xui/en/floater_inventory_view_finder.xml       |  2 +-
 .../default/xui/en/floater_item_properties.xml     |  2 +-
 .../skins/default/xui/en/floater_joystick.xml      |  2 +-
 .../skins/default/xui/en/floater_lagmeter.xml      |  2 +-
 .../skins/default/xui/en/floater_land_holdings.xml |  2 +-
 .../skins/default/xui/en/floater_linkreplace.xml   |  2 +-
 .../default/xui/en/floater_live_lsleditor.xml      |  2 +-
 .../default/xui/en/floater_load_pref_preset.xml    |  2 +-
 .../skins/default/xui/en/floater_lsl_guide.xml     |  2 +-
 indra/newview/skins/default/xui/en/floater_map.xml |  2 +-
 .../xui/en/floater_marketplace_validation.xml      |  2 +-
 .../skins/default/xui/en/floater_media_browser.xml |  2 +-
 .../default/xui/en/floater_media_settings.xml      |  2 +-
 .../skins/default/xui/en/floater_mem_leaking.xml   |  2 +-
 indra/newview/skins/default/xui/en/floater_mfa.xml |  2 +-
 .../skins/default/xui/en/floater_model_preview.xml | 10 +++---
 .../skins/default/xui/en/floater_moveview.xml      |  2 +-
 .../skins/default/xui/en/floater_mute_object.xml   |  2 +-
 .../skins/default/xui/en/floater_my_scripts.xml    |  2 +-
 .../default/xui/en/floater_my_web_profile.xml      |  4 +--
 .../xui/en/floater_new_feature_notification.xml    |  2 +-
 .../skins/default/xui/en/floater_notification.xml  |  2 +-
 .../xui/en/floater_notifications_console.xml       |  2 +-
 .../default/xui/en/floater_object_weights.xml      |  2 +-
 .../skins/default/xui/en/floater_openobject.xml    |  2 +-
 .../default/xui/en/floater_outfit_save_as.xml      |  2 +-
 .../skins/default/xui/en/floater_outgoing_call.xml |  2 +-
 .../xui/en/floater_pathfinding_characters.xml      |  2 +-
 .../default/xui/en/floater_pathfinding_console.xml |  2 +-
 .../xui/en/floater_pathfinding_linksets.xml        |  4 +--
 indra/newview/skins/default/xui/en/floater_pay.xml |  2 +-
 .../skins/default/xui/en/floater_pay_object.xml    |  2 +-
 .../skins/default/xui/en/floater_people.xml        |  2 +-
 .../skins/default/xui/en/floater_performance.xml   |  2 +-
 .../skins/default/xui/en/floater_perms_default.xml |  2 +-
 .../skins/default/xui/en/floater_pick_track.xml    |  2 +-
 .../skins/default/xui/en/floater_post_process.xml  |  2 +-
 .../skins/default/xui/en/floater_preferences.xml   |  2 +-
 .../en/floater_preferences_graphics_advanced.xml   |  6 ++--
 .../default/xui/en/floater_preferences_proxy.xml   |  2 +-
 .../xui/en/floater_preferences_view_advanced.xml   |  2 +-
 .../default/xui/en/floater_preview_animation.xml   |  2 +-
 .../default/xui/en/floater_preview_gesture.xml     |  2 +-
 .../default/xui/en/floater_preview_notecard.xml    |  2 +-
 .../skins/default/xui/en/floater_preview_sound.xml |  2 +-
 .../default/xui/en/floater_preview_texture.xml     |  2 +-
 .../skins/default/xui/en/floater_preview_trash.xml |  2 +-
 .../default/xui/en/floater_price_for_listing.xml   |  2 +-
 .../default/xui/en/floater_profile_permissions.xml |  2 +-
 .../default/xui/en/floater_profile_texture.xml     |  2 +-
 .../default/xui/en/floater_publish_classified.xml  |  2 +-
 .../xui/en/floater_region_debug_console.xml        |  2 +-
 .../skins/default/xui/en/floater_region_info.xml   |  2 +-
 .../default/xui/en/floater_region_restarting.xml   |  2 +-
 .../skins/default/xui/en/floater_report_abuse.xml  |  2 +-
 .../default/xui/en/floater_save_camera_preset.xml  |  2 +-
 .../default/xui/en/floater_save_pref_preset.xml    |  2 +-
 .../default/xui/en/floater_scene_load_stats.xml    |  4 +--
 .../skins/default/xui/en/floater_script.xml        |  2 +-
 .../skins/default/xui/en/floater_script_debug.xml  |  2 +-
 .../default/xui/en/floater_script_debug_panel.xml  |  2 +-
 .../default/xui/en/floater_script_ed_prefs.xml     |  2 +-
 .../skins/default/xui/en/floater_script_limits.xml |  2 +-
 .../default/xui/en/floater_script_preview.xml      |  2 +-
 .../skins/default/xui/en/floater_script_queue.xml  |  2 +-
 .../skins/default/xui/en/floater_script_search.xml |  2 +-
 .../skins/default/xui/en/floater_search.xml        |  2 +-
 .../skins/default/xui/en/floater_select_key.xml    |  2 +-
 .../skins/default/xui/en/floater_sell_land.xml     |  2 +-
 .../default/xui/en/floater_settings_debug.xml      |  2 +-
 .../default/xui/en/floater_settings_picker.xml     |  2 +-
 .../default/xui/en/floater_simple_snapshot.xml     |  2 +-
 .../skins/default/xui/en/floater_snapshot.xml      |  4 +--
 .../skins/default/xui/en/floater_sound_preview.xml |  2 +-
 .../skins/default/xui/en/floater_spellcheck.xml    |  2 +-
 .../default/xui/en/floater_spellcheck_import.xml   |  2 +-
 .../newview/skins/default/xui/en/floater_stats.xml |  2 +-
 .../default/xui/en/floater_task_properties.xml     |  2 +-
 .../skins/default/xui/en/floater_telehub.xml       |  2 +-
 .../skins/default/xui/en/floater_test_button.xml   |  2 +-
 .../skins/default/xui/en/floater_test_checkbox.xml |  2 +-
 .../skins/default/xui/en/floater_test_combobox.xml |  2 +-
 .../default/xui/en/floater_test_inspectors.xml     |  2 +-
 .../skins/default/xui/en/floater_test_layout.xml   |  2 +-
 .../default/xui/en/floater_test_layout_stacks.xml  | 36 +++++++++++-----------
 .../default/xui/en/floater_test_line_editor.xml    |  6 ++--
 .../default/xui/en/floater_test_list_view.xml      |  2 +-
 .../default/xui/en/floater_test_navigation_bar.xml |  2 +-
 .../default/xui/en/floater_test_radiogroup.xml     |  2 +-
 .../skins/default/xui/en/floater_test_slider.xml   |  2 +-
 .../skins/default/xui/en/floater_test_spinner.xml  |  2 +-
 .../default/xui/en/floater_test_text_editor.xml    |  4 +--
 .../xui/en/floater_test_text_vertical_aligment.xml |  2 +-
 .../skins/default/xui/en/floater_test_textbox.xml  |  6 ++--
 .../skins/default/xui/en/floater_test_toolbar.xml  |  2 +-
 .../skins/default/xui/en/floater_test_widgets.xml  |  6 ++--
 .../skins/default/xui/en/floater_texture_ctrl.xml  |  2 +-
 .../xui/en/floater_texture_fetch_debugger.xml      |  2 +-
 .../newview/skins/default/xui/en/floater_tools.xml |  2 +-
 .../skins/default/xui/en/floater_top_objects.xml   |  2 +-
 indra/newview/skins/default/xui/en/floater_tos.xml |  2 +-
 .../skins/default/xui/en/floater_toybox.xml        |  2 +-
 .../xui/en/floater_translation_settings.xml        |  4 +--
 .../skins/default/xui/en/floater_ui_preview.xml    |  2 +-
 .../skins/default/xui/en/floater_url_entry.xml     |  2 +-
 .../default/xui/en/floater_voice_chat_volume.xml   |  4 +--
 .../skins/default/xui/en/floater_voice_effect.xml  |  2 +-
 .../skins/default/xui/en/floater_voice_volume.xml  |  2 +-
 .../skins/default/xui/en/floater_web_content.xml   |  2 +-
 .../skins/default/xui/en/floater_web_profile.xml   |  4 +--
 .../default/xui/en/floater_whitelist_entry.xml     |  2 +-
 .../skins/default/xui/en/floater_window_size.xml   |  2 +-
 .../skins/default/xui/en/floater_world_map.xml     |  4 +--
 indra/newview/skins/default/xui/en/fonts.xml       | 20 ++++++------
 .../skins/default/xui/en/inspect_avatar.xml        |  2 +-
 .../newview/skins/default/xui/en/inspect_group.xml |  2 +-
 .../skins/default/xui/en/inspect_object.xml        |  2 +-
 .../skins/default/xui/en/inspect_remote_object.xml |  2 +-
 .../newview/skins/default/xui/en/inspect_toast.xml |  2 +-
 .../skins/default/xui/en/inspector_info_ctrl.xml   |  3 +-
 .../skins/default/xui/en/language_settings.xml     |  2 +-
 indra/newview/skins/default/xui/en/main_view.xml   |  2 +-
 .../default/xui/en/menu_add_wearable_gear.xml      |  2 +-
 .../skins/default/xui/en/menu_attachment_other.xml |  2 +-
 .../skins/default/xui/en/menu_attachment_self.xml  |  2 +-
 .../skins/default/xui/en/menu_avatar_icon.xml      |  2 +-
 .../skins/default/xui/en/menu_avatar_other.xml     |  2 +-
 .../xui/en/menu_avatar_rendering_settings.xml      |  2 +-
 .../xui/en/menu_avatar_rendering_settings_add.xml  |  2 +-
 .../skins/default/xui/en/menu_avatar_self.xml      |  2 +-
 .../skins/default/xui/en/menu_cof_attachment.xml   |  2 +-
 .../skins/default/xui/en/menu_cof_body_part.xml    |  2 +-
 .../skins/default/xui/en/menu_cof_clothing.xml     |  2 +-
 .../newview/skins/default/xui/en/menu_cof_gear.xml |  2 +-
 .../skins/default/xui/en/menu_conversation.xml     |  2 +-
 .../default/xui/en/menu_conversation_log_gear.xml  |  2 +-
 .../default/xui/en/menu_conversation_log_view.xml  |  2 +-
 .../skins/default/xui/en/menu_copy_paste_color.xml |  2 +-
 .../default/xui/en/menu_copy_paste_features.xml    |  2 +-
 .../skins/default/xui/en/menu_copy_paste_light.xml |  2 +-
 .../default/xui/en/menu_copy_paste_object.xml      |  2 +-
 .../skins/default/xui/en/menu_copy_paste_pos.xml   |  2 +-
 .../skins/default/xui/en/menu_copy_paste_rot.xml   |  2 +-
 .../skins/default/xui/en/menu_copy_paste_size.xml  |  2 +-
 .../default/xui/en/menu_copy_paste_texture.xml     |  2 +-
 indra/newview/skins/default/xui/en/menu_edit.xml   |  4 +--
 .../skins/default/xui/en/menu_favorites.xml        |  2 +-
 .../default/xui/en/menu_gallery_inventory.xml      |  2 +-
 .../default/xui/en/menu_gallery_outfit_tab.xml     |  2 +-
 .../skins/default/xui/en/menu_gesture_gear.xml     |  2 +-
 .../skins/default/xui/en/menu_group_plus.xml       |  2 +-
 .../skins/default/xui/en/menu_hide_navbar.xml      |  2 +-
 .../skins/default/xui/en/menu_im_conversation.xml  |  2 +-
 .../default/xui/en/menu_im_session_showmodes.xml   |  2 +-
 .../skins/default/xui/en/menu_imchiclet_adhoc.xml  |  2 +-
 .../skins/default/xui/en/menu_imchiclet_group.xml  |  2 +-
 .../skins/default/xui/en/menu_imchiclet_p2p.xml    |  2 +-
 .../default/xui/en/menu_inspect_object_gear.xml    |  2 +-
 .../default/xui/en/menu_inv_offer_chiclet.xml      |  2 +-
 .../skins/default/xui/en/menu_inventory.xml        |  2 +-
 .../skins/default/xui/en/menu_inventory_add.xml    |  2 +-
 .../default/xui/en/menu_inventory_gear_default.xml |  2 +-
 .../xui/en/menu_inventory_search_visibility.xml    |  2 +-
 .../default/xui/en/menu_inventory_view_default.xml |  2 +-
 indra/newview/skins/default/xui/en/menu_land.xml   |  2 +-
 .../newview/skins/default/xui/en/menu_landmark.xml |  2 +-
 indra/newview/skins/default/xui/en/menu_login.xml  |  2 +-
 .../skins/default/xui/en/menu_marketplace_view.xml |  2 +-
 .../skins/default/xui/en/menu_media_ctrl.xml       |  2 +-
 .../newview/skins/default/xui/en/menu_mini_map.xml |  2 +-
 .../xui/en/menu_model_import_gear_default.xml      |  2 +-
 .../skins/default/xui/en/menu_mute_particle.xml    |  2 +-
 indra/newview/skins/default/xui/en/menu_navbar.xml |  4 +--
 .../skins/default/xui/en/menu_nearby_chat.xml      |  2 +-
 .../xui/en/menu_notification_well_button.xml       |  2 +-
 indra/newview/skins/default/xui/en/menu_object.xml |  2 +-
 .../skins/default/xui/en/menu_object_icon.xml      |  2 +-
 .../skins/default/xui/en/menu_outfit_gear.xml      |  2 +-
 .../skins/default/xui/en/menu_outfit_tab.xml       |  2 +-
 .../skins/default/xui/en/menu_participant_list.xml |  2 +-
 .../skins/default/xui/en/menu_participant_view.xml |  2 +-
 .../default/xui/en/menu_people_blocked_gear.xml    |  2 +-
 .../default/xui/en/menu_people_blocked_plus.xml    |  2 +-
 .../default/xui/en/menu_people_blocked_view.xml    |  2 +-
 .../default/xui/en/menu_people_friends_view.xml    |  2 +-
 .../skins/default/xui/en/menu_people_groups.xml    |  2 +-
 .../default/xui/en/menu_people_groups_view.xml     |  2 +-
 .../skins/default/xui/en/menu_people_nearby.xml    |  2 +-
 .../xui/en/menu_people_nearby_multiselect.xml      |  2 +-
 .../default/xui/en/menu_people_nearby_view.xml     |  2 +-
 .../default/xui/en/menu_people_recent_view.xml     |  2 +-
 indra/newview/skins/default/xui/en/menu_picks.xml  |  2 +-
 .../skins/default/xui/en/menu_picks_plus.xml       |  2 +-
 indra/newview/skins/default/xui/en/menu_place.xml  |  2 +-
 .../skins/default/xui/en/menu_place_add_button.xml |  2 +-
 .../default/xui/en/menu_places_gear_folder.xml     |  2 +-
 .../default/xui/en/menu_places_gear_landmark.xml   |  2 +-
 .../default/xui/en/menu_places_gear_sorting.xml    |  2 +-
 .../skins/default/xui/en/menu_profile_other.xml    |  2 +-
 .../skins/default/xui/en/menu_profile_overflow.xml |  2 +-
 .../skins/default/xui/en/menu_profile_self.xml     |  2 +-
 .../skins/default/xui/en/menu_save_outfit.xml      |  2 +-
 .../skins/default/xui/en/menu_save_settings.xml    |  2 +-
 .../skins/default/xui/en/menu_script_chiclet.xml   |  2 +-
 .../skins/default/xui/en/menu_settings_add.xml     |  4 +--
 .../skins/default/xui/en/menu_settings_gear.xml    |  4 +--
 indra/newview/skins/default/xui/en/menu_slurl.xml  |  2 +-
 .../default/xui/en/menu_teleport_history_gear.xml  |  2 +-
 .../default/xui/en/menu_teleport_history_item.xml  |  2 +-
 .../default/xui/en/menu_teleport_history_tab.xml   |  2 +-
 .../skins/default/xui/en/menu_text_editor.xml      |  2 +-
 .../newview/skins/default/xui/en/menu_toolbars.xml |  2 +-
 .../skins/default/xui/en/menu_topinfobar.xml       |  4 +--
 .../skins/default/xui/en/menu_url_agent.xml        |  2 +-
 .../skins/default/xui/en/menu_url_email.xml        |  2 +-
 .../skins/default/xui/en/menu_url_experience.xml   |  2 +-
 .../skins/default/xui/en/menu_url_group.xml        |  2 +-
 .../newview/skins/default/xui/en/menu_url_http.xml |  2 +-
 .../skins/default/xui/en/menu_url_inventory.xml    |  2 +-
 .../newview/skins/default/xui/en/menu_url_map.xml  |  2 +-
 .../skins/default/xui/en/menu_url_objectim.xml     |  2 +-
 .../skins/default/xui/en/menu_url_parcel.xml       |  2 +-
 .../skins/default/xui/en/menu_url_slapp.xml        |  2 +-
 .../skins/default/xui/en/menu_url_slurl.xml        |  2 +-
 .../skins/default/xui/en/menu_url_teleport.xml     |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 +-
 .../default/xui/en/menu_wearable_list_item.xml     |  2 +-
 .../skins/default/xui/en/menu_wearing_gear.xml     |  2 +-
 .../skins/default/xui/en/menu_wearing_tab.xml      |  2 +-
 indra/newview/skins/default/xui/en/mime_types.xml  |  4 +--
 .../skins/default/xui/en/mime_types_linux.xml      |  2 +-
 .../skins/default/xui/en/mime_types_mac.xml        |  2 +-
 .../default/xui/en/notification_visibility.xml     |  2 +-
 .../newview/skins/default/xui/en/notifications.xml |  5 +--
 .../skins/default/xui/en/outfit_accordion_tab.xml  |  2 +-
 .../default/xui/en/panel_active_object_row.xml     |  4 +--
 .../default/xui/en/panel_avatar_list_item.xml      |  2 +-
 .../skins/default/xui/en/panel_avatar_tag.xml      |  2 +-
 .../default/xui/en/panel_block_list_sidetray.xml   |  2 +-
 .../default/xui/en/panel_blocked_list_item.xml     |  4 +--
 .../default/xui/en/panel_body_parts_list_item.xml  |  2 +-
 .../skins/default/xui/en/panel_bottomtray_lite.xml |  2 +-
 .../default/xui/en/panel_camera_preset_item.xml    |  2 +-
 .../skins/default/xui/en/panel_chat_header.xml     |  2 +-
 .../skins/default/xui/en/panel_chat_separator.xml  |  2 +-
 .../skins/default/xui/en/panel_chiclet_bar.xml     |  2 +-
 .../skins/default/xui/en/panel_classified_info.xml |  2 +-
 .../default/xui/en/panel_classifieds_list_item.xml |  2 +-
 .../default/xui/en/panel_clothing_list_item.xml    |  2 +-
 .../skins/default/xui/en/panel_cof_wearables.xml   |  2 +-
 .../xui/en/panel_conversation_list_item.xml        |  2 +-
 .../xui/en/panel_conversation_log_list_item.xml    |  4 +--
 .../xui/en/panel_deletable_wearable_list_item.xml  |  2 +-
 .../xui/en/panel_dummy_clothing_list_item.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_alpha.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_eyes.xml       |  2 +-
 .../skins/default/xui/en/panel_edit_gloves.xml     |  2 +-
 .../skins/default/xui/en/panel_edit_hair.xml       |  2 +-
 .../skins/default/xui/en/panel_edit_jacket.xml     |  2 +-
 .../skins/default/xui/en/panel_edit_pants.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_physics.xml    |  2 +-
 .../skins/default/xui/en/panel_edit_shape.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_shirt.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_shoes.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_skin.xml       |  2 +-
 .../skins/default/xui/en/panel_edit_skirt.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_socks.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_tattoo.xml     |  2 +-
 .../skins/default/xui/en/panel_edit_underpants.xml |  2 +-
 .../skins/default/xui/en/panel_edit_undershirt.xml |  2 +-
 .../skins/default/xui/en/panel_edit_universal.xml  |  2 +-
 .../skins/default/xui/en/panel_edit_wearable.xml   |  2 +-
 .../skins/default/xui/en/panel_experience_info.xml |  2 +-
 .../xui/en/panel_experience_list_editor.xml        |  2 +-
 .../default/xui/en/panel_experience_list_item.xml  |  2 +-
 .../skins/default/xui/en/panel_experience_log.xml  |  2 +-
 .../default/xui/en/panel_experience_search.xml     |  2 +-
 .../skins/default/xui/en/panel_experiences.xml     |  2 +-
 .../skins/default/xui/en/panel_favorites.xml       |  2 +-
 .../skins/default/xui/en/panel_generic_tip.xml     |  2 +-
 .../skins/default/xui/en/panel_group_bulk_ban.xml  |  2 +-
 .../xui/en/panel_group_creation_sidetray.xml       |  8 ++---
 .../skins/default/xui/en/panel_group_general.xml   |  2 +-
 .../default/xui/en/panel_group_info_sidetray.xml   |  2 +-
 .../skins/default/xui/en/panel_group_invite.xml    |  2 +-
 .../default/xui/en/panel_group_land_money.xml      |  2 +-
 .../skins/default/xui/en/panel_group_list_item.xml |  2 +-
 .../default/xui/en/panel_group_list_item_short.xml |  2 +-
 .../skins/default/xui/en/panel_group_notices.xml   |  2 +-
 .../skins/default/xui/en/panel_group_notify.xml    |  2 +-
 .../skins/default/xui/en/panel_group_roles.xml     |  2 +-
 .../skins/default/xui/en/panel_hide_beacon.xml     |  2 +-
 indra/newview/skins/default/xui/en/panel_hint.xml  |  2 +-
 .../skins/default/xui/en/panel_hint_image.xml      |  2 +-
 indra/newview/skins/default/xui/en/panel_hud.xml   |  2 +-
 .../skins/default/xui/en/panel_inbox_inventory.xml |  2 +-
 .../skins/default/xui/en/panel_instant_message.xml |  2 +-
 .../default/xui/en/panel_inventory_gallery.xml     |  2 +-
 .../xui/en/panel_inventory_gallery_item.xml        |  2 +-
 .../skins/default/xui/en/panel_inventory_item.xml  |  2 +-
 .../skins/default/xui/en/panel_landmark_info.xml   |  2 +-
 .../skins/default/xui/en/panel_landmarks.xml       |  2 +-
 indra/newview/skins/default/xui/en/panel_login.xml |  1 +
 .../skins/default/xui/en/panel_login_first.xml     |  1 +
 .../skins/default/xui/en/panel_main_inventory.xml  |  2 +-
 .../default/xui/en/panel_marketplace_listings.xml  |  4 +--
 .../en/panel_marketplace_listings_inventory.xml    |  2 +-
 .../xui/en/panel_marketplace_listings_listed.xml   |  2 +-
 .../en/panel_marketplace_listings_unassociated.xml |  2 +-
 .../xui/en/panel_marketplace_listings_unlisted.xml |  2 +-
 .../xui/en/panel_media_settings_general.xml        |  2 +-
 .../xui/en/panel_media_settings_permissions.xml    |  2 +-
 .../xui/en/panel_media_settings_security.xml       |  2 +-
 .../skins/default/xui/en/panel_navigation_bar.xml  |  2 +-
 .../skins/default/xui/en/panel_nearby_chat_bar.xml |  2 +-
 .../skins/default/xui/en/panel_nearby_media.xml    |  2 +-
 .../skins/default/xui/en/panel_notification.xml    |  2 +-
 .../xui/en/panel_notification_list_item.xml        |  2 +-
 .../default/xui/en/panel_notifications_channel.xml |  2 +-
 .../skins/default/xui/en/panel_notify_textbox.xml  |  2 +-
 .../default/xui/en/panel_online_status_toast.xml   |  4 +--
 .../skins/default/xui/en/panel_outfit_edit.xml     |  2 +-
 .../skins/default/xui/en/panel_outfit_gallery.xml  |  2 +-
 .../default/xui/en/panel_outfit_gallery_item.xml   |  2 +-
 .../xui/en/panel_outfit_snapshot_inventory.xml     |  2 +-
 .../default/xui/en/panel_outfits_inventory.xml     |  2 +-
 .../en/panel_outfits_inventory_gear_default.xml    |  2 +-
 .../skins/default/xui/en/panel_outfits_list.xml    |  2 +-
 .../skins/default/xui/en/panel_outfits_wearing.xml |  2 +-
 .../newview/skins/default/xui/en/panel_people.xml  |  2 +-
 .../xui/en/panel_performance_autoadjustments.xml   |  2 +-
 .../xui/en/panel_performance_complexity.xml        |  2 +-
 .../default/xui/en/panel_performance_huds.xml      |  2 +-
 .../default/xui/en/panel_performance_nearby.xml    |  2 +-
 .../xui/en/panel_performance_preferences.xml       | 12 ++++----
 .../skins/default/xui/en/panel_pick_list_item.xml  |  2 +-
 .../skins/default/xui/en/panel_place_profile.xml   |  2 +-
 .../newview/skins/default/xui/en/panel_places.xml  |  2 +-
 .../default/xui/en/panel_postcard_message.xml      |  2 +-
 .../default/xui/en/panel_postcard_settings.xml     |  2 +-
 .../default/xui/en/panel_preferences_advanced.xml  |  4 +--
 .../default/xui/en/panel_preferences_alerts.xml    |  2 +-
 .../default/xui/en/panel_preferences_chat.xml      |  2 +-
 .../default/xui/en/panel_preferences_colors.xml    |  2 +-
 .../default/xui/en/panel_preferences_controls.xml  |  2 +-
 .../default/xui/en/panel_preferences_general.xml   |  2 +-
 .../default/xui/en/panel_preferences_graphics1.xml |  2 +-
 .../default/xui/en/panel_preferences_move.xml      |  2 +-
 .../default/xui/en/panel_preferences_privacy.xml   |  2 +-
 .../default/xui/en/panel_preferences_setup.xml     |  2 +-
 .../default/xui/en/panel_preferences_sound.xml     | 14 ++++-----
 .../default/xui/en/panel_preferences_uploads.xml   |  2 +-
 .../xui/en/panel_presets_camera_pulldown.xml       |  2 +-
 .../default/xui/en/panel_presets_pulldown.xml      |  2 +-
 .../default/xui/en/panel_prim_media_controls.xml   |  2 +-
 .../default/xui/en/panel_profile_classified.xml    |  2 +-
 .../default/xui/en/panel_profile_classifieds.xml   |  2 +-
 .../default/xui/en/panel_profile_firstlife.xml     |  2 +-
 .../skins/default/xui/en/panel_profile_notes.xml   |  2 +-
 .../skins/default/xui/en/panel_profile_pick.xml    |  4 +--
 .../skins/default/xui/en/panel_profile_picks.xml   |  2 +-
 .../default/xui/en/panel_profile_secondlife.xml    |  2 +-
 .../skins/default/xui/en/panel_profile_web.xml     |  2 +-
 .../skins/default/xui/en/panel_progress.xml        |  2 +-
 .../skins/default/xui/en/panel_region_access.xml   |  2 +-
 .../skins/default/xui/en/panel_region_covenant.xml |  2 +-
 .../skins/default/xui/en/panel_region_debug.xml    |  2 +-
 .../default/xui/en/panel_region_environment.xml    |  2 +-
 .../skins/default/xui/en/panel_region_estate.xml   |  2 +-
 .../default/xui/en/panel_region_experiences.xml    |  2 +-
 .../skins/default/xui/en/panel_region_general.xml  |  2 +-
 .../skins/default/xui/en/panel_region_terrain.xml  |  2 +-
 .../skins/default/xui/en/panel_script_ed.xml       |  2 +-
 .../default/xui/en/panel_script_experience.xml     |  1 +
 .../xui/en/panel_script_limits_my_avatar.xml       |  2 +-
 .../xui/en/panel_script_limits_region_memory.xml   |  2 +-
 .../default/xui/en/panel_script_question_toast.xml |  2 +-
 .../skins/default/xui/en/panel_scrolling_param.xml |  2 +-
 .../default/xui/en/panel_scrolling_param_base.xml  |  2 +-
 .../default/xui/en/panel_settings_sky_atmos.xml    |  2 +-
 .../default/xui/en/panel_settings_sky_clouds.xml   |  2 +-
 .../default/xui/en/panel_settings_sky_density.xml  |  2 +-
 .../default/xui/en/panel_settings_sky_sunmoon.xml  |  2 +-
 .../skins/default/xui/en/panel_settings_water.xml  |  2 +-
 .../default/xui/en/panel_side_tray_tab_caption.xml |  2 +-
 .../default/xui/en/panel_sidetray_home_tab.xml     |  2 +-
 .../default/xui/en/panel_snapshot_inventory.xml    |  4 +--
 .../skins/default/xui/en/panel_snapshot_local.xml  |  4 +--
 .../default/xui/en/panel_snapshot_options.xml      |  4 +--
 .../default/xui/en/panel_snapshot_postcard.xml     |  4 +--
 .../default/xui/en/panel_snapshot_profile.xml      |  4 +--
 .../skins/default/xui/en/panel_sound_devices.xml   |  3 +-
 .../default/xui/en/panel_stand_stop_flying.xml     |  2 +-
 .../skins/default/xui/en/panel_status_bar.xml      |  2 +-
 .../default/xui/en/panel_teleport_history.xml      |  2 +-
 .../default/xui/en/panel_teleport_history_item.xml |  2 +-
 .../skins/default/xui/en/panel_toolbar_view.xml    |  2 +-
 .../skins/default/xui/en/panel_tools_texture.xml   |  2 +-
 .../skins/default/xui/en/panel_topinfo_bar.xml     |  2 +-
 .../skins/default/xui/en/panel_voice_effect.xml    |  2 +-
 .../skins/default/xui/en/panel_volume_pulldown.xml | 14 ++++-----
 .../skins/default/xui/en/panel_world_map.xml       |  2 +-
 .../newview/skins/default/xui/en/role_actions.xml  |  2 +-
 .../newview/skins/default/xui/en/script_editor.xml |  2 +-
 .../skins/default/xui/en/sidepanel_appearance.xml  |  2 +-
 .../skins/default/xui/en/sidepanel_inventory.xml   |  2 +-
 .../skins/default/xui/en/sidepanel_item_info.xml   |  6 ++--
 .../skins/default/xui/en/sidepanel_task_info.xml   |  2 +-
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 .../skins/default/xui/en/teleport_strings.xml      |  2 +-
 .../skins/default/xui/en/widgets/accordion.xml     |  2 +-
 .../skins/default/xui/en/widgets/accordion_tab.xml |  2 +-
 .../skins/default/xui/en/widgets/avatar_icon.xml   |  2 +-
 .../default/xui/en/widgets/avatar_list_item.xml    |  2 +-
 .../newview/skins/default/xui/en/widgets/badge.xml |  2 +-
 .../default/xui/en/widgets/bodyparts_list_item.xml |  2 +-
 .../skins/default/xui/en/widgets/button.xml        |  2 +-
 .../skins/default/xui/en/widgets/chat_editor.xml   |  2 +-
 .../skins/default/xui/en/widgets/chat_history.xml  |  4 +--
 .../skins/default/xui/en/widgets/check_box.xml     |  2 +-
 .../skins/default/xui/en/widgets/chiclet_offer.xml |  4 +--
 .../skins/default/xui/en/widgets/chiclet_panel.xml |  4 +--
 .../default/xui/en/widgets/chiclet_script.xml      |  4 +--
 .../default/xui/en/widgets/clothing_list_item.xml  |  2 +-
 .../skins/default/xui/en/widgets/color_swatch.xml  |  2 +-
 .../skins/default/xui/en/widgets/combo_box.xml     |  2 +-
 .../skins/default/xui/en/widgets/context_menu.xml  |  2 +-
 .../en/widgets/conversation_view_participant.xml   |  2 +-
 .../xui/en/widgets/conversation_view_session.xml   |  2 +-
 .../en/widgets/deletable_wearable_list_item.xml    |  2 +-
 .../skins/default/xui/en/widgets/density_ctrl.xml  |  2 +-
 .../skins/default/xui/en/widgets/drop_down.xml     |  2 +-
 .../xui/en/widgets/dummy_clothing_list_item.xml    |  2 +-
 .../default/xui/en/widgets/expandable_text.xml     |  2 +-
 .../skins/default/xui/en/widgets/filter_editor.xml |  2 +-
 .../default/xui/en/widgets/flat_list_view.xml      |  4 +--
 .../skins/default/xui/en/widgets/floater.xml       |  2 +-
 .../skins/default/xui/en/widgets/flyout_button.xml |  4 +--
 .../default/xui/en/widgets/folder_view_item.xml    |  2 +-
 .../default/xui/en/widgets/gesture_combo_list.xml  |  2 +-
 .../skins/default/xui/en/widgets/group_icon.xml    |  2 +-
 .../skins/default/xui/en/widgets/hint_popup.xml    |  2 +-
 .../newview/skins/default/xui/en/widgets/icon.xml  |  2 +-
 .../xui/en/widgets/inbox_folder_view_folder.xml    |  2 +-
 .../xui/en/widgets/inbox_folder_view_item.xml      |  2 +-
 .../xui/en/widgets/inbox_inventory_panel.xml       |  2 +-
 .../skins/default/xui/en/widgets/inspector.xml     |  2 +-
 .../default/xui/en/widgets/inventory_list_item.xml |  2 +-
 .../default/xui/en/widgets/inventory_panel.xml     |  2 +-
 .../skins/default/xui/en/widgets/joystick_quat.xml |  2 +-
 .../default/xui/en/widgets/joystick_rotate.xml     |  2 +-
 .../skins/default/xui/en/widgets/layout_stack.xml  |  2 +-
 .../skins/default/xui/en/widgets/line_editor.xml   |  2 +-
 .../skins/default/xui/en/widgets/list_view.xml     |  2 +-
 .../default/xui/en/widgets/loading_indicator.xml   |  4 +--
 .../default/xui/en/widgets/location_input.xml      |  2 +-
 .../newview/skins/default/xui/en/widgets/menu.xml  |  2 +-
 .../skins/default/xui/en/widgets/menu_bar.xml      |  2 +-
 .../skins/default/xui/en/widgets/menu_item.xml     |  2 +-
 .../default/xui/en/widgets/menu_item_call.xml      |  2 +-
 .../default/xui/en/widgets/menu_item_check.xml     |  2 +-
 .../default/xui/en/widgets/menu_item_separator.xml |  2 +-
 .../default/xui/en/widgets/menu_item_tear_off.xml  |  2 +-
 .../skins/default/xui/en/widgets/multi_slider.xml  |  2 +-
 .../default/xui/en/widgets/multi_slider_bar.xml    |  2 +-
 .../skins/default/xui/en/widgets/name_editor.xml   |  4 +--
 .../skins/default/xui/en/widgets/name_list.xml     |  2 +-
 .../xui/en/widgets/notification_list_view.xml      |  4 +--
 .../default/xui/en/widgets/output_monitor.xml      |  2 +-
 .../newview/skins/default/xui/en/widgets/panel.xml |  4 +--
 .../default/xui/en/widgets/panel_camera_item.xml   |  2 +-
 .../default/xui/en/widgets/person_tab_view.xml     |  2 +-
 .../skins/default/xui/en/widgets/person_view.xml   |  2 +-
 .../skins/default/xui/en/widgets/progress_bar.xml  |  2 +-
 .../skins/default/xui/en/widgets/radio_group.xml   |  2 +-
 .../skins/default/xui/en/widgets/radio_item.xml    |  2 +-
 .../skins/default/xui/en/widgets/scroll_bar.xml    |  2 +-
 .../xui/en/widgets/scroll_column_header.xml        |  2 +-
 .../default/xui/en/widgets/scroll_container.xml    |  2 +-
 .../skins/default/xui/en/widgets/scroll_list.xml   |  2 +-
 .../xui/en/widgets/scrolling_panel_list.xml        |  4 +--
 .../default/xui/en/widgets/search_combo_box.xml    |  4 +--
 .../skins/default/xui/en/widgets/search_editor.xml |  2 +-
 .../skins/default/xui/en/widgets/side_tray.xml     |  2 +-
 .../skins/default/xui/en/widgets/sidetray_tab.xml  |  2 +-
 .../default/xui/en/widgets/simple_text_editor.xml  |  2 +-
 .../skins/default/xui/en/widgets/slider.xml        |  2 +-
 .../skins/default/xui/en/widgets/slider_bar.xml    |  2 +-
 .../skins/default/xui/en/widgets/spinner.xml       |  4 +--
 .../skins/default/xui/en/widgets/split_button.xml  |  2 +-
 .../default/xui/en/widgets/sun_moon_trackball.xml  |  2 +-
 .../skins/default/xui/en/widgets/tab_container.xml |  2 +-
 .../skins/default/xui/en/widgets/talk_button.xml   |  2 +-
 .../xui/en/widgets/teleport_history_menu_item.xml  |  2 +-
 .../newview/skins/default/xui/en/widgets/text.xml  |  2 +-
 .../skins/default/xui/en/widgets/text_editor.xml   |  2 +-
 .../skins/default/xui/en/widgets/textbase.xml      |  2 +-
 .../default/xui/en/widgets/texture_picker.xml      |  2 +-
 .../newview/skins/default/xui/en/widgets/time.xml  |  2 +-
 .../default/xui/en/widgets/toggleable_menu.xml     |  2 +-
 .../skins/default/xui/en/widgets/tool_tip.xml      |  2 +-
 .../skins/default/xui/en/widgets/toolbar.xml       |  2 +-
 .../skins/default/xui/en/widgets/ui_ctrl.xml       |  2 +-
 .../skins/default/xui/en/widgets/view_border.xml   |  4 +--
 .../xui/en/widgets/wearable_outfit_list_item.xml   |  2 +-
 .../skins/default/xui/en/widgets/web_browser.xml   |  2 +-
 .../skins/default/xui/en/widgets/window_shade.xml  |  2 +-
 .../skins/default/xui/en/widgets/xy_vector.xml     |  2 +-
 indra/newview/skins/default/xui/en/xui_version.xml |  2 +-
 582 files changed, 694 insertions(+), 688 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
index a60e9afab1..aa408e2380 100644
--- a/indra/newview/skins/default/xui/en/alert_button.xml
+++ b/indra/newview/skins/default/xui/en/alert_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <button
   name="Alert Button"
diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml
index 5535a5dc2a..21266da3b2 100644
--- a/indra/newview/skins/default/xui/en/alert_check_box.xml
+++ b/indra/newview/skins/default/xui/en/alert_check_box.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <check_box
   label_text.text_color="LabelTextColor"
   label_text.text_readonly_color="LabelDisabledColor"
   font="SansSerif"
   follows="left|top"
-  name="check"/>
\ No newline at end of file
+  name="check"/>
diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml
index b0886fce06..d62addb982 100644
--- a/indra/newview/skins/default/xui/en/alert_icon.xml
+++ b/indra/newview/skins/default/xui/en/alert_icon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <icon color="1.0 1.0 1.0 1.0"
       tab_stop="false"
       mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
index 54dbc698c8..78b97a2a7e 100644
--- a/indra/newview/skins/default/xui/en/alert_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <line_editor
   select_on_focus="false"
   revert_on_esc="true"
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
index 24cbb2b885..74e8b9e5f9 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
     <rows
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
index e707aaf22c..9d57638835 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
     <columns
      relative_width="0.34"
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_editing.xml b/indra/newview/skins/default/xui/en/control_table_contents_editing.xml
index 2a3314840a..9876e43d8f 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_editing.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_editing.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
     <rows
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_media.xml b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
index 43e8d730cd..5d5b6ed3ce 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_media.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
     <rows
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_movement.xml b/indra/newview/skins/default/xui/en/control_table_contents_movement.xml
index b410d2dc1c..c9a1c4654e 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_movement.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_movement.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <contents>
     <rows
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index e7dd62eb64..ab55c80ba2 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml-->
 <!-- All buttons in the Favorites bar will be created from this one -->
 <button
diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
index 23d054105f..70bcaf86be 100644
--- a/indra/newview/skins/default/xui/en/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater can_resize="true"
          height="400"
          layout="topleft"
@@ -133,4 +133,4 @@
       Click and drag on the image to pan
     </text>
   </panel>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index d11373ce1d..950ed192c0 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_minimize="false"
  can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 1ad7811d85..ff2fa93cbb 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="centered"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index b1ed245378..8641c43d66 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  can_tear_off="false"
@@ -290,7 +290,7 @@
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      left_pad="3"
-     name="info_btn"
+     name="info_btn1"
      top_delta="-2"
      width="16" />
             <button
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
index b79c5d9a19..4c4ed9527c 100644
--- a/indra/newview/skins/default/xui/en/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
 	name="floater_activeim"
diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
index ac88263aa1..870ddee554 100644
--- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  height="405"
  width="900"
diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
index c4ffba33fd..1aa96ae261 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="180"
diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
index 0c62bfe304..ebb81f1266 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_associate_listing.xml b/indra/newview/skins/default/xui/en/floater_associate_listing.xml
index 0f7ed24103..5ebdb6ce42 100644
--- a/indra/newview/skins/default/xui/en/floater_associate_listing.xml
+++ b/indra/newview/skins/default/xui/en/floater_associate_listing.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
index 9c6d114c4c..56a2f51c43 100644
--- a/indra/newview/skins/default/xui/en/floater_auction.xml
+++ b/indra/newview/skins/default/xui/en/floater_auction.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
index 9cfb562001..c1752f9869 100644
--- a/indra/newview/skins/default/xui/en/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  border="true"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index 3df2683ca8..f18bad2d4e 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  legacy_header_height="225"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index af6d11f47e..adbce0d982 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
index d222dca98b..aca5ddf3ef 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_resize="true"
  positioning="cascading"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
index 6540f5e348..09026884b9 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="700"
@@ -453,4 +453,4 @@ Textures
 </panel>
 </panel>
 </scroll_container>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_ban_duration.xml b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
index 6c537cc08d..2b3acd2907 100644
--- a/indra/newview/skins/default/xui/en/floater_ban_duration.xml
+++ b/indra/newview/skins/default/xui/en/floater_ban_duration.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_minimize="false"
  can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
index d5947fc0af..bfe1f7fc3a 100644
--- a/indra/newview/skins/default/xui/en/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="310"
@@ -157,7 +157,7 @@
          font="SansSerif"
          left="0"
          top_pad="7"
-         name="label_objects"
+         name="label_objects1"
          text_color="White"
          type="string">
            Show direction to:
diff --git a/indra/newview/skins/default/xui/en/floater_big_preview.xml b/indra/newview/skins/default/xui/en/floater_big_preview.xml
index c0bdd3d9bd..362853d06f 100644
--- a/indra/newview/skins/default/xui/en/floater_big_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_big_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   positioning="cascading"
   can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index 38428b36fc..55f9f1af16 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="170"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 431c33a339..b8a27b544e 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml
index 126e3aac48..874c05eec8 100644
--- a/indra/newview/skins/default/xui/en/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/en/floater_bumps.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="180"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index ac96a70805..6b6f497808 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 0637eedfb2..996937cd45 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_resize="false"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index 9fe56e447e..889339c38d 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 1f7d52dbf5..2dec53ff7d 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 9deb38e3af..4655a4d394 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="specified"
  right="-460"
diff --git a/indra/newview/skins/default/xui/en/floater_camera_presets.xml b/indra/newview/skins/default/xui/en/floater_camera_presets.xml
index 930357f568..702d5d1b17 100644
--- a/indra/newview/skins/default/xui/en/floater_camera_presets.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera_presets.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
index 726cb38481..223069ed0c 100644
--- a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_resize="false"
  height="366"
diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml
index 2cf6e682fd..beb6e490de 100644
--- a/indra/newview/skins/default/xui/en/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/en/floater_choose_group.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="258"
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
index e06d10606a..397b66fbd2 100644
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 19a4cbc119..3fbccfcd84 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <floater
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
index 99ad59a7a3..27913baff6 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_create_landmark.xml b/indra/newview/skins/default/xui/en/floater_create_landmark.xml
index 632daaec7e..ba2527e550 100644
--- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml
+++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_resize="false"
  show_title="false"
diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
index 143bcb4430..caa4a2292c 100644
--- a/indra/newview/skins/default/xui/en/floater_critical.xml
+++ b/indra/newview/skins/default/xui/en/floater_critical.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_close="false"
diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
index 3360d7bec9..ad724fb2aa 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="130"
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 4fe8e3bdd1..58dc6741b2 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"	
  legacy_header_height="225"
diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index f3431da858..1205b0a1d6 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index f3d7c38a76..2eacc8150e 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
         layout="topleft"
         name="env_edit_extdaycycle"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
index 3570456b44..c831684594 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  legacy_header_height="225"
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index cf61b7d24d..67eb4931e1 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  height="400"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_experience_search.xml b/indra/newview/skins/default/xui/en/floater_experience_search.xml
index 15a4b5665e..60c95a8a0c 100644
--- a/indra/newview/skins/default/xui/en/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_experience_search.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   positioning="cascading"
   legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index 588aca38e6..d59b292b28 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <floater
   name="experience_profile"
diff --git a/indra/newview/skins/default/xui/en/floater_experiences.xml b/indra/newview/skins/default/xui/en/floater_experiences.xml
index 442da887c5..72b1a46e65 100644
--- a/indra/newview/skins/default/xui/en/floater_experiences.xml
+++ b/indra/newview/skins/default/xui/en/floater_experiences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <floater
   can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 645003cc14..f5852fdfaf 100644
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_fbc_web.xml b/indra/newview/skins/default/xui/en/floater_fbc_web.xml
index 0d35e22a19..b0a7305094 100644
--- a/indra/newview/skins/default/xui/en/floater_fbc_web.xml
+++ b/indra/newview/skins/default/xui/en/floater_fbc_web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_fbc_web"
          help_topic="fbc_web"
          width="780"
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index 45f3880a15..f424f67df0 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
         can_tear_off="false"
         can_resize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml
index 3ab19ec9d9..61cb91e2f3 100644
--- a/indra/newview/skins/default/xui/en/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/en/floater_font_test.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_forget_user.xml b/indra/newview/skins/default/xui/en/floater_forget_user.xml
index a9ec1b74a3..62422ba478 100644
--- a/indra/newview/skins/default/xui/en/floater_forget_user.xml
+++ b/indra/newview/skins/default/xui/en/floater_forget_user.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="258"
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index 9f051d9f8d..832716c600 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index e7131e20cb..f8ec696af9 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="384"
diff --git a/indra/newview/skins/default/xui/en/floater_goto_line.xml b/indra/newview/skins/default/xui/en/floater_goto_line.xml
index b236888219..99be81cc1c 100644
--- a/indra/newview/skins/default/xui/en/floater_goto_line.xml
+++ b/indra/newview/skins/default/xui/en/floater_goto_line.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  default_tab_group="1"
@@ -41,4 +41,4 @@
      tab_group="1"
      top="21"
      width="85" />
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_grid_status.xml b/indra/newview/skins/default/xui/en/floater_grid_status.xml
index bf78204282..d42fec3ece 100644
--- a/indra/newview/skins/default/xui/en/floater_grid_status.xml
+++ b/indra/newview/skins/default/xui/en/floater_grid_status.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   positioning="cascading"
   legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index c06cb63f8a..76895df732 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml
index 19e42798af..5b00d23faa 100644
--- a/indra/newview/skins/default/xui/en/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/en/floater_how_to.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   legacy_header_height="18"
   can_resize="false"
@@ -13,4 +13,4 @@
   width="310"
   rel_x="-0.469309"
   rel_y="-0.011166"
-  filename="floater_web_content.xml"/>
\ No newline at end of file
+  filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml
index e2d860881a..2a8d2ad5ef 100644
--- a/indra/newview/skins/default/xui/en/floater_hud.xml
+++ b/indra/newview/skins/default/xui/en/floater_hud.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 34fa0b0fe9..4df29c47de 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater
  can_close="true"  
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index da84fbeea6..67ddc6183c 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  background_visible="true"
  height="355"
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
index 773d9aafc9..79f62c4dbc 100644
--- a/indra/newview/skins/default/xui/en/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_import_collada.xml b/indra/newview/skins/default/xui/en/floater_import_collada.xml
index 441ab6a2de..baea660f30 100644
--- a/indra/newview/skins/default/xui/en/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/en/floater_import_collada.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater can_close="false" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="160" min_height="160" width="300" min_width="300"
      name="Import Collada" title="Import Scene">
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index a7864381a9..169d4c9d24 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_close="false"
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index 802a6649c8..9403d58441 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 850e1be372..6c3214a76d 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="340"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index 2e619d91fb..156bba6c27 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_close="true"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index d783d1e23c..fff0b3d31a 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_item_properties.xml b/indra/newview/skins/default/xui/en/floater_item_properties.xml
index 336bb902ca..fc9351bff2 100644
--- a/indra/newview/skins/default/xui/en/floater_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_item_properties.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="570"
diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index 7d2cea1fe5..e6f0420698 100644
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="500"
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index b24c745bdd..eab66ab83e 100644
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="170"
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 390ec9ab7d..affd2b196d 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="centered"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_linkreplace.xml b/indra/newview/skins/default/xui/en/floater_linkreplace.xml
index ece75e2576..1fa039f2d1 100644
--- a/indra/newview/skins/default/xui/en/floater_linkreplace.xml
+++ b/indra/newview/skins/default/xui/en/floater_linkreplace.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  name="linkreplace"
  help_topic="linkreplace"
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 88173e68fa..e30c519c8a 100644
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   legacy_header_height="18"
   bevel_style="none"
diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
index 49c21f1ea7..ba1b812d28 100644
--- a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="130"
diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
index e9676777f4..17a07c5ec2 100644
--- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 9639e70544..eba5684819 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  can_minimize="true" 
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
index 9035a7c161..368a8b26ca 100644
--- a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
+++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
     title="Audit Marketplace Listings"
     name="floater_marketplace_validation"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index ce788654aa..5ea751dc7c 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml
index 0e03c0ab6d..4545855811 100644
--- a/indra/newview/skins/default/xui/en/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_close="true" 
diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
index fb7d09a21e..af45974e0e 100644
--- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_mfa.xml b/indra/newview/skins/default/xui/en/floater_mfa.xml
index a649cc6d47..e8be95612d 100644
--- a/indra/newview/skins/default/xui/en/floater_mfa.xml
+++ b/indra/newview/skins/default/xui/en/floater_mfa.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  title="MFA Token Requred"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 21c894d3af..5dcac85b4f 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_close="true"
  can_drag_on_left="false"
@@ -745,7 +745,7 @@
              height="0"
              layout="topleft"
              left="10"
-             name="lod_tab_border"
+             name="lod_tab_border1"
              top_pad="20"
              width="614" />
             <check_box
@@ -858,7 +858,7 @@
               height="0"
               layout="topleft"
               left="18"
-              name="physics_tab_border"
+              name="physics_tab_border1"
               top_pad="10"
               width="589"/>
                 <panel
@@ -965,7 +965,7 @@
               height="0"
               layout="topleft"
               left="18"
-              name="physics_tab_border"
+              name="physics_tab_border2"
               top_pad="10"
               width="589"/>
                 <panel
@@ -1073,7 +1073,7 @@
               height="0"
               layout="topleft"
               left="18"
-              name="physics_tab_border"
+              name="physics_tab_border3"
               top_pad="10"
               width="589"/>
                 <panel
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 90166232e9..fc7c418ca8 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="specified"
  right="-693"
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
index 22b0a1783f..2d992dfa72 100644
--- a/indra/newview/skins/default/xui/en/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_my_scripts.xml b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
index ee6defce9d..ad89787031 100644
--- a/indra/newview/skins/default/xui/en/floater_my_scripts.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_scripts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
index df46fc198f..e7b2abda62 100644
--- a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_my_web_profile"
          help_topic="web_profile"
          width="780"
@@ -6,4 +6,4 @@
          save_rect="true"
          single_instance="true"
          reuse_instance="false"
-         filename="floater_web_content.xml"/>
\ No newline at end of file
+         filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
index 5f0eeab71c..8db4b83fc7 100644
--- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  height="130"
  width="300"
diff --git a/indra/newview/skins/default/xui/en/floater_notification.xml b/indra/newview/skins/default/xui/en/floater_notification.xml
index 1f9ddecac2..32345981e4 100644
--- a/indra/newview/skins/default/xui/en/floater_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_notification.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
index e243ccd2f9..46a824a8b0 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
index 889efa061c..5e4b017590 100644
--- a/indra/newview/skins/default/xui/en/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_close="true"
  can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index ec03d7d32c..bc04dc9f46 100644
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
index bbe280582b..98cb997c66 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_close="false"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index ae1fb4cccd..328ee2b835 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_close="false"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 7242c734cf..37fed38af6 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
     positioning="cascading"
     can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index eb37cf214c..296cec5693 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
     positioning="cascading"
     can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index 59117c0178..4a07000db8 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
     positioning="cascading"
     can_resize="true"
@@ -372,7 +372,7 @@
       follows="left|bottom|right"
       height="0"
       layout="topleft"
-      name="horiz_separator"
+      name="horiz_separator1"
       top_pad="0"
       left="18"
       width="1039"/>
diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index 3e3f8b49ce..6865bd0a64 100644
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index f1e27b918e..3c1d79940c 100644
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 0cc0ca1ce4..41149bfe1b 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <floater
   positioning="cascading"
diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index d1a1119f77..dac8a71b2d 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  height="642"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 49dc719a24..a978da2277 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="250"
diff --git a/indra/newview/skins/default/xui/en/floater_pick_track.xml b/indra/newview/skins/default/xui/en/floater_pick_track.xml
index d8a9877be2..103422a04d 100644
--- a/indra/newview/skins/default/xui/en/floater_pick_track.xml
+++ b/indra/newview/skins/default/xui/en/floater_pick_track.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <floater
         legacy_header_height="0"
diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
index 05943a10d3..37339f79c8 100644
--- a/indra/newview/skins/default/xui/en/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/en/floater_post_process.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="400"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index c4adf0409d..4b0e0bb221 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  positioning="centered"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 11c2d11987..4ac28c5c06 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   height="400"
   layout="topleft"
@@ -699,11 +699,11 @@
         value="-2"/>
       <combo_box.item
         label="None; transparent"
-        name="0"
+        name="02"
         value="-1"/>
       <combo_box.item
         label="Minimal"
-        name="0"
+        name="03"
         value="0"/>
       <combo_box.item
         label="Terrain and trees"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 659033efd4..fb5af72456 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="500"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
index 4c3c7e4930..18d3c66d63 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  height="190"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index d1f8da55be..d116e574c6 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="241"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index c4ac936334..615dbdb025 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="460"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index dcbdfa8794..e073102651 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
index 83a1f5a96f..78d69d3e09 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="85"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 048cf7df62..2957cbd3a7 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_trash.xml b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
index 3fa71e7bfe..f1c87c8c5a 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_trash.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
index 6312366b86..0b1e23c27e 100644
--- a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
index 9f3b4d9a00..e434face8b 100644
--- a/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile_permissions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_resize="false"
  show_title="false"
diff --git a/indra/newview/skins/default/xui/en/floater_profile_texture.xml b/indra/newview/skins/default/xui/en/floater_profile_texture.xml
index 3b351a3325..5da14b75ab 100644
--- a/indra/newview/skins/default/xui/en/floater_profile_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_profile_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_resize="false"
  show_title="false"
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index 84e0b489d0..2d7d03f7a0 100644
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index 11172d8a3e..c7fd9da219 100644
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   name="region_debug_console"
   title="Region Debug"
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 3b58cd08f6..a7bbfc9842 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="555"
diff --git a/indra/newview/skins/default/xui/en/floater_region_restarting.xml b/indra/newview/skins/default/xui/en/floater_region_restarting.xml
index 2fe4d0190a..825f90d265 100644
--- a/indra/newview/skins/default/xui/en/floater_region_restarting.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_restarting.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  height="150"
  width="290"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index 343e72f057..59572c79da 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="580"
diff --git a/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
index 54fdb6d167..ce86bd65f7 100644
--- a/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="185"
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 62260274f5..dbfbc058c0 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="145"
diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index b757f4eab8..be43283a52 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater legacy_header_height="18"
          can_resize="true"
          height="400"
@@ -119,7 +119,7 @@
                     tick_spacing="100"
                     show_history="true"
                     show_bar="false"/>
-          <stat_bar name="texture_decode_latency"
+          <stat_bar name="texture_decode_latency1"
                     label="Cache Write Latency"
                     orientation="horizontal"
                     unit_label="sec"
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index bd4edb81c8..ae6e68de17 100644
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml
index 6c49cfa1a8..da269e0705 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater
  can_resize="true"
  height="233"
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
index b5dd2f97b9..c58f5b9d43 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 8ae1e74d52..0b39d204be 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml
index 96b2ceec63..a0d2b74b5b 100644
--- a/indra/newview/skins/default/xui/en/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index 91c18035db..b0b105fe58 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml
index 0982683a7f..a98437ab1d 100644
--- a/indra/newview/skins/default/xui/en/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml
index ade0156bc7..9cd6218982 100644
--- a/indra/newview/skins/default/xui/en/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_search.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  default_tab_group="1"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index c3e7028dc5..fc1e32915a 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   positioning="cascading"
   legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 998948fca1..13362c26a7 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  border="false"
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 52de9ddd47..ff7a0d0317 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
index e4fda5cd10..a93be6a18d 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 3a26c3b547..371a9bc4c3 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
         legacy_header_height="18"
         can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index 484ad159d1..0b91e13632 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index fcd24d83bb..fe77256f52 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  legacy_header_height="18"
@@ -226,7 +226,7 @@
          height="1"
          left="10"
          layout="topleft"
-         name="advanced_options_hr"
+         name="advanced_options_hr1"
          right="-1"
          top_pad="7"
          />
diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
index 3889b975a9..61fb228926 100644
--- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="180"
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
index 76a350dd29..2575bef48f 100644
--- a/indra/newview/skins/default/xui/en/floater_spellcheck.xml
+++ b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  border="true"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
index 94393a6c77..a3109a15a8 100644
--- a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  border="true"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 63402f3856..de6dc61724 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater legacy_header_height="18"
          can_resize="true"
          height="400"
diff --git a/indra/newview/skins/default/xui/en/floater_task_properties.xml b/indra/newview/skins/default/xui/en/floater_task_properties.xml
index 56c236eab4..ecec41c663 100644
--- a/indra/newview/skins/default/xui/en/floater_task_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_task_properties.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="590"
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index 547613fb67..9d4fb82ec6 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Explicit left edge to avoid overlapping build tools -->
 <floater
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml
index 9bc05107a2..90eaa09e13 100644
--- a/indra/newview/skins/default/xui/en/floater_test_button.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 95aaadfcf3..0b44350846 100644
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
index 45e2e34da7..4211d624ac 100644
--- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
index 209285da2e..c195f021e3 100644
--- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml
index 94f7e0b798..bade805cdb 100644
--- a/indra/newview/skins/default/xui/en/floater_test_layout.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
index a3ed22f422..70361cc8da 100644
--- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
         can_resize="true"
         can_close="true"
@@ -26,7 +26,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex2"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -36,7 +36,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex3"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -46,7 +46,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex4"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -56,7 +56,7 @@
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
     </layout_stack>
-    <layout_stack name="test_stack"
+    <layout_stack name="test_stack1"
             left_pad="5"
             top="0"
             width="100"
@@ -71,7 +71,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex2"
                 auto_resize="true"
                 user_resize="true"
                 visible="false"
@@ -89,7 +89,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="black">fixed</text>
         </layout_panel>
-        <layout_panel name="fixed"
+        <layout_panel name="fixed2"
                 auto_resize="false"
                 user_resize="true"
                 height="50"
@@ -98,7 +98,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="black">fixed</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex3"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -106,7 +106,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex4"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -114,7 +114,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex5"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -122,7 +122,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex6"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -132,7 +132,7 @@
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
     </layout_stack>
-    <layout_stack name="test_stack"
+    <layout_stack name="test_stack2"
             left_pad="5"
             top="0"
             width="100"
@@ -155,7 +155,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="black">fixed</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex2"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -164,7 +164,7 @@
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
     </layout_stack>
-    <layout_stack name="test_stack"
+    <layout_stack name="test_stack3"
             left_pad="5"
             top="0"
             width="100"
@@ -179,7 +179,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="black">fixed</text>
         </layout_panel>
-        <layout_panel name="fixed"
+        <layout_panel name="fixed2"
                 auto_resize="false"
                 user_resize="true"
                 height="50"
@@ -187,7 +187,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="black">fixed</text>
         </layout_panel>
-        <layout_panel name="fixed"
+        <layout_panel name="fixed3"
                 auto_resize="false"
                 user_resize="true"
                 height="50"
@@ -204,7 +204,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex2"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
@@ -213,7 +213,7 @@
                 background_visible="true">
             <text follows="top|left|right" halign="center" text_color="white">flex</text>
         </layout_panel>
-        <layout_panel name="flex"
+        <layout_panel name="flex3"
                 auto_resize="true"
                 user_resize="true"
                 bg_alpha_color="blue"
diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
index 2894ad2a32..2eea5c361f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
@@ -75,7 +75,7 @@
   <line_editor
    height="20"
    left_delta="0"
-   name="left_pad_editor"
+   name="left_pad_editor1"
    text_pad_right="75"
    top_pad="10"
    width="200">
@@ -84,7 +84,7 @@
   <line_editor
    height="20"
    left_delta="0"
-   name="left_pad_editor"
+   name="left_pad_editor2"
    text_pad_left="25"
    text_pad_right="75"
    top_pad="10"
diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
index 32ccc31dfd..9fdeeb08b4 100644
--- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
index f4a50ecc96..0e54d332cd 100644
--- a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
index db14ecae83..505de80f55 100644
--- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml
index 20bd555a03..d86c43b48c 100644
--- a/indra/newview/skins/default/xui/en/floater_test_slider.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
index acd49aa492..5fa0b20d4f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
index e1fefc3631..ab3b819e34 100644
--- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
@@ -24,7 +24,7 @@
    follows="top|left|bottom"
    font="SansSerif" 
    left="10"
-   name="test_text_editor"
+   name="test_text_editor1"
    tool_tip="text editor"
    top_pad="10"
    width="200">
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
index d11373ce1d..950ed192c0 100644
--- a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  can_minimize="false"
  can_tear_off="false"
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 1d31fbd6dc..023df69f0f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
@@ -82,7 +82,7 @@
   </text>
   <text
  left="10"
- name="v_pad_text"
+ name="v_pad_text1"
  height="40"
  width="300"
  halign="left"
@@ -197,7 +197,7 @@ scroll bar gjyrrr
       follows="top|left|bottom"
       font="Monospace"
  left_delta="0"
- name="monospace_text_editor"
+ name="monospace_text_editor1"
  tool_tip="text editor"
  top_pad="10"
  width="200">
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 067c1fed82..41d95c5a15 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 10854f5a49..3271cddd52 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Sample "floater" window with examples of common widgets.
 
     Notes:
@@ -300,7 +300,7 @@
    layout="topleft"
    width="60"
    use_ellipses="true"
-   name="test_text"
+   name="test_text1"
    tool_tip="text">
     Truncated text here
   </text>
@@ -395,7 +395,7 @@ line to actually fit
        width="250" 
        follows="top|left"
        font.name="SansSerifSmall"
-       name="test_text10"
+       name="test_text101"
        tool_tip="text">
         SansSerifSmall.  Русский 中文 (简体)
       </text>
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 8081af6673..a3b9f691c2 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index 9278a1a598..3266f43324 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 684470e0fc..6ef6823c98 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  positioning="cascading"
  legacy_header_height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index a8b4b84ab7..028c81a84c 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 7e172e138a..4d840ddde2 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_close="false"
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index bdc04a8a78..7fe9830d23 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   can_close="true"
   can_dock="false"
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index 3f3331b468..ab1a241025 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  height="470"
@@ -302,7 +302,7 @@
   layout="topleft"
   left="185"
   length="1"
-  name="google_links_text"
+  name="google_links_text1"
   top_delta="-23"
   type="string"
   width="100">
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index eb01294831..4a523b6d1d 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml
index 2dfc0fd125..769a3b0ec6 100644
--- a/indra/newview/skins/default/xui/en/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
index 5c71fd3bc6..51809793d3 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <floater
  legacy_header_height="25"
@@ -45,4 +45,4 @@
 		name="mute_audio"
 		tab_stop="false"
 		width="16" />
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 146c3d7e30..d037bdb813 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="27"
  can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
index 9346295d5b..4e3dc5edf1 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_volume.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 9a097d933b..2e1dfa00c7 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   legacy_header_height="18"
   can_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml
index d0225f78a9..51b5336066 100644
--- a/indra/newview/skins/default/xui/en/floater_web_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_web_profile"
          help_topic="web_profile"
          width="780"
          height="775"
-         filename="floater_web_content.xml"/>
\ No newline at end of file
+         filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
index 897d959b98..4e75b2b29c 100644
--- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_minimize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml
index 115fe413f3..e5a1c0da88 100644
--- a/indra/newview/skins/default/xui/en/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/en/floater_window_size.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
   can_minimize="false" 
   can_resize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index c965a4427c..d13ab35d6d 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
  can_resize="true"
@@ -264,7 +264,7 @@
      image_name="legend.tga"
      layout="topleft"
      mouse_opaque="true"
-     name="square2"
+     name="square21"
      left="20"
      top_pad="-5"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 3c3eb6b66f..1f4ff860da 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <fonts>
 
   <font name="default" comment="default font files (global fallbacks)">
@@ -51,19 +51,19 @@
       </os>
   </font>
 
-  <font name="SansSerif"
+  <font name="SansSerif1"
 	comment="Name of bold sans-serif font"
 	font_style="BOLD">
     <file>DejaVuSans-Bold.ttf</file>
   </font>
 
-  <font name="SansSerif"
+  <font name="SansSerif2"
 	comment="Name of italic sans-serif font"
 	font_style="ITALIC">
     <file>DejaVuSans-Oblique.ttf</file>
   </font>
 
-  <font name="SansSerif"
+  <font name="SansSerif3"
 	comment="Name of bold italic sans-serif font"
 	font_style="BOLD|ITALIC">
     <file>DejaVuSans-BoldOblique.ttf</file>
@@ -79,19 +79,19 @@
     <file>DejaVuSans.ttf</file>
   </font>
 
-  <font name="DejaVu"
+  <font name="DejaVu1"
 	comment="Name of DejaVu font (bold)"
 	font_style="BOLD">
     <file>DejaVuSans-Bold.ttf</file>
   </font>
 
-  <font name="DejaVu"
+  <font name="DejaVu2"
 	comment="Name of DejaVu font (italic)"
 	font_style="ITALIC">
     <file>DejaVuSans-Oblique.ttf</file>
   </font>
 
-  <font name="DejaVu"
+  <font name="DejaVu3"
 	comment="Name of DejaVu font (bold italic)"
 	font_style="BOLD|ITALIC">
     <file>DejaVuSans-BoldOblique.ttf</file>
@@ -108,7 +108,7 @@
       </os>
   </font>
 
-  <font name="Helvetica"
+  <font name="Helvetica1"
 	comment="Name of Helvetica font (bold)"
 	font_style="BOLD">
     <file>DejaVuSans-Bold.ttf</file>
@@ -120,7 +120,7 @@
       </os>
   </font>
 
-  <font name="Helvetica"
+  <font name="Helvetica2"
 	comment="Name of Helvetica font (italic)"
 	font_style="ITALIC">
     <file>DejaVuSans-Oblique.ttf</file>
@@ -132,7 +132,7 @@
       </os>
   </font>
 
-  <font name="Helvetica"
+  <font name="Helvetica3"
 	comment="Name of Helvetica font (bold italic)"
 	font_style="BOLD|ITALIC">
     <file>DejaVuSans-BoldOblique.ttf</file>
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index fceb9b2184..4c72bc4703 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index a69585074c..c190d9610f 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index bfeb8fc470..efe518f2f7 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
index e83257d2a0..2d0a9ccb3c 100644
--- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml
index 0221397a8c..48df86804e 100644
--- a/indra/newview/skins/default/xui/en/inspect_toast.xml
+++ b/indra/newview/skins/default/xui/en/inspect_toast.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
index a7ecc39ed8..6a89468dc9 100644
--- a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <button
  chrome="true"
  image_selected="Info_Over"
@@ -6,4 +7,4 @@
  height="12"
  name="inspector_info_ctrl"
  width="12" />
- 
\ No newline at end of file
+ 
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index d418fc38e3..dd521c09d0 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.-->
 <strings>
 
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index bab37c6258..a4ef4a57ce 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="left|right|top|bottom"
  height="768"
diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
index 5033ea9546..e3b248d17b 100644
--- a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Add Wearable Gear Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 22006c287f..d51e568c03 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_avatar_other.xml -->
 <context_menu
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 3b91b9df7a..4d02f35bd4 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Attachment Pie">
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 9f394a4c74..0d3dd2a479 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 665eb9a82f..fc4ffde947 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml
index 1a18483418..dc9007c61d 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Settings">
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
index 6e09eb5981..7eca0b51a6 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu 
      name="menu_settings_add.xml"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index 20f3ad080b..fc8c7fea9c 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Self Pie">
diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
index 3f545c936d..23049aae06 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="COF Attachment">
diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
index f0e8461360..157d5739e5 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="COF Body">
diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
index 206d49e8c7..a0bd8b4bc9 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="COF Clothing">
diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
index 45cf780557..a491e272cf 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Gear COF">
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 59e6106a28..62cdaa5886 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
index a1a3afbf68..9c803d0877 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Conversation Context Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
index ce65b23971..864bec5d9a 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
      name="menu_conversation_view"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml
index 4c12180daf..6605dd8eb9 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_color.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Color Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml
index 4823d74a26..6791a5ec8b 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_features.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Features Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml
index 5de23dfee3..5a0411ca27 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_light.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Light Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml
index bdc4537a9d..66cfd29ba4 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Object Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml
index 3ea95b281f..6c68994a80 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_pos.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Position Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml
index 06ce80f897..400af57371 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_rot.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Rotation Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml
index 7082a0e65b..3547f3b367 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_size.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Size Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml
index f358affc23..a6d8fc1c9c 100644
--- a/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Copy Paste Texture Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml
index 6f83756f83..8406c744e2 100644
--- a/indra/newview/skins/default/xui/en/menu_edit.xml
+++ b/indra/newview/skins/default/xui/en/menu_edit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu create_jump_keys="true"
       label="Edit"
       name="Edit"
@@ -81,4 +81,4 @@
     <menu_item_call.on_enable
      function="Edit.EnableDeselect" />
   </menu_item_call>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
index 0eab7c451b..6345394b46 100644
--- a/indra/newview/skins/default/xui/en/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/en/menu_favorites.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  bottom="825"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index d82c453e5f..41e0183370 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
     layout="topleft"
     name="Gallery">
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 0ca505dd5d..25d64ba74d 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
     layout="topleft"
     name="Outfit">
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
index 359c093eff..86065210d5 100644
--- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
index eca9e7f3c9..71c7574383 100644
--- a/indra/newview/skins/default/xui/en/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false">
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index b517fd7957..22899af15d 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="201"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
index b38fae4404..09a19b9249 100644
--- a/indra/newview/skins/default/xui/en/menu_im_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Conversation Gear Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
index b0adca0e0e..94022ef1e3 100644
--- a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  name="menu_modes"
  left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
index eb5e31b57d..19fca92818 100644
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
index 8cbe62cfb0..a5d656d340 100644
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
index 038b8328cb..a6dda4e7fe 100644
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 2c420aa1e3..9e1fde9513 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
    create_jump_keys="true"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
index 45a0a6635b..391d8f4db7 100644
--- a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index e650c10603..ee011dd503 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  bottom="825"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 12ba121d3c..8dd811c0ad 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 2c630880c2..e249acaccd 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
index 8e34f52f3a..b95a8ad676 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index c7f9822e41..33cf01493d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
index 1ce0d65b3e..76eecc9391 100644
--- a/indra/newview/skins/default/xui/en/menu_land.xml
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Land Pie">
diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml
index 93b6db222a..e879d7b6fa 100644
--- a/indra/newview/skins/default/xui/en/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_landmark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  height="201"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 96fac1c6e8..1c840c6b83 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar
  follows="left|top"
  height="18"
diff --git a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
index 4b3bb8ee1c..84395da903 100644
--- a/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_marketplace_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  name="menu_marketplace_sort"
  left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
index 960da4bd7a..f9864637a0 100644
--- a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  name="media ctrl context menu">
   <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index 2715c916d4..7d16f19e9a 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
index 2650903f88..5bdcbc567a 100644
--- a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_mute_particle.xml b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
index a4261bf39e..fe5233c3a3 100644
--- a/indra/newview/skins/default/xui/en/menu_mute_particle.xml
+++ b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: See also menu_attachment_other.xml -->
 <context_menu
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index b71b866c4b..e15bb2b5ba 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="201"
  layout="topleft"
@@ -39,7 +39,7 @@
          parameter="landmark" />
     </menu_item_call>
     <menu_item_separator
-     name="Separator" />
+     name="Separator1" />
     <menu_item_call
      label="Cut"
      name="Cut">
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
index ff89e20ea5..c201b49229 100644
--- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
      mouse_opaque="false" name="NearBy Chat Menu" opaque="true" width="128" visible="false">
 	<menu_item_call bottom_delta="-18" height="18" label="Show Nearby People..." left="0" mouse_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
index 263ac40f4e..0f5ba81171 100644
--- a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Notification Well Button Context Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index ce34508303..fd15540dc8 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
     layout="topleft"
     name="Object Pie">
diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
index 5137aea72a..f3e520700b 100644
--- a/indra/newview/skins/default/xui/en/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index e216962d12..85eb941e31 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 8c8bb29baf..ae5fae864d 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Outfit">
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 2c32d9d303..caf566859e 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Participant List Context Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index b9750284cd..7591e6e02f 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="participant_manu_view">
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
index 5e16707340..ddf7572e56 100644
--- a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu 
      name="menu_blocked_gear"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
index 0c7155667e..27e2431ce6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu 
      name="menu_blocked_plus"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
index 2efb70ee37..d9808401df 100644
--- a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu 
      name="menu_blocked_view"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index b5a4b87acd..2b71bd123f 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
      name="menu_group_plus"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
index 1e0364b84e..434a11d495 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_group_plus"
  left="0" bottom="0" visible="false"
  mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
index 73f79f1e70..e0c199bc27 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu 
      name="menu_group_plus"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 425de6cab8..7bd2c845a6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Nearby People Context Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 5f973088fd..63185b537c 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Multi-Selected People Context Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
index 0f7c6a2aa5..d654c95553 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  name="menu_group_plus"
  left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
index 1dbc90dd2b..dd351d5205 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu 
      name="menu_group_plus"
      left="0" bottom="0" visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
index a408e6136c..9701e78467 100644
--- a/indra/newview/skins/default/xui/en/menu_picks.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Picks">
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
index f3b207e36c..b35df52ae7 100644
--- a/indra/newview/skins/default/xui/en/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  height="201"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml
index 288811d2f6..34943d807e 100644
--- a/indra/newview/skins/default/xui/en/menu_place.xml
+++ b/indra/newview/skins/default/xui/en/menu_place.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  height="201"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
index ad49f7c3a8..9a6f9c4956 100644
--- a/indra/newview/skins/default/xui/en/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
index e9ada52a8f..81ad2c8340 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
index c89b498ddf..a89a36de86 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_sorting.xml b/indra/newview/skins/default/xui/en/menu_places_gear_sorting.xml
index 4193a72e2e..6abefc9bb6 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_sorting.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_sorting.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/menu_profile_other.xml b/indra/newview/skins/default/xui/en/menu_profile_other.xml
index 4db4d0922b..101ae33778 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_other.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Avatar Profile Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
index b0b7b554b0..5a9b8e41f7 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  height="50"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_profile_self.xml b/indra/newview/skins/default/xui/en/menu_profile_self.xml
index d0bd4000f8..1b21c7ae61 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_self.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  name="Avatar Profile Menu Self">
diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
index 6285bf7417..38f21e8caa 100644
--- a/indra/newview/skins/default/xui/en/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  height="201"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
index 84dacaa8b8..9f88c50011 100644
--- a/indra/newview/skins/default/xui/en/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
         height="602"
         layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
index 49e52ebb8d..7949618ad3 100644
--- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_settings_add.xml b/indra/newview/skins/default/xui/en/menu_settings_add.xml
index a4782cfdc3..21d70b8515 100644
--- a/indra/newview/skins/default/xui/en/menu_settings_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_settings_add.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
         layout="topleft"
         mouse_opaque="false"
@@ -34,4 +34,4 @@
         <menu_item_call.on_enable
                 function="MyEnvironments.EnvironmentEnabled" />
     </menu_item_call>
-</toggleable_menu>
\ No newline at end of file
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
index ea8e328407..57f4aa8655 100644
--- a/indra/newview/skins/default/xui/en/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
         layout="topleft"
         mouse_opaque="false"
@@ -49,7 +49,7 @@
     </menu_item_call>
     <menu_item_separator
             layout="topleft" 
-            name="Separator" />
+            name="Separator1" />
     <menu_item_call
             label="Copy"
             layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml
index ee37d49946..f32f6885f0 100644
--- a/indra/newview/skins/default/xui/en/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/en/menu_slurl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="101"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
index c11d668698..0f361d375a 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  name="Teleport History Gear Context Menu"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
index 153e5a70a9..910a0adc28 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  name="Teleport History Item Menu"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
index ecc1d8a954..96216be017 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Teleport History Item Context Menu">
diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml
index 70b40dd89b..48657a6435 100644
--- a/indra/newview/skins/default/xui/en/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  name="Text editor context menu">
   <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index fbe40a7244..aaf88a39eb 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
       layout="topleft"
       name="Toolbars Popup"
diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
index cbe249ed4d..eaa8aaee51 100644
--- a/indra/newview/skins/default/xui/en/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  height="201"
  layout="topleft"
@@ -40,7 +40,7 @@
          parameter="landmark" />
     </menu_item_call>
     <menu_item_separator
-     name="Separator" />
+     name="Separator1" />
     <menu_item_call
      label="Copy"
      name="Copy">
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index 5ca8be2123..cbc6879f99 100644
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">  
diff --git a/indra/newview/skins/default/xui/en/menu_url_email.xml b/indra/newview/skins/default/xui/en/menu_url_email.xml
index 6467fe5c90..d513e51d81 100644
--- a/indra/newview/skins/default/xui/en/menu_url_email.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_email.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Email Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_experience.xml b/indra/newview/skins/default/xui/en/menu_url_experience.xml
index f4d50e1603..bdc8915682 100644
--- a/indra/newview/skins/default/xui/en/menu_url_experience.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_experience.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
index 2cb125ce09..490576cd04 100644
--- a/indra/newview/skins/default/xui/en/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_group.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml
index 7a4b1e619b..350e21b44f 100644
--- a/indra/newview/skins/default/xui/en/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_http.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml
index cf9d1d5881..7d46aa7d37 100644
--- a/indra/newview/skins/default/xui/en/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_map.xml b/indra/newview/skins/default/xui/en/menu_url_map.xml
index 2ca9e3b3fe..6627c907bd 100644
--- a/indra/newview/skins/default/xui/en/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
index 41d40b389a..1874c01f8d 100644
--- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
index f477c310fb..e0f1fcf9c3 100644
--- a/indra/newview/skins/default/xui/en/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
index 6d1060b633..aab84a63ef 100644
--- a/indra/newview/skins/default/xui/en/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
index 98abc206a5..fb3cfbc116 100644
--- a/indra/newview/skins/default/xui/en/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
index 289e32bcf4..3c4ec4ae4a 100644
--- a/indra/newview/skins/default/xui/en/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Url Popup">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e2c102086f..0e99d2e7e5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar
  bg_visible="false"
  follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index 20c81c983b..ee77ef23f0 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  name="Outfit Wearable Context Menu">
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
index 57b20dfda9..eacc5ab365 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu
  layout="topleft"
  visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
index b8e2b44884..321e8a0831 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu
  layout="topleft"
  name="Wearing">
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index a9d99dad27..0f06b239b5 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
 	<defaultlabel>
 		(Unknown)
@@ -496,7 +496,7 @@
             media_plugin_libvlc
         </impl>
     </mimetype>
-  <mimetype name="application/octet-stream">
+  <mimetype name="application/octet-stream1">
     <label name="video/octet-stream">
       Movie
     </label>
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index 7188b1e699..d0ecd0a11c 100644
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
 	<defaultlabel>
 		(Unknown)
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
index 7fa0a676dd..03ab163601 100644
--- a/indra/newview/skins/default/xui/en/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
 	<defaultlabel>
 		(Unknown)
diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml
index db292100d7..68a52a82ce 100644
--- a/indra/newview/skins/default/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/default/xui/en/notification_visibility.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notification_visibility>
   <hide tag="custom_skin"/>
 	<show/> 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2e9e7da294..9bee1239ae 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" ?><notifications>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<notifications>
     <global name="skipnexttime">
 
 		Don&apos;t show me this again
@@ -6458,7 +6459,7 @@ Your inventory is experiencing issues. Please, contact support.
 
   <notification
    icon="notifytip.tga"
-   name="InventoryLimitReachedAIS"
+   name="InventoryLimitReachedAIS1"
    type="notifytip">
 Your inventory is experiencing issues. Please, contact support.
   <tag>fail</tag>
diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
index d74dca8b95..66c71425a2 100644
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- *NOTE: mantipov: this xml is intended to be used inside panel_outfits_list.xml for each outfit folder-->
 <!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtime-->
 <!-- Non of string values of controls below are visible to user. They are not need to be translated. -->
diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
index 656171ff96..e21a04698f 100644
--- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   name="panel_activeim_row"
   layout="topleft"
@@ -59,4 +59,4 @@
     image_unselected="Toast_CloseBtn"
     image_selected="Toast_CloseBtn"
   />
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 54f038c24f..ca6e94397d 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="24"
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
index b779b08a63..a0b0459b0e 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="avatar_tag_notification"
  top="10"
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index c324e24a86..6bb891db63 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
index 752321b949..5ac0bf54de 100644
--- a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="23"
@@ -68,4 +68,4 @@
      top="6"
      use_ellipses="true"
      width="180" />
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 216a265164..e348306464 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
index 1c0b205c4f..f86d7cf8d5 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  mouse_opaque="true"
  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml b/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
index 9417ab4ac2..381af3607e 100644
--- a/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_camera_preset_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 5c5c718bdf..4f48911376 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 	 background_visible="true"
      bevel_style="in"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
index 357dbc07cc..dffd73c2aa 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  bg_alpha_color="black"
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index fc321fdd23..5406497930 100644
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="false"
  chrome="true"
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 04a0bc800d..afd3f9410b 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index d1175a9fe1..8bd6bc066c 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bevel_style="none"
  follows="top|left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index cc0541e65c..68d4296743 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index aa8e3d07a6..9544042e94 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  bg_alpha_color="DkGray"
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 4372cf69bf..7902588598 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="left|top|right"
  height="24"
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
index 78d4c174d2..0766e8504f 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="23"
@@ -104,4 +104,4 @@
      height="14"
      width="14"
      tab_stop="false"/>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
index de2ff0afc9..d12da0ca62 100644
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 4b05ab27e4..766b629824 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 813aa5d7a9..30fee7361f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
index f173a2f3cb..f1b2653340 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
index 8c0c543d71..6ae21e1273 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
index 6bb5d2fa9b..25f7d8a572 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
index 0f8c37c691..62ee69b43c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
index dd749a9259..d2ba71f905 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
index 0092ceb0dd..837fb83b64 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index cdeb918256..c1d743c3da 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
index 5424b805e1..059103e233 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
index 859e7454a4..199b143719 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
index b61f65a3d1..f3a5791ef8 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
index 76d66cc5dc..adb7632e0a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
index 5f978174b3..1658e5707b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index 8fa85dce5f..b4f09e262f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
     background_visible="true"
   follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
index 16f28377fb..9ca67ed562 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
index 059485cfb4..4a340fe340 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel
      background_visible="true"
 	 follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_universal.xml b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
index 11cabdfe6e..a71f6c6c2e 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_universal.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_universal.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
     background_visible="true"
   follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 85d73ece48..347efa50da 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  bevel_style="in"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
index 5b6dab3ac6..b5150216fe 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   background_visible="true"
   follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
index c357f9e7d5..9377f14fc0 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   layout="topleft"
   left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
index 58c18b8bb1..97dfccb31a 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <panel
   name="panel_experience_list_item"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_log.xml b/indra/newview/skins/default/xui/en/panel_experience_log.xml
index bf7295b187..7d2bf83be3 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_log.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <panel
   name="panel_experience_log"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index c2fe9fb085..bb07476ad0 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   name="panel_experience_search"
   layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index 9d30615442..2dd4ba57fe 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <panel
   name="panel_experiences"
diff --git a/indra/newview/skins/default/xui/en/panel_favorites.xml b/indra/newview/skins/default/xui/en/panel_favorites.xml
index 1e8ea34ad2..67148ad24e 100644
--- a/indra/newview/skins/default/xui/en/panel_favorites.xml
+++ b/indra/newview/skins/default/xui/en/panel_favorites.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    name="Favorites"
    layout="topleft" 
diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
index eea92895f5..47379b69b8 100644
--- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml
+++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="40"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
index 509dcf354e..43ed304ee8 100644
--- a/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="330"
  label="Ban Residents"
diff --git a/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
index 466fb91dd0..a305001ca3 100644
--- a/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 background_visible="true"
  follows="all"
@@ -229,7 +229,7 @@ background_visible="true"
     <layout_panel
       background_visible="false"
       background_opaque="true"
-      name="create_actions"
+      name="create_actions1"
       follows="all"
       layout="topleft"
       auto_resize="false"
@@ -258,7 +258,7 @@ background_visible="true"
         <layout_panel
           follows="bottom|left|right"
           layout="bottomleft"
-          name="layout_crt"
+          name="layout_crt1"
           auto_resize="false"
           height="23"
           width="245">
@@ -287,7 +287,7 @@ background_visible="true"
         <layout_panel
           follows="bottom|left|right"
           layout="bottomleft"
-          name="layout_crt"
+          name="layout_crt2"
           auto_resize="true"
           height="23"
           width="91">
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 5eafb5cdf1..3043a30dcb 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  label="General"
  height="420"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 05de249d22..cc50c6202f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 background_visible="true"
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index ebb460deb0..fa45bc8aeb 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="380"
  label="Invite a Member"
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index d4da55e32e..ad9ce8f37e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="false"
  height="500"
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index e758a8ce30..9e31ff604a 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="24"
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index 8e2a241661..6a1466867d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="group_list_item"
  top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index a5aca5c72b..0131f1d97d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="530"
  label="Notices"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 60e5a03d51..be34a2e02f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  height="90"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index f15f79e9aa..02e135a2c7 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="750"
  label="Members &amp; Roles"
diff --git a/indra/newview/skins/default/xui/en/panel_hide_beacon.xml b/indra/newview/skins/default/xui/en/panel_hide_beacon.xml
index 7cab285f77..0516db96e0 100644
--- a/indra/newview/skins/default/xui/en/panel_hide_beacon.xml
+++ b/indra/newview/skins/default/xui/en/panel_hide_beacon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="25"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
index f7434f0330..7442136761 100644
--- a/indra/newview/skins/default/xui/en/panel_hint.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  width="205"
  height="34">
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
index df05d50dc5..d712245df8 100644
--- a/indra/newview/skins/default/xui/en/panel_hint_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  width="305"
  height="40"
diff --git a/indra/newview/skins/default/xui/en/panel_hud.xml b/indra/newview/skins/default/xui/en/panel_hud.xml
index 3e9614a9b7..15b3c3b444 100644
--- a/indra/newview/skins/default/xui/en/panel_hud.xml
+++ b/indra/newview/skins/default/xui/en/panel_hud.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="left|right|top|bottom"
  height="728"
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 433a3181cd..18dcc86649 100644
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_inventory_panel
     accepts_drag_and_drop="false"
     name="inventory_inbox"
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 11f05d186c..7c0a928d69 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  height="152"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
index ed04e12193..fcff9e3bec 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    background_visible="true"
    bg_alpha_color="InventoryBackgroundColor"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 574872a870..73cb9b080f 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    background_visible="false"
    background_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
index 2e38835810..b9bbf7689d 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index e82305ef17..2fbf322019 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 10b925ec93..ee96e7ede8 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    name="Landmarks"
    layout="topleft" 
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 3aba80909a..2088a443fd 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   follows="all"
   height="768"
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index d36c83d292..d002e24782 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   follows="all"
   height="768"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index f7a9c552cc..fb37e95ec7 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="all"
  height="423"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index 2b17473a84..61cd6a83d4 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   label="Marketplace"
   name="Marketplace Panel"
@@ -114,4 +114,4 @@
           Drop folders here to create new listings
       </text>
   </panel>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
index 8d5fa265e2..a8a306bea9 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_panel
     label="ALL"
     name="All Items"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
index 44f507ad84..0c665fb07e 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_panel
     label="LISTED"
     name="Active Items"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
index 871e8773c4..0be405c5b8 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_panel
     label="UNASSOCIATED"
     name="Unassociated Items"
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
index 98bef04aa7..58122db7f4 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_panel
     label="UNLISTED"
     name="Inactive Items"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 4c566dc60a..5e7830f27c 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel 
  border="true" 
  enabled="true" 
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
index d3a58fed58..082aad2816 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel 
  border="true" 
  enabled="true" 
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 1f580831f9..82e9c25b1c 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel 
  border="true" 
  enabled="true" 
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index b44c19810b..85cf4419a3 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_opaque="true"
  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 1e43db08f7..1a89d07cbb 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="left|bottom|right"
  height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index d1cb64f7ad..f305a161f2 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bg_opaque_image="Volume_Background" 
  bg_alpha_image="Volume_Background" 
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index c1a68fb9af..56d8714064 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   background_opaque="false"
   border_visible="false"
diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
index efaaefd0e4..80db209b59 100644
--- a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -68,7 +68,7 @@
                 </panel>
               </panel>
             </layout_panel>
-            <layout_panel width="18" height="48" follows="right|top|bottom" name="layout_panel_right">
+            <layout_panel width="18" height="48" follows="right|top|bottom" name="layout_panel_right1">
               <panel top="0" left="0" width="17"  height="39" follows="left|top|right|bottom" layout="topleft" name="close_expand_panel">
                 <button top="0" left="0" width="17" height="17" layout="topleft" follows="top" name="close_btn" mouse_opaque="true"
                   tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" />
diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
index c3dc588ba2..f1e990e68f 100644
--- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="100"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
index 6dc1bf9e9e..27d0f7d383 100644
--- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    background_visible="true"
    height="215"
diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
index dadbd9c9ab..9819d2008b 100644
--- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="false"
  height="40"
@@ -32,4 +32,4 @@
      width="189"
      word_wrap="true"
      max_length="350" />
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index d625f89f3b..a0e3344304 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray Outfit Edit panel -->
 <panel
         background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index e951d25391..6bd491f7a3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    background_visible="true"
    bg_alpha_color="DkGray"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml
index e3f0f1128b..65bbc3a4b4 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    background_visible="false"
    background_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
index 441cf97e87..14b41aced3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="380"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 7b898dbd7f..d58c2ec2e9 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
  <panel name="Outfits"
  bg_alpha_color="DkGray"
  bg_opaque_color="DkGray"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
index 2c7a51f0e7..f600b2bd31 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu
  bottom="806"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index a0096adc01..9281a21fbf 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
    background_visible="true"
    bg_alpha_color="DkGray"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
index ceaff0ea69..a486c03ac7 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  bg_alpha_color="DkGray"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 50035fd0e3..c31e6c94ea 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 904ce1cc52..9f930d1557 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bevel_style="none"
  follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
index cd3f610a92..fc38c056ad 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bevel_style="none"
  follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_huds.xml b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
index 2fddcb3b9e..f0054800c7 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bevel_style="none"
  follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
index cb795e59a9..ca961747c4 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bevel_style="none"
  follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index b52c19d5e3..169b5a33ac 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bevel_style="none"
  follows="left|top"
@@ -156,7 +156,7 @@
    layout="topleft"
    left_pad="10"
    top_delta="1"
-   name="quality_lbl"
+   name="quality_lbl1"
    width="70">
     Best quality
   </text>
@@ -346,7 +346,7 @@
     bevel_style="in"
     height="0"
     layout="topleft"
-    name="border3"
+    name="border31"
     top_pad="7"
     left="20"
     width="540"/>
@@ -412,11 +412,11 @@
       value="-2"/>
     <combo_box.item
       label="None; transparent"
-      name="0"
+      name="02"
       value="-1"/>
     <combo_box.item
       label="Minimal"
-      name="0"
+      name="03"
       value="0"/>
     <combo_box.item
       label="Terrain and trees"
@@ -487,7 +487,7 @@
    layout="topleft"
    top_delta="3"
    left_pad="10"
-   name="photo_desc"
+   name="photo_desc1"
    width="180">
       (Enter value between 0.0 and 4.0)
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 4c0cdd321e..db3e42fa96 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  bevel_style="none"
  follows="top|left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index bdde2cab20..8f5292c531 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 58be4d4c5e..a3a2f7c47e 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 background_visible="true"
  default_tab_group="1"
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
index 63c7259878..f9d288ea59 100644
--- a/indra/newview/skins/default/xui/en/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="319"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index 525149d7ee..f121338c2a 100644
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="380"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index d0518aa245..bcf79b083f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="all"
@@ -166,7 +166,7 @@
    left_pad="0"
    max_val="2.0"
    min_val="1.0"
-   name="ui_scale_slider"
+   name="ui_scale_slider1"
    top_pad="-14"
    width="250" />
     <check_box
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 93c97ded25..fb528bf98f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  height="408"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index f4181b2152..88716c7f96 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
     border="true"
     height="408"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 9e825fe516..5d93846ce5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 9dab7d34e6..f8801f9c89 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 335d7caa51..101c506309 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index ad02df3087..74896ed3f8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 864223e616..0412466b4f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index ef08fdf7c4..5041fb4878 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
     border="true"
     follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 5e41ba4ae1..28c2d2af6e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index ab2e9c72f3..c2b2404a95 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="all"
@@ -107,7 +107,7 @@
 		is_toggle="true"
 		layout="topleft"
 		left_pad="5"
-		name="mute_audio"
+		name="mute_audio1"
 		tab_stop="false"
 		width="16" />
     <slider
@@ -141,7 +141,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio"
+     name="mute_audio2"
      tab_stop="false"
      width="16" />
     <slider
@@ -175,7 +175,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio"
+     name="mute_audio3"
      tab_stop="false"
      width="16">
       <button.commit_callback
@@ -212,7 +212,7 @@
      is_toggle="true"
      layout="topleft"
 	   left_pad="5"
-     name="mute_audio"
+     name="mute_audio4"
      tab_stop="false"
 	 width="16" />
 	<check_box
@@ -258,7 +258,7 @@
 		is_toggle="true"
 		layout="topleft"
 		left_pad="5"
-		name="mute_audio"
+		name="mute_audio5"
 		tab_stop="false"
 		width="16" />
 	<check_box
@@ -306,7 +306,7 @@
 		is_toggle="true"
 		layout="topleft"
 		left_pad="5"
-		name="mute_audio"
+		name="mute_audio6"
 		tab_stop="false"
 		width="16" />
 	<check_box
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
index 67eff2b762..90b0c19cc4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
index 25d9c47449..d5f1bc81ee 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_opaque="true"
  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
index b3d165c4fd..5ea92e3973 100644
--- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_opaque="true"
  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 068e4420bc..b507da8b48 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 	follows="left|right|top|bottom"
 	name="MediaControls"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index c9e8b242d4..3d61eecf86 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_profile_classified"
  top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
index 2b2f60e0c2..c74053d58e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_profile_classifieds"
  label="Classified"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index f899f83ad4..f596b876ab 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_profile_firstlife"
  label="Profile"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_notes.xml b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
index 16e7365042..77d8689518 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_notes"
  label="Notes &amp; Privacy"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index 3e91640093..7a30a82ed6 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_pick_info"
  top="0"
@@ -212,7 +212,7 @@
     <layout_panel
      follows="all"
      layout="bottomleft"
-     name="save_changes_lp"
+     name="save_changes_lp1"
      auto_resize="false"
      height="41">
       <view_border
diff --git a/indra/newview/skins/default/xui/en/panel_profile_picks.xml b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
index 44d5c448c0..db0d46b758 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_picks.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_picks"
  label="Picks"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index fea7d1bcb8..dd9a146265 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_profile"
  label="Profile"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_web.xml b/indra/newview/skins/default/xui/en/panel_profile_web.xml
index e0cb4d3d06..591effd4f4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  name="panel_profile_web"
  label="Web"
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index e77d097d5f..242b96b695 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="left|bottom|right|top"
  height="768"
diff --git a/indra/newview/skins/default/xui/en/panel_region_access.xml b/indra/newview/skins/default/xui/en/panel_region_access.xml
index 4be073195b..3028357b87 100644
--- a/indra/newview/skins/default/xui/en/panel_region_access.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_access.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index 112f12500d..bc764ecc55 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index fea5f1b19f..04a510d4e8 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 0b3639f779..6d23592948 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <panel
         border="true"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 33e99a46ae..0910a3ef90 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
index bced46f7dc..199dca4853 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   border="true"
   follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index d1cfb8ead6..74d21c436e 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 2aaea04a6d..ad41691323 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 4ea4a4f38d..f8761d2b24 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   bevel_style="none"
   border_style="line"
diff --git a/indra/newview/skins/default/xui/en/panel_script_experience.xml b/indra/newview/skins/default/xui/en/panel_script_experience.xml
index 9ae5b201a6..1a1ee16628 100644
--- a/indra/newview/skins/default/xui/en/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_experience.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   name="script_experience"
   title="EXPERIENCE"
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
index 2c2803a503..3be3e23d47 100644
--- a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
index 79bb781bc6..18ebb2f133 100644
--- a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  border="true"
  follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
index b0436bb6dc..1b1e31165a 100644
--- a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   background_opaque="false"
   border_visible="false"
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index a8cd380f20..2035bc2caa 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="157"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
index 1351f75623..03c624627f 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index fa2d4dfe73..9504813f9a 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
         border="true"
         follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 9bdfa94a33..7687f7cd96 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
         border="true"
         follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index 9b37896979..60ab520cd5 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
         border="true"
         follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 35adb262bb..bd68434aab 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
         border="true"
         follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 1aa42af3a8..86d86aefa6 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
         border="true"
         follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 557b04d281..4cb1364ff3 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  bottom="0"
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 912f81f915..cc3fb4abdb 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- the web-based Home panel of the side tray -->
 <panel
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 8cc27d9eef..f8040b9a65 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="380"
  layout="topleft"
@@ -144,4 +144,4 @@
       <button.commit_callback
        function="Inventory.Save" />
     </button>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 188c9f8707..52f9068264 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="380"
  layout="topleft"
@@ -196,4 +196,4 @@
          name="saveas_item"
          value="save as" />
     </flyout_button>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 8fc5cd7e63..3a7731d235 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="all"
  height="240"
@@ -87,4 +87,4 @@
    word_wrap="true">
     Fee is based on your subscription level. Higher levels are charged lower fees.
   </text>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index 8e92552921..60e99c04c3 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="380"
  layout="topleft"
@@ -99,4 +99,4 @@
       <button.commit_callback
        function="Postcard.Send" />
     </button>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 2fdbee49f0..f0219da88f 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  height="380"
  layout="topleft"
@@ -165,4 +165,4 @@
       <button.commit_callback
        function="PostToProfile.Send" />
     </button>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
index a1ce99c8be..7598f7d7e5 100644
--- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="false"
  bg_alpha_color="DkGray"
@@ -188,4 +189,4 @@
        label="Unmute"
        top_delta="-6"
        width="110" />
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index 07642946f8..76b6713d43 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
 <panel
  height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index b711ed0e1c..4501e0df3a 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_opaque="true"
  background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 55c47c90a4..2154b9983d 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Teleport History" bottom="0" height="400" left="0" width="313"
      help_topic="panel_teleport_history"
      border="false" follows="left|top|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index 5c728718ef..6331458eb7 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="top|right|left"
  height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index a3348f28c7..5e724be765 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toolbar_view
  follows="all"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index c7052bb737..88d02969e0 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
          border="false"
          follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index fc527f5f9d..839bf71c40 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_visible="true"
  background_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 93e79b7328..42cd510efd 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="all"
  height="26"
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 3c466022d8..5f4562e02d 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  background_opaque="true"
  background_visible="true"
@@ -74,7 +74,7 @@
         is_toggle="true"
         layout="topleft"
         left_pad="5"
-        name="mute_audio"
+        name="mute_audio1"
         tab_stop="false"
         width="16" />
     <slider
@@ -107,7 +107,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio"
+     name="mute_audio2"
      tab_stop="false"
      width="16" />
     <slider
@@ -140,7 +140,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio"
+     name="mute_audio3"
      tab_stop="false"
      width="16">
       <button.commit_callback
@@ -186,7 +186,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio"
+     name="mute_audio4"
      tab_stop="false"
      width="16" />
     <check_box
@@ -232,7 +232,7 @@
         is_toggle="true"
         layout="topleft"
         left_pad="5"
-        name="mute_audio"
+        name="mute_audio5"
         tab_stop="false"
         width="16" />
     <check_box
@@ -280,7 +280,7 @@
         is_toggle="true"
         layout="topleft"
         left_pad="5"
-        name="mute_audio"
+        name="mute_audio6"
         tab_stop="false"
         width="16" />
     <check_box
diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml
index 16860a6117..c436f69c59 100644
--- a/indra/newview/skins/default/xui/en/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/en/panel_world_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="left|top|right|bottom"
  height="300"
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index bda08f3421..af371dea26 100644
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
 	<action_set
 	     description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation."
diff --git a/indra/newview/skins/default/xui/en/script_editor.xml b/indra/newview/skins/default/xui/en/script_editor.xml
index f1c6161711..68aa725606 100644
--- a/indra/newview/skins/default/xui/en/script_editor.xml
+++ b/indra/newview/skins/default/xui/en/script_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <script_editor
  name="script_editor"
  parse_urls="false"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 1777a0db05..c898b0989e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 background_visible="true"
 default_tab_group="1"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 76d0ffcb8e..de47e05291 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 	  follows="all"
 	  height="570"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index ad521cb1af..d5261126cf 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   follows="all"
   height="570"
@@ -288,7 +288,7 @@ TestString PleaseIgnore
         height="15"
         follows="left|top"
         layout="topleft"
-        name="perm_modify"
+        name="perm_modify1"
         width="200">
         You can:
       </text>
@@ -401,7 +401,7 @@ TestString PleaseIgnore
         layout="topleft"
         left="5"
         right="-5"
-        name="cost_text_border"
+        name="cost_text_border1"
         top_pad="9"/>
         
       <check_box
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index faff6185ab..1276f3bad3 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
 	 height="570"
 	 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 613f129925..2750e66621 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the source.
      It is only for those strings which do not belong in a floater.
      For example, the strings used in avatar chat bubbles, and strings
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index 1456114b25..1b45cdb191 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index 55dde492ca..8c5f6ebfc2 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <accordion
  height="100"
  name="accordion"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 6f68c99021..53d1e18a84 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <accordion_tab
     header_bg_color="DkGray2"
     header_collapse_img="Accordion_ArrowClosed_Off"
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
index 7f8fac04d0..260dc78008 100644
--- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <avatar_icon name="avatar_icon"
 						 default_icon_name="Generic_Person_Large"
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
index 8a4ccb19f9..7dde1e6d1c 100644
--- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <avatar_list_item
  name_right_pad="5"
  height="0"
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
index 738d150f64..b1d92b1609 100644
--- a/indra/newview/skins/default/xui/en/widgets/badge.xml
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Additional attributes:
    -->
 <badge name="badge"
diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
index 0016a8cf53..b99b097096 100644
--- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <bodyparts_list_item
  follows="top|right|left"
  height="23"
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 2b2c3faf91..090447a6a2 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Additional attributes:
   image_pressed
 	image_pressed_selected
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
index f9facb593a..1e6a5aed88 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <chat_editor
   name="chat_editor"
   show_context_menu="true"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index c0a948931c..d1e7a9b451 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <chat_history
   message_header="panel_chat_header.xml"
   message_separator="panel_chat_separator.xml"
@@ -22,4 +22,4 @@
     parse_urls="false"
     word_wrap="true"
     />
-</chat_history>
\ No newline at end of file
+</chat_history>
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index 8947024e45..eef935dafc 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <check_box font="SansSerifSmall"
            follows="left|top">
   <check_box.label_text name="checkbox label"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 4bc295f747..2700eed3f0 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <chiclet_offer
  height="23"
  name="offer_chiclet"
@@ -27,4 +27,4 @@
   name="new_message_icon"
   visible="false"
   width="14" />
-</chiclet_offer>
\ No newline at end of file
+</chiclet_offer>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
index 5f51f4afd9..e097ad3dcd 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <chiclet_panel
  name="chiclet_panel"
  chiclet_padding="3"
@@ -6,4 +6,4 @@
  scroll_button_hpad="0"
  scroll_ratio="10"
  min_width="180"
- />
\ No newline at end of file
+ />
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index db6a9434df..09d6aa6162 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <chiclet_script
  height="23"
  name="script_chiclet"
@@ -27,4 +27,4 @@
   name="new_message_icon"
   visible="false"
   width="14" />
-</chiclet_script>
\ No newline at end of file
+</chiclet_script>
diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
index d83f44737e..bd449f6556 100644
--- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <clothing_list_item
  follows="top|right|left"
  height="23"
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index ab3de1eaab..7ae9158e65 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <color_swatch alpha_background_image="color_swatch_alpha.tga"
               border_color="ColorSwatchBorderColor"
               name="colorswatch">
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index 65f9a143e9..daec17c2f9 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <combo_box font="SansSerifSmall"
            list_position="below"
            max_chars="20"
diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
index 459706c689..a712b41a2a 100644
--- a/indra/newview/skins/default/xui/en/widgets/context_menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu visible="false"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index b83d9122f7..cf995e5833 100644
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <conversation_view_participant
   folder_arrow_image="Folder_Arrow"
   item_height="24" 
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
index b8c39eec1d..b876dd8351 100644
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <conversation_view_session
   folder_arrow_image="Folder_Arrow"
   folder_indentation="8"
diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
index 0534485ddd..18839a94ae 100644
--- a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <deletable_wearable_list_item
   follows="top|right|left"
   height="23"
diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
index eb665fd3cb..6fd0c291cd 100644
--- a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <densityctrl
  border="true"
  follows="all"
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index 602250ace6..75ed485645 100644
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <drop_down text_enabled_color="LabelTextColor"
            text_disabled_color="LabelDisabledColor"
            font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
index 8c805da048..71119d7c9e 100644
--- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <dummy_clothing_list_item
  follows="top|right|left"
  height="23"
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
index c6331ec87b..15c7a40647 100644
--- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <expandable_text
  max_height="300" >
  <textbox
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index 9c80deeafc..604f62b099 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <filter_editor
   name="filter_editor"
   clear_button_visible="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
index e05ddf9815..c376e455a1 100644
--- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <flat_list_view
  allow_select="true"
  color="PanelFocusBackgroundColor"
@@ -13,4 +13,4 @@
      h_pad="10"
      value="No matches found"
      wrap="true" />
-</flat_list_view>
\ No newline at end of file
+</flat_list_view>
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 807b67d112..11758556d6 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- See also settings.xml UIFloater* settings for configuration -->
 <floater
  name="floater"
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
index 83df10e417..e42bef4a45 100644
--- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <flyout_button list_position="below" height="23">
   <action_button scale_image="true"
                 image_selected="SegmentedBtn_Left_Selected"
@@ -9,4 +9,4 @@
                 image_disabled="ComboButton_Disabled"
                 pad_right="6"
                 tab_stop="false"/>
-</flyout_button>
\ No newline at end of file
+</flyout_button>
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index bbd53ccb12..b598bbccd8 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <folder_view_item
   folder_arrow_image="Folder_Arrow"
   folder_indentation="8"
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
index 808683864d..14cd3e159c 100644
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <gesture_combo_list
     follows="right|top">
     <gesture_combo_list.combo_button
diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
index 36ee6dd7eb..73a0acd80d 100644
--- a/indra/newview/skins/default/xui/en/widgets/group_icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <group_icon
  default_icon_name="Generic_Group"
  image_name="Generic_Group"
diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
index 92080df154..2e548476b6 100644
--- a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
+++ b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <hint_popup
  name="hint"
  background_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/icon.xml b/indra/newview/skins/default/xui/en/widgets/icon.xml
index cf8edfcedb..a4ea15f88a 100644
--- a/indra/newview/skins/default/xui/en/widgets/icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/icon.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <icon color="1.0 1.0 1.0 1.0"
       tab_stop="false"
       mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 590a4730a9..27ec6ded81 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_folder
   folder_arrow_image="Folder_Arrow"
   folder_indentation="8"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
index 7a7a6e9a09..09cbb1d3ab 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_item
   item_height="20" 
   item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
index 92f815d4bf..fadca90972 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_inventory_panel start_folder.type="inbox"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 8c171c387f..3c8e7c7940 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inspector name="inspector"
            max_width="300"
            bg_opaque_color="DkGray_66"
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
index da9059c819..ce36a39a21 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_list_item
   follows="top|right|left"
   height="20"
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index d5efd723c4..15e28746db 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
   bg_opaque_color="InventoryBackgroundColor"
   background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml
index a190da3909..bfde1dc752 100644
--- a/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml
+++ b/indra/newview/skins/default/xui/en/widgets/joystick_quat.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <joystick_rotate
    image_selected="Cam_Rotate_In"
    image_unselected="Cam_Rotate_Out"
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
index cbf721b346..55159d8ba7 100644
--- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
+++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <joystick_quat
    image_selected="Cam_Rotate_In"
    image_unselected="Cam_Rotate_Out"
diff --git a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
index 48bcb46533..375fab9403 100644
--- a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
+++ b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Global settings for all widgets ("UI Controls") -->
 <!-- The params in this file aren't currently getting loaded in OSX -->
 <layout_stack name="stack"/> 
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index f39e086196..d37bee27ba 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <line_editor background_image="TextField_Off"
              background_image_disabled="TextField_Disabled"
              background_image_focused="TextField_Active"
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
index 2e976bc755..5fb134535b 100644
--- a/indra/newview/skins/default/xui/en/widgets/list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <list_view
   fg_selected_color="ListViewSelectedFgColor"
   bg_selected_color="ListViewSelectedBgColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
index ea1d89c975..af4b9aa1ee 100644
--- a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
+++ b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <loading_indicator
     follows="left|top"
     mouse_opaque="false"
@@ -19,4 +19,4 @@
     <image name="Progress_11"/>
     <image name="Progress_12"/>
   </images>
-</loading_indicator>
\ No newline at end of file
+</loading_indicator>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 674be59753..d12f1434a8 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
 *TODO: Replace hardcoded buttons width/height with getting this info from the button images.
        Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml
index 0e2b478aa5..285c0207fb 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="menu" 
       bg_color="MenuDefaultBgColor"
       bg_visible="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
index 27efa72563..8867e97b6c 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar
 			tear_off = "false"
 			keep_fixed_size = "true"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
index 563f3dc5c2..fb890985ce 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Use this for the top-level menu styling -->
 <menu_item font="SansSerifSmall" />
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
index 24bda97f44..db46e6ddfc 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_item_call enabled_color="MenuItemEnabledColor"
 	disabled_color="MenuItemDisabledColor"
 	highlight_bg_color="MenuItemHighlightBgColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
index f6b06cb50b..92478be7da 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_item_check enabled_color="MenuItemEnabledColor"
 	disabled_color="MenuItemDisabledColor"
 	highlight_bg_color="MenuItemHighlightBgColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
index 7452d685eb..366d9284aa 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_item_separator enabled_color="MenuItemEnabledColor"
                      name="separator"
                      disabled_color="MenuItemDisabledColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
index 72af3924c1..82310e4f1a 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Use "disabled color" to make it look like menu separators -->
 <menu_item_tear_off enabled_color="MenuItemDisabledColor"
                     name="tear_off"
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
index 90b0625982..30fda073a6 100644
--- a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
+++ b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_slider text_color="LabelTextColor"
               mouse_opaque="true"
               text_disabled_color="LabelDisabledColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
index bbcb008df4..a56c819b4d 100644
--- a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_slider_bar name="multi_slider_bar"
                   track_color="MultiSliderTrackColor"
                   thumb_disabled_color="MultiSliderDisabledThumbColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/name_editor.xml b/indra/newview/skins/default/xui/en/widgets/name_editor.xml
index 21ba5c77f8..1d7d23eb8f 100644
--- a/indra/newview/skins/default/xui/en/widgets/name_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/name_editor.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<name_editor default_text="(retrieving)"/>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<name_editor default_text="(retrieving)"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/name_list.xml b/indra/newview/skins/default/xui/en/widgets/name_list.xml
index 3ae0f68227..4ad2512ccd 100644
--- a/indra/newview/skins/default/xui/en/widgets/name_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/name_list.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <name_list name="name_list"
            />
diff --git a/indra/newview/skins/default/xui/en/widgets/notification_list_view.xml b/indra/newview/skins/default/xui/en/widgets/notification_list_view.xml
index 150225af27..4f87c58420 100644
--- a/indra/newview/skins/default/xui/en/widgets/notification_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/notification_list_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notification_list_view
  allow_select="false"
  color="PanelFocusBackgroundColor"
@@ -15,4 +15,4 @@
     top="20"
     height="0"
     width="318"/>
-</notification_list_view>
\ No newline at end of file
+</notification_list_view>
diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
index 9d71ceca2f..788c733ca8 100644
--- a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <output_monitor
   draw_border="true"
   follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
index b36f723831..77f3ef5675 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Optional parameters:
   border - show border around panel
   bg_opaque_image - image name for "in-front" panel look
@@ -12,4 +12,4 @@
        background_visible="false"
        background_opaque="false"
        chrome="false"
-       accepts_badge="true"/>
\ No newline at end of file
+       accepts_badge="true"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
index 564f695cd0..ea49b750d1 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel_camera_item
  background_visible="false"
  height="30"
diff --git a/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml b/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
index af5aec2c34..ad63a80a05 100644
--- a/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <person_tab_view
   folder_arrow_image="Folder_Arrow"
   folder_indentation="5"
diff --git a/indra/newview/skins/default/xui/en/widgets/person_view.xml b/indra/newview/skins/default/xui/en/widgets/person_view.xml
index bfe6941a8a..82dbdf0dab 100644
--- a/indra/newview/skins/default/xui/en/widgets/person_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/person_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <person_view
   folder_arrow_image="Folder_Arrow"
   folder_indentation="5"
diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
index 339e53fbb8..a9c90f0094 100644
--- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <progress_bar image_bar="ProgressTrack"
               image_fill="ProgressBar"
               color_bar.red="0.5764"
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
index ab3184d34b..a307e91990 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <radio_group name="radio_group"
              mouse_opaque="false"
              follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index 3ddf18b2cb..b95e1add47 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <radio_item follows="left|top" font="SansSerif">
   <radio_item.label_text name="Radio Item label"/>
   <radio_item.check_button name="Radio control button"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
index 682dcf40d8..83a66da89e 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <scroll_bar thumb_image_vertical ="ScrollThumb_Vert"
 			thumb_image_horizontal ="ScrollThumb_Horiz"
             track_image_vertical ="ScrollTrack_Vert"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
index 8a48fcb32d..2575d33d96 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <scroll_column_header name="column_header"
                       image_unselected="SegmentedBtn_Middle_Selected"
                       image_selected="SegmentedBtn_Middle_Selected"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
index a6d096a964..a361d4fac8 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <scroll_container name="scroll_container"
                   color="black"
                   opaque="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index e43989c6c7..9819e7a226 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <scroll_list name="scroll_list" 
              fg_unselected_color="ScrollUnselectedColor"
              fg_selected_color="ScrollSelectedFGColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
index 40cbf5977a..019c4b7fc0 100644
--- a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<scrolling_panel_list name="scrolling_panel_list"/>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<scrolling_panel_list name="scrolling_panel_list"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
index ce84cfedc0..61341188ed 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <search_combo_box
  allow_text_entry="true"
  list_position="below"
@@ -28,4 +28,4 @@
   height="13" 
   image_unselected="Search"
   image_selected="Search" />
-</search_combo_box>
\ No newline at end of file
+</search_combo_box>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 18d99f1ed1..51144c92b6 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <search_editor
   name="search_editor"
   clear_button_visible="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
index 022564c12f..3835c777b5 100644
--- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml
+++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <side_tray tab_btn_image="TaskPanel_Tab_Off"
            tab_btn_image_selected="TaskPanel_Tab_Selected"
            tab_btn_width="32"
diff --git a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
index aa8461d367..5d94cd7b2e 100644
--- a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <sidetray_tab 
   focus_root="true"
   />
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index a120b1aec8..b99010e17a 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <simple_text_editor
   parse_urls="false" 
   mouse_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider.xml b/indra/newview/skins/default/xui/en/widgets/slider.xml
index 6cceafc9ae..cb2c4e6b2c 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <slider name="slider" 
         can_edit_text="false" 
         font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 0335213ed6..1cfe3d68f9 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--All horizontal sliders are configured to have no highlighted track. See EXT-5939. -->
 <slider_bar follows="left|top"
             track_color="SliderTrackColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
index d7af6077e5..12f03ab047 100644
--- a/indra/newview/skins/default/xui/en/widgets/spinner.xml
+++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <spinner text_enabled_color="LabelTextColor"
          text_disabled_color="LabelDisabledColor"
          font="SansSerifSmall" 
@@ -14,4 +14,4 @@
                        image_selected="Stepper_Down_Press"
                        tab_stop="false"
                        follows="left|bottom" />
-</spinner>
\ No newline at end of file
+</spinner>
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
index 2ff9ada90a..f85638166b 100644
--- a/indra/newview/skins/default/xui/en/widgets/split_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <split_button
  font="SansSerifSmall"
  arrow_position="left"
diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 9fa77855c0..cdeff6ab05 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <sun_moon_trackball
     name="virtualtrackball"
     width="150"
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 0586119681..22955fe73d 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--
 label_pad_bottom - vertical padding under tab button labels
 label_pad_left - padding to the left of tab button labels
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index d792e9f29c..6468a023e3 100644
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Derives from LLUICtrl -->
 <talk_button>
   <!-- To make speak button look green when selected set:
diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
index 4f574d75d5..1b4ac4dba7 100644
--- a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Menu items for the back button drop-down menu of locations.
   Based on menu_item_call.xml -->
 <teleport_history_menu_item
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
index 2102074674..505d98368e 100644
--- a/indra/newview/skins/default/xui/en/widgets/text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <text parse_urls="true"
       mouse_opaque="false" 
       name="text_box" 
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index 100571cc01..c359e52a92 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Core parameters are in simple_text_editor.xml -->
 <text_editor
   name="text_editor"
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
index b2da2147c1..ada907ca8f 100644
--- a/indra/newview/skins/default/xui/en/widgets/textbase.xml
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <textbase clip_partial="false"
           halign="left" 
           valign="top" 
diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
index 1511116ba6..eb5344d311 100644
--- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
+++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <texture_picker border_color="DefaultHighlightLight"
                 name="texture picker"
                 mouse_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml
index b5bdd564a6..3162d49be4 100644
--- a/indra/newview/skins/default/xui/en/widgets/time.xml
+++ b/indra/newview/skins/default/xui/en/widgets/time.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <time text_enabled_color="LabelTextColor"
          text_disabled_color="LabelDisabledColor"
          font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
index 48950a98ad..a9d17d0989 100644
--- a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu visible="false"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
index 9ca15ae50d..d0a9adece3 100644
--- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <tool_tip name="tooltip"
           max_width="200"
           padding="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 0ace37a5dc..8345911525 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toolbar pad_left="1"
          pad_right="1"
          pad_top="1"
diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
index f4dbb8f404..8a5dbc72ab 100644
--- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Global settings for all widgets ("UI Controls") -->
 <!-- The params in this file aren't currently getting loaded in OSX -->
 <ui_ctrl
diff --git a/indra/newview/skins/default/xui/en/widgets/view_border.xml b/indra/newview/skins/default/xui/en/widgets/view_border.xml
index bf40e3086b..db77f5a07e 100644
--- a/indra/newview/skins/default/xui/en/widgets/view_border.xml
+++ b/indra/newview/skins/default/xui/en/widgets/view_border.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <view_border name="view_border" 
              highlight_light_color="DefaultHighlightLight"
              highlight_dark_color="DefaultHighlightDark"
@@ -8,4 +8,4 @@
              border_style="line"
              bevel_style="out"
              mouse_opaque="false"
-             follows="all"/>
\ No newline at end of file
+             follows="all"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
index 866276f997..aa235e103b 100644
--- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_list_item
   follows="top|right|left"
   height="20"
diff --git a/indra/newview/skins/default/xui/en/widgets/web_browser.xml b/indra/newview/skins/default/xui/en/widgets/web_browser.xml
index 676fafd828..8af330c84a 100644
--- a/indra/newview/skins/default/xui/en/widgets/web_browser.xml
+++ b/indra/newview/skins/default/xui/en/widgets/web_browser.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <web_browser border_visible="true"
              tab_stop="false"
              />
diff --git a/indra/newview/skins/default/xui/en/widgets/window_shade.xml b/indra/newview/skins/default/xui/en/widgets/window_shade.xml
index 23eb2f13fb..a0e26bc81c 100644
--- a/indra/newview/skins/default/xui/en/widgets/window_shade.xml
+++ b/indra/newview/skins/default/xui/en/widgets/window_shade.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <window_shade shade_color="0 0 0 0.5"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
index 93ae26a6ad..23cde55f30 100644
--- a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <xy_vector
     name="xyvector"
     width="120"
diff --git a/indra/newview/skins/default/xui/en/xui_version.xml b/indra/newview/skins/default/xui/en/xui_version.xml
index 0e777751d3..2a8fd9c6c4 100644
--- a/indra/newview/skins/default/xui/en/xui_version.xml
+++ b/indra/newview/skins/default/xui/en/xui_version.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <xui_version>
 	1.0
 </xui_version>
-- 
cgit v1.2.3


From dce1fae986f4f61f51e7825de903aa58239c28c8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 23 Nov 2023 23:28:10 +0200
Subject: SL-17076 MacOS crash on clearing ChicletNotificationChannel

Crash appears to happens inside mItems.clear() of the
LLNotificationChannelBase, but there is no apparent reson for it and
stack jumped some steps, so I'm doing cleanup more explicitly to see
if it's indeed there and not a corruption somewhere earlier.
---
 indra/llui/llnotifications.cpp | 14 +++++++++++---
 indra/llui/llnotifications.h   |  8 +++++---
 indra/newview/llchiclet.cpp    |  5 +++++
 indra/newview/llchiclet.h      | 11 +++++++----
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index d736aa6634..c0a7866926 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1171,6 +1171,14 @@ LLNotificationChannel::LLNotificationChannel(const std::string& name,
 	connectToChannel(parent);
 }
 
+LLNotificationChannel::~LLNotificationChannel()
+{
+    for (LLBoundListener &listener : mListeners)
+    {
+        listener.disconnect();
+    }
+}
+
 bool LLNotificationChannel::isEmpty() const
 {
 	return mItems.empty();
@@ -1213,14 +1221,14 @@ void LLNotificationChannel::connectToChannel( const std::string& channel_name )
 {
 	if (channel_name.empty())
 	{
-		LLNotifications::instance().connectChanged(
-			boost::bind(&LLNotificationChannelBase::updateItem, this, _1));
+        mListeners.push_back(LLNotifications::instance().connectChanged(
+			boost::bind(&LLNotificationChannelBase::updateItem, this, _1)));
 	}
 	else
 	{
 		mParents.push_back(channel_name);
 		LLNotificationChannelPtr p = LLNotifications::instance().getChannel(channel_name);
-		p->connectChanged(boost::bind(&LLNotificationChannelBase::updateItem, this, _1));
+        mListeners.push_back(p->connectChanged(boost::bind(&LLNotificationChannelBase::updateItem, this, _1)));
 	}
 }
 
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 921398a693..1577038c36 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -835,7 +835,7 @@ public:
 	LLNotificationChannel(const Params& p = Params());
 	LLNotificationChannel(const std::string& name, const std::string& parent, LLNotificationFilter filter);
 
-	virtual ~LLNotificationChannel() {}
+	virtual ~LLNotificationChannel();
 	typedef LLNotificationSet::iterator Iterator;
     
 	std::string getName() const { return mName; }
@@ -845,8 +845,6 @@ public:
 		return boost::iterator_range<parents_iter>(mParents);
 	}
     
-	void connectToChannel(const std::string& channel_name);
-    
     bool isEmpty() const;
     S32 size() const;
     
@@ -856,9 +854,13 @@ public:
 	
 	std::string summarize();
 
+protected:
+    void connectToChannel(const std::string& channel_name);
+
 private:
 	std::string mName;
 	std::vector<std::string> mParents;
+    std::vector<LLBoundListener> mListeners;
 };
 
 // An interface class to provide a clean linker seam to the LLNotifications class.
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index cc4f4536a4..3444f50e52 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -177,6 +177,11 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
 	LLFloaterNotificationsTabbed::getInstance()->setSysWellChiclet(this);
 }
 
+LLNotificationChiclet::~LLNotificationChiclet()
+{
+    mNotificationChannel.reset();
+}
+
 void LLNotificationChiclet::onMenuItemClicked(const LLSD& user_data)
 {
 	std::string action = user_data.asString();
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 58a797218f..1698fa269a 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -531,8 +531,9 @@ public:
 	struct Params : public LLInitParam::Block<Params, LLSysWellChiclet::Params>{};
 		
 protected:
-	struct ChicletNotificationChannel : public LLNotificationChannel
+	class ChicletNotificationChannel : public LLNotificationChannel
 	{
+    public:
 		ChicletNotificationChannel(LLNotificationChiclet* chiclet) 
 			: LLNotificationChannel(LLNotificationChannel::Params().filter(filterNotification).name(chiclet->getSessionId().asString()))
 			, mChiclet(chiclet)
@@ -542,6 +543,7 @@ protected:
 			connectToChannel("Offer");
 			connectToChannel("Notifications");
 		}
+        virtual ~ChicletNotificationChannel() {}
 				
 		static bool filterNotification(LLNotificationPtr notify);
 		// connect counter updaters to the corresponding signals
@@ -553,9 +555,10 @@ protected:
 	};
 				
 	boost::scoped_ptr<ChicletNotificationChannel> mNotificationChannel;
-				
-	LLNotificationChiclet(const Params& p);
-				
+
+    LLNotificationChiclet(const Params& p);
+    ~LLNotificationChiclet();
+
 	/**
 	 * Processes clicks on chiclet menu.
 	 */
-- 
cgit v1.2.3


From 6b3dd7929b4038a2c4c6d1b563a3b0735b3a020d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 24 Nov 2023 02:23:20 +0200
Subject: SL-17076 Thread safety of LLNotificationChannelBase's items

Due to odd crashes when cleaning mItems adding thread safety
Viewer runs window in a separate thread, it is possible notification
was added in a way that corrupted the list.
---
 indra/llui/llnotifications.cpp         | 27 +++++++++++----------------
 indra/llui/llnotifications.h           | 28 ++++++++++++++--------------
 indra/llui/llnotificationslistener.cpp | 10 +++++-----
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index c0a7866926..d87241a9bf 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -994,6 +994,7 @@ LLBoundListener LLNotificationChannelBase::connectChangedImpl(const LLEventListe
 	// all of the notifications that are already in the channel
 	// we use a special signal called "load" in case the channel wants to care
 	// only about new notifications
+    LLMutexLock lock(&mItemsMutex);
 	for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it)
 	{
 		slot(LLSD().with("sigtype", "load").with("id", (*it)->id()));
@@ -1186,22 +1187,18 @@ bool LLNotificationChannel::isEmpty() const
 
 S32 LLNotificationChannel::size() const
 {
-	return mItems.size();
+    return mItems.size();
 }
 
-LLNotificationChannel::Iterator LLNotificationChannel::begin()
+size_t LLNotificationChannel::size()
 {
-	return mItems.begin();
+	return mItems.size();
 }
 
-LLNotificationChannel::Iterator LLNotificationChannel::end()
+void LLNotificationChannel::forEachNotification(NotificationProcess process)
 {
-	return mItems.end();
-}
-
-size_t LLNotificationChannel::size()
-{
-	return mItems.size();
+    LLMutexLock lock(&mItemsMutex);
+    std::for_each(mItems.begin(), mItems.end(), process);
 }
 
 std::string LLNotificationChannel::summarize()
@@ -1209,7 +1206,8 @@ std::string LLNotificationChannel::summarize()
 	std::string s("Channel '");
 	s += mName;
 	s += "'\n  ";
-	for (LLNotificationChannel::Iterator it = begin(); it != end(); ++it)
+    LLMutexLock lock(&mItemsMutex);
+	for (LLNotificationChannel::Iterator it = mItems.begin(); it != mItems.end(); ++it)
 	{
 		s += (*it)->summarize();
 		s += "\n  ";
@@ -1736,6 +1734,7 @@ void LLNotifications::cancel(LLNotificationPtr pNotif)
 
 void LLNotifications::cancelByName(const std::string& name)
 {
+    LLMutexLock lock(&mItemsMutex);
 	std::vector<LLNotificationPtr> notifs_to_cancel;
 	for (LLNotificationSet::iterator it=mItems.begin(), end_it = mItems.end();
 		it != end_it;
@@ -1760,6 +1759,7 @@ void LLNotifications::cancelByName(const std::string& name)
 
 void LLNotifications::cancelByOwner(const LLUUID ownerId)
 {
+    LLMutexLock lock(&mItemsMutex);
 	std::vector<LLNotificationPtr> notifs_to_cancel;
 	for (LLNotificationSet::iterator it = mItems.begin(), end_it = mItems.end();
 		 it != end_it;
@@ -1807,11 +1807,6 @@ LLNotificationPtr LLNotifications::find(LLUUID uuid)
 	}
 }
 
-void LLNotifications::forEachNotification(NotificationProcess process)
-{
-	std::for_each(mItems.begin(), mItems.end(), process);
-}
-
 std::string LLNotifications::getGlobalString(const std::string& key) const
 {
 	GlobalStringMap::const_iterator it = mGlobalStrings.find(key);
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 1577038c36..4d71d189f2 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -738,16 +738,19 @@ class LLNotificationChannelBase :
 {
 	LOG_CLASS(LLNotificationChannelBase);
 public:
-	LLNotificationChannelBase(LLNotificationFilter filter) 
-	:	mFilter(filter), 
-		mItems() 
-	{}
+    LLNotificationChannelBase(LLNotificationFilter filter) 
+    : mFilter(filter)
+    , mItems() 
+    , mItemsMutex()
+    {}
+
     virtual ~LLNotificationChannelBase()
     {
         // explicit cleanup for easier issue detection
         mChanged.disconnect_all_slots();
         mPassedFilter.disconnect_all_slots();
         mFailedFilter.disconnect_all_slots();
+        LLMutexLock lock(&mItemsMutex);
         mItems.clear();
     }
 	// you can also connect to a Channel, so you can be notified of
@@ -786,6 +789,7 @@ protected:
 	LLStandardSignal mChanged;
 	LLStandardSignal mPassedFilter;
 	LLStandardSignal mFailedFilter;
+    LLMutex mItemsMutex;
 	
 	// these are action methods that subclasses can override to take action 
 	// on specific types of changes; the management of the mItems list is
@@ -844,14 +848,14 @@ public:
 	{
 		return boost::iterator_range<parents_iter>(mParents);
 	}
-    
+
     bool isEmpty() const;
     S32 size() const;
-    
-    Iterator begin();
-    Iterator end();
-	size_t size();
-	
+    size_t size();
+
+    typedef boost::function<void(LLNotificationPtr)> NotificationProcess;
+    void forEachNotification(NotificationProcess process);
+
 	std::string summarize();
 
 protected:
@@ -926,10 +930,6 @@ public:
 	void update(const LLNotificationPtr pNotif);
 
 	LLNotificationPtr find(LLUUID uuid);
-	
-	typedef boost::function<void (LLNotificationPtr)> NotificationProcess;
-	
-	void forEachNotification(NotificationProcess process);
 
 	// This is all stuff for managing the templates
 	// take your template out
diff --git a/indra/llui/llnotificationslistener.cpp b/indra/llui/llnotificationslistener.cpp
index e73ba1fbe9..83b5bf03ac 100644
--- a/indra/llui/llnotificationslistener.cpp
+++ b/indra/llui/llnotificationslistener.cpp
@@ -149,11 +149,11 @@ void LLNotificationsListener::listChannelNotifications(const LLSD& params) const
     if (channel)
     {
         LLSD notifications(LLSD::emptyArray());
-        for (LLNotificationChannel::Iterator ni(channel->begin()), nend(channel->end());
-             ni != nend; ++ni)
-        {
-            notifications.append(asLLSD(*ni));
-        }
+        std::function<void(LLNotificationPtr)> func = [notifications](LLNotificationPtr ni) mutable
+            {
+                notifications.append(asLLSD(ni));
+            };
+        channel->forEachNotification(func);
         response["notifications"] = notifications;
     }
     LLEventPumps::instance().obtain(params["reply"]).post(response);
-- 
cgit v1.2.3


From 15ea200cfbd972139cefb74b9185700a44a978d0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 25 Nov 2023 00:17:56 +0200
Subject: SL-18098 Crash inside unpackBinaryData

---
 indra/llmessage/lldatapacker.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indra/llmessage/lldatapacker.cpp b/indra/llmessage/lldatapacker.cpp
index 9f7768f78e..b7013dbb6e 100644
--- a/indra/llmessage/lldatapacker.cpp
+++ b/indra/llmessage/lldatapacker.cpp
@@ -298,6 +298,13 @@ BOOL LLDataPackerBinaryBuffer::unpackBinaryData(U8 *value, S32 &size, const char
 	}
 
 	htolememcpy(&size, mCurBufferp, MVT_S32, 4);
+
+    if (size < 0)
+    {
+        LL_WARNS() << "LLDataPackerBinaryBuffer::unpackBinaryData unpacked invalid size, aborting!" << LL_ENDL;
+        return FALSE;
+    }
+
 	mCurBufferp += 4;
 
 	if (!verifyLength(size, name))
-- 
cgit v1.2.3


From 337b2fcc3605ef00d0338b1588c2ec86c265fd68 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Mon, 27 Nov 2023 23:55:36 +0100
Subject: Mac build fix

---
 indra/newview/llfloaterimsessiontab.cpp | 2 +-
 indra/newview/llinventorygallery.cpp    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 0cb3d9ab47..35b2af7b84 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -273,7 +273,7 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mEmojiRecentIconsCtrl->setVisible(false);
 
 	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
-	mEmojiPickerToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
+	mEmojiPickerToggleBtn->setClickedCallback([](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
 
 	mGearBtn = getChild<LLButton>("gear_btn");
 	mAddBtn = getChild<LLButton>("add_btn");
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 4838ba7a47..c7588d3f5b 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2406,7 +2406,7 @@ void LLInventoryGallery::startDrag()
             ids.push_back(selected_id);
         }
 
-        const LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);        
+        const LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);
         if (cat && gInventory.isObjectDescendentOf(selected_id, gInventory.getRootFolderID())
             && !LLFolderType::lookupIsProtectedType((cat)->getPreferredType()))
         {
@@ -2420,7 +2420,7 @@ void LLInventoryGallery::startDrag()
             ids.push_back(selected_id);
         }
     }
-    LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, LLToolDragAndDrop::SOURCE_AGENT);
+    LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, src);
 }
 
 bool LLInventoryGallery::areViewsInitialized()
-- 
cgit v1.2.3


From d2ade35b0914f86b1c0239dbf40f5d5972a11b07 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Nov 2023 14:08:23 +0200
Subject: SL-20651 DragnDrop from library in gallery mode doesn't work

---
 indra/newview/llinventorygallery.cpp  | 25 ++++++++++++++-----------
 indra/newview/llinventoryobserver.cpp |  1 -
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 845ea01f56..212f8b0446 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2386,7 +2386,7 @@ BOOL LLInventoryGallery::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
     return handled;
 }
 
-void LLInventoryGallery::startDrag()
+void LLInventoryGallery::startDrag() 
 {
     std::vector<EDragAndDropType> types;
     uuid_vec_t ids;
@@ -2407,22 +2407,25 @@ void LLInventoryGallery::startDrag()
         }
 
         const LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);        
-        if (cat && gInventory.isObjectDescendentOf(selected_id, gInventory.getRootFolderID())
-            && !LLFolderType::lookupIsProtectedType((cat)->getPreferredType()))
+        if (cat)
         {
-            if (cat->getOwnerID() == ALEXANDRIA_LINDEN_ID)
+            if (gInventory.isObjectDescendentOf(selected_id, gInventory.getLibraryRootFolderID()))
             {
                 src = LLToolDragAndDrop::SOURCE_LIBRARY;
+                EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(cat->getType());
+                types.push_back(type);
+                ids.push_back(selected_id);
+            }
+            else if (gInventory.isObjectDescendentOf(selected_id, gInventory.getRootFolderID())
+                && !LLFolderType::lookupIsProtectedType((cat)->getPreferredType()))
+            {
+                EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(cat->getType());
+                types.push_back(type);
+                ids.push_back(selected_id);
             }
-
-            EDragAndDropType type = LLViewerAssetType::lookupDragAndDropType(cat->getType());
-            types.push_back(type);
-            ids.push_back(selected_id);
         }
     }
-    // We must have set this for some reason, but it's causing compile errors
-    (void)src;
-    LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, LLToolDragAndDrop::SOURCE_AGENT);
+    LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, src);
 }
 
 bool LLInventoryGallery::areViewsInitialized()
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 281a8bc789..655bdfca6b 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -358,7 +358,6 @@ void LLInventoryFetchItemsObserver::startFetch()
                     {
                         // Start fetching whole folder since we need all items
                         LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(folder.first, true);
-
                     }
                     else
                     {
-- 
cgit v1.2.3


From 43cf06b79e1a7d514f939b9511c3100da2768169 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 30 Nov 2023 02:04:32 +0200
Subject: SL-20649 Revert "SL-20140 Setting shape hand size to 36 won't save"

This reverts commit b07a9cfec36cdcad604b8aa775ed282793116a4d
to fix SL-20649 "Seeing tiny hands on other avatars"
---
 indra/newview/character/avatar_lad.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 3a333b7faf..2cdd86267e 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -1928,8 +1928,8 @@
      edit_group_order="10"
      label_min="Small Hands"
      label_max="Large Hands"
-     value_min="-.5"
-     value_max=".5"
+     value_min="-.3"
+     value_max=".3"
      camera_elevation=".1"
      camera_distance="1.4"
      camera_angle="0">
-- 
cgit v1.2.3


From 2fad5a770b3583e576992d075c24bc0e25443053 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 30 Nov 2023 13:59:14 +0100
Subject: SL-19801 Log unicode characters for debug

---
 indra/llcommon/llstring.cpp | 24 ++++++++++++++++++++++++
 indra/llcommon/llstring.h   |  2 ++
 indra/llui/lltexteditor.cpp |  1 +
 indra/llui/llview.cpp       |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index d68cbaa22c..81b0207038 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -365,6 +365,30 @@ S32 wchar_utf8_length(const llwchar wc)
 	}
 }
 
+std::string wchar_utf8_preview(const llwchar wc)
+{
+    std::ostringstream oss;
+    oss << std::hex << std::uppercase << (U32)wc;
+
+    U8 out_bytes[8];
+    U32 size = (U32)wchar_to_utf8chars(wc, (char*)out_bytes);
+
+    if (size > 1)
+    {
+        oss << " [";
+        for (U32 i = 0; i < size; ++i)
+        {
+            if (i)
+            {
+                oss << ", ";
+            }
+            oss << (int)out_bytes[i];
+        }
+        oss << "]";
+    }
+
+    return oss.str();
+}
 
 S32 wstring_utf8_length(const LLWString& wstr)
 {
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 62403969e4..8def59ed7f 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -682,6 +682,8 @@ LL_COMMON_API S32 wstring_utf8_length(const LLWString& wstr);
 // Length in bytes of this wide char in a UTF8 string
 LL_COMMON_API S32 wchar_utf8_length(const llwchar wc); 
 
+LL_COMMON_API std::string wchar_utf8_preview(const llwchar wc);
+
 LL_COMMON_API std::string utf8str_tolower(const std::string& utf8str);
 
 // Length in llwchar (UTF-32) of the first len units (16 bits) of the given UTF-16 string.
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 7aef056e5a..3910be1443 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -682,6 +682,7 @@ void LLTextEditor::selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_p
 
 void LLTextEditor::insertEmoji(llwchar emoji)
 {
+	LL_INFOS() << "LLTextEditor::insertEmoji(" << wchar_utf8_preview(emoji) << ")" << LL_ENDL;
 	auto styleParams = LLStyle::Params();
 	styleParams.font = LLFontGL::getFontEmoji();
 	auto segment = new LLEmojiTextSegment(new LLStyle(styleParams), mCursorPos, mCursorPos + 1, *this);
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 0046105870..7b6661a519 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1024,7 +1024,7 @@ BOOL LLView::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
 			handled = handleUnicodeCharHere(uni_char);
 			if (handled && LLView::sDebugKeys)
 			{
-				LL_INFOS() << "Unicode key handled by " << getName() << LL_ENDL;
+				LL_INFOS() << "Unicode key " << wchar_utf8_preview(uni_char) << " is handled by " << getName() << LL_ENDL;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 54db4206e9302e7510bc4f103ff59714c1be942d Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 30 Nov 2023 14:09:50 +0100
Subject: SL-19801 Inserting emoji characters from system emoji picker does not
 work on macOS

---
 indra/llwindow/llopenglview-objc.mm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 7936245744..5527094021 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -718,6 +718,19 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
 {
+	// SL-19801 Special workaround for system emoji picker
+	if ([aString length] == 2)
+	{
+		uint32_t b0 = [aString characterAtIndex:0];
+		uint32_t b1 = [aString characterAtIndex:1];
+		if (((b0 & 0xF000) == 0xD000) && ((b1 & 0xF000) == 0xD000))
+		{
+			uint32_t b = 0x10000 | ((b0 & 0x3F) << 10) | (b1 & 0x3FF);
+			callUnicodeCallback(b, 0);
+			return;
+		}
+	}
+
 	if (!mHasMarkedText)
 	{
 		for (NSInteger i = 0; i < [aString length]; i++)
-- 
cgit v1.2.3


From d48c77b6dcfc6eafba09b58f530bbfa4f00a9431 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 4 Dec 2023 16:22:57 +0200
Subject: SL-20679 fix for "Sort conversations by recent activity" option

---
 indra/newview/llfloaterimcontainer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index f997dc9910..635aee64ff 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1770,6 +1770,7 @@ void LLFloaterIMContainer::setTimeNow(const LLUUID& session_id, const LLUUID& pa
 	LLConversationItemSession* item = dynamic_cast<LLConversationItemSession*>(getSessionModel(session_id));
 	if (item)
 	{
+        item->setTimeNow(participant_id);
 		mConversationViewModel.requestSortAll();
 		mConversationsRoot->arrangeAll();
 	}
-- 
cgit v1.2.3


From 07ace73c49918ffb70e99c2239849eaaabc1fe45 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 5 Dec 2023 16:17:04 +0200
Subject: DRTVWR-587 Update llca to version 202312051404.0

---
 autobuild.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 0e5a5a2a25..1aa579e7a2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1468,11 +1468,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e50ea94bbaa4ff41bf53b84b7192df1a694c5337</string>
+              <string>3a3e14563cd5fc019c3f139b82aa46ec79847709</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/llca/releases/download/v202310121525.0-d22bd98/llca-202310121530.0-common-d22bd98.tar.zst</string>
+              <string>https://github.com/secondlife/llca/releases/download/v202312051403.17-0f5d9c3/llca-202312051404.0-common-0f5d9c3.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
@@ -1486,7 +1486,7 @@
         <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
       </string>
         <key>version</key>
-        <string>202310121530.0</string>
+        <string>202312051404.0</string>
         <key>name</key>
         <string>llca</string>
       </map>
-- 
cgit v1.2.3


From be44fc277e0c137a907fa6e9e39a700725e16b1a Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 4 Dec 2023 16:22:57 +0200
Subject: SL-20679 fix for "Sort conversations by recent activity" option

# Conflicts:
#	indra/newview/llfloaterimcontainer.cpp
---
 indra/newview/llfloaterimcontainer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 011ad67011..543540d20f 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1755,7 +1755,7 @@ void LLFloaterIMContainer::setTimeNow(const LLUUID& session_id, const LLUUID& pa
 	LLConversationItemSession* item = dynamic_cast<LLConversationItemSession*>(get_ptr_in_map(mConversationsItems,session_id));
 	if (item)
 	{
-		item->setTimeNow(participant_id);
+        item->setTimeNow(participant_id);
 		mConversationViewModel.requestSortAll();
 		mConversationsRoot->arrangeAll();
 	}
-- 
cgit v1.2.3


From 86a437d96cf508fb4feacc9d091f64aa7eb152ce Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 5 Dec 2023 16:17:04 +0200
Subject: DRTVWR-587 Update llca to version 202312051404.0

---
 autobuild.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 37371746d5..526b615f4a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1468,11 +1468,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e50ea94bbaa4ff41bf53b84b7192df1a694c5337</string>
+              <string>3a3e14563cd5fc019c3f139b82aa46ec79847709</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/llca/releases/download/v202310121525.0-d22bd98/llca-202310121530.0-common-d22bd98.tar.zst</string>
+              <string>https://github.com/secondlife/llca/releases/download/v202312051403.17-0f5d9c3/llca-202312051404.0-common-0f5d9c3.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
@@ -1486,7 +1486,7 @@
         <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
       </string>
         <key>version</key>
-        <string>202310121530.0</string>
+        <string>202312051404.0</string>
         <key>name</key>
         <string>llca</string>
       </map>
-- 
cgit v1.2.3


From eff5958c11f2fcbb0449b8e011d4676a239bbe57 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 4 Dec 2023 08:26:09 +0100
Subject: Fix formatting in autobuild.xml (indents in close tags)

---
 .github/release.yaml | 36 +++++++++++++--------------
 autobuild.xml        | 70 ++++++++++++++++++++++++++--------------------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/.github/release.yaml b/.github/release.yaml
index 0f4884c944..f550e52020 100644
--- a/.github/release.yaml
+++ b/.github/release.yaml
@@ -1,18 +1,18 @@
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-    authors:
-      - dependabot 
-  categories:
-    - title: Breaking Changes 🛠
-      labels:
-        - semver-major
-        - breaking-change
-    - title: New Features 🎉
-      labels:
-        - semver-minor
-        - enhancement
-    - title: Other Changes
-      labels:
-        - '*'
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - dependabot
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - semver-major
+        - breaking-change
+    - title: New Features 🎉
+      labels:
+        - semver-minor
+        - enhancement
+    - title: Other Changes
+      labels:
+        - '*'
diff --git a/autobuild.xml b/autobuild.xml
index 526b615f4a..05e8f9d630 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2933,7 +2933,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -2953,11 +2953,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -2974,7 +2974,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -2994,11 +2994,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3019,11 +3019,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3036,7 +3036,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3051,7 +3051,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3064,7 +3064,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -3077,11 +3077,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3094,7 +3094,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -3107,7 +3107,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3120,7 +3120,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3144,11 +3144,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3169,7 +3169,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3207,11 +3207,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3221,11 +3221,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>/build</string>
                   <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3245,11 +3245,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DUSE_OPENAL:BOOL=ON</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3263,11 +3263,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -3282,11 +3282,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3296,11 +3296,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>/build</string>
                   <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -3319,11 +3319,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DUSE_OPENAL:BOOL=ON</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
-</array>
+                </array>
               </map>
               <key>build</key>
               <map>
@@ -3337,11 +3337,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-</array>
+                </array>
                 <key>arguments</key>
                 <array>
                   <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
-- 
cgit v1.2.3


From f4307bed264cc4c5502e8f0552cbf368e23edc28 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Nov 2023 21:23:38 +0200
Subject: SL-20181 Don't force fetch if vesion is unknown

---
 indra/newview/llinventorymodel.cpp    |  3 ++
 indra/newview/llinventoryobserver.cpp | 65 +++++++++++++++++------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 8583cca103..01bf7b3270 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3546,6 +3546,9 @@ void LLInventoryModel::processUpdateCreateInventoryItem(LLMessageSystem* msg, vo
 
 		gInventoryCallbacks.fire(callback_id, item_id);
 
+        // Message system at the moment doesn't support Thumbnails and potential
+        // newer features so just rerequest whole item
+        //
         // todo: instead of unpacking message fully,
         // grab only an item_id, then fetch
         LLInventoryModelBackgroundFetch::instance().scheduleItemFetch(item_id, true);
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 655bdfca6b..71c81e9352 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -337,51 +337,48 @@ void LLInventoryFetchItemsObserver::startFetch()
     {
         for (requests_by_folders_t::value_type &folder : requests)
         {
-            if (folder.second.size() > MAX_INDIVIDUAL_ITEM_REQUESTS)
+            LLViewerInventoryCategory* cat = gInventory.getCategory(folder.first);
+            if (cat)
             {
-                // requesting one by one will take a while
-                // do whole folder
-                LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(folder.first, true);
-            }
-            else
-            {
-                LLViewerInventoryCategory* cat = gInventory.getCategory(folder.first);
-                if (cat)
+                if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
                 {
-                    if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
-                    {
-                        // start fetching whole folder since it's not ready either way
-                        cat->fetch();
-                    }
-                    else if (cat->getViewerDescendentCount() <= folder.second.size()
-                             || cat->getDescendentCount() <= folder.second.size())
-                    {
-                        // Start fetching whole folder since we need all items
-                        LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(folder.first, true);
-                    }
-                    else
-                    {
-                        // get items one by one
-                        for (LLUUID &item_id : folder.second)
-                        {
-                            LLInventoryModelBackgroundFetch::getInstance()->scheduleItemFetch(item_id);
-                        }
-                    }
+                    // start fetching whole folder since it's not ready either way
+                    cat->fetch();
+                }
+                else if (folder.second.size() > MAX_INDIVIDUAL_ITEM_REQUESTS)
+                {
+                    // requesting one by one will take a while
+                    // do whole folder
+                    LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(folder.first, true);
+                }
+                else if (cat->getViewerDescendentCount() <= folder.second.size()
+                         || cat->getDescendentCount() <= folder.second.size())
+                {
+                    // Start fetching whole folder since we need all items
+                    LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(folder.first, true);
                 }
                 else
                 {
-                    // Isn't supposed to happen? We should have all folders
-                    // and if item exists, folder is supposed to exist as well.
-                    llassert(false);
-                    LL_WARNS("Inventory") << "Missing folder: " << folder.first << " fetching items individually" << LL_ENDL;
-
                     // get items one by one
-                    for (LLUUID &item_id : folder.second)
+                    for (LLUUID& item_id : folder.second)
                     {
                         LLInventoryModelBackgroundFetch::getInstance()->scheduleItemFetch(item_id);
                     }
                 }
             }
+            else
+            {
+                // Isn't supposed to happen? We should have all folders
+                // and if item exists, folder is supposed to exist as well.
+                llassert(false);
+                LL_WARNS("Inventory") << "Missing folder: " << folder.first << " fetching items individually" << LL_ENDL;
+
+                // get items one by one
+                for (LLUUID& item_id : folder.second)
+                {
+                    LLInventoryModelBackgroundFetch::getInstance()->scheduleItemFetch(item_id);
+                }
+            }
         }
     }
     else
-- 
cgit v1.2.3


From f394d675a766f58b62bebaaa4f7caeddcec9a600 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Nov 2023 21:42:13 +0200
Subject: SL-20181 Dupplicate prevention for forced fetches

Might be better to have a separate set of states for 'fetched children'
or 'all children complete' inside the folder itself.
---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 44 +++++++++++++++++++----
 indra/newview/llinventorymodelbackgroundfetch.h   |  1 +
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 91adef8047..f1c5104e76 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -358,8 +358,22 @@ void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id,
     {
         mBackgroundFetchActive = true;
 
-        // Specific folder requests go to front of queue.
-        mFetchFolderQueue.push_front(FetchQueueInfo(cat_id, forced ? FT_FORCED : FT_DEFAULT));
+        if (forced)
+        {
+            // check if already requested
+            if (mForceFetchSet.find(cat_id) != mForceFetchSet.end())
+            {
+                mForceFetchSet.insert(cat_id);
+                mFetchItemQueue.push_front(FetchQueueInfo(cat_id, FT_FORCED));
+            }
+        }
+        else
+        {
+            // Specific folder requests go to front of queue.
+            // version presence acts as dupplicate prevention for normal fetches
+            mFetchItemQueue.push_front(FetchQueueInfo(cat_id, FT_DEFAULT));
+        }
+
         gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
     }
 }
@@ -369,8 +383,21 @@ void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id, b
     if (mFetchItemQueue.empty() || mFetchItemQueue.front().mUUID != item_id)
     {
         mBackgroundFetchActive = true;
+        if (forced)
+        {
+            // check if already requested
+            if (mForceFetchSet.find(item_id)!= mForceFetchSet.end())
+            {
+                mForceFetchSet.insert(item_id);
+                mFetchItemQueue.push_front(FetchQueueInfo(item_id, FT_FORCED, false));
+            }
+        }
+        else
+        {
+            // 'isFinished' being set acts as dupplicate prevention for normal fetches
+            mFetchItemQueue.push_front(FetchQueueInfo(item_id, FT_DEFAULT, false));
+        }
 
-        mFetchItemQueue.push_front(FetchQueueInfo(item_id, forced ? FT_FORCED : FT_DEFAULT, false));
         gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
     }
 }
@@ -846,10 +873,10 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                         mExpectedFolderIds.push_back(cat_id);
 
                         EFetchType type = fetch_info.mFetchType;
-                        LLUUID cat_id = cat->getUUID();
-                        AISAPI::completion_t cb = [cat_id , type](const LLUUID& response_id)
+                        LLUUID cat_cb_id = cat_id;
+                        AISAPI::completion_t cb = [cat_cb_id, type](const LLUUID& response_id)
                         {
-                            LLInventoryModelBackgroundFetch::instance().onAISFolderCalback(cat_id , response_id , type);
+                            LLInventoryModelBackgroundFetch::instance().onAISFolderCalback(cat_cb_id, response_id , type);
                         };
 
                         AISAPI::ITEM_TYPE item_type = AISAPI::INVENTORY;
@@ -908,6 +935,11 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
             AISAPI::FetchItem(fetch_info.mUUID, AISAPI::INVENTORY, ais_simple_item_callback);
         }
     }
+
+    if (fetch_info.mFetchType == FT_FORCED)
+    {
+        mForceFetchSet.erase(fetch_info.mUUID);
+    }
 }
 
 // Bundle up a bunch of requests to send all at once.
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index e7be265a3d..5d66985b40 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -129,6 +129,7 @@ private:
 	F32 mMinTimeBetweenFetches;
 	fetch_queue_t mFetchFolderQueue;
     fetch_queue_t mFetchItemQueue;
+    uuid_set_t mForceFetchSet;
     std::list<LLUUID> mExpectedFolderIds; // for debug, should this track time?
 };
 
-- 
cgit v1.2.3


From 9f3edb90d49bb10fa5608b4d6bdf242c243b0441 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Nov 2023 23:27:18 +0200
Subject: SL-20181 Minor inventory fetching adjustements

---
 indra/newview/llaisapi.cpp           | 16 +++++++++++-----
 indra/newview/llinventoryfilter.cpp  | 12 +++++++++---
 indra/newview/llinventorygallery.cpp |  2 +-
 indra/newview/llinventorymodel.cpp   | 17 ++++++++++-------
 indra/newview/llviewerinventory.cpp  |  5 ++---
 indra/newview/llviewerinventory.h    |  5 +++--
 6 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 17e1a27934..f23ce13608 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -1738,10 +1738,6 @@ void AISUpdate::doUpdate()
 		LL_DEBUGS("Inventory") << "cat version update " << cat->getName() << " to version " << cat->getVersion() << LL_ENDL;
 		if (cat->getVersion() != version)
 		{
-			LL_WARNS() << "Possible version mismatch for category " << cat->getName()
-					<< ", viewer version " << cat->getVersion()
-					<< " AIS version " << version << " !!!Adjusting local version!!!" <<  LL_ENDL;
-
             // the AIS version should be considered the true version. Adjust 
             // our local category model to reflect this version number.  Otherwise 
             // it becomes possible to get stuck with the viewer being out of 
@@ -1751,13 +1747,23 @@ void AISUpdate::doUpdate()
             // is performed.  This occasionally gets out of sync however.
             if (version != LLViewerInventoryCategory::VERSION_UNKNOWN)
             {
+                LL_WARNS() << "Possible version mismatch for category " << cat->getName()
+                    << ", viewer version " << cat->getVersion()
+                    << " AIS version " << version << " !!!Adjusting local version!!!" << LL_ENDL;
                 cat->setVersion(version);
             }
             else
             {
                 // We do not account for update if version is UNKNOWN, so we shouldn't rise version
                 // either or viewer will get stuck on descendants count -1, try to refetch folder instead
-                cat->fetch();
+                //
+                // Todo: proper backoff?
+
+                LL_WARNS() << "Possible version mismatch for category " << cat->getName()
+                    << ", viewer version " << cat->getVersion()
+                    << " AIS version " << version << " !!!Rerequesting category!!!" << LL_ENDL;
+                const S32 LONG_EXPIRY = 360;
+                cat->fetch(LONG_EXPIRY);
             }
 		}
 	}
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 7b4283e94d..332c6d3085 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -202,12 +202,18 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
         && !LLInventoryModelBackgroundFetch::instance().inventoryFetchInProgress())
     {
         LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id);
-        if ((!cat && folder_id.notNull()) || (cat && cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN))
+        if ((!cat && folder_id.notNull()))
         {
-            // At the moment background fetch only cares about VERSION_UNKNOWN,
-            // so do not check isCategoryComplete that compares descendant count
+            // Shouldn't happen? Server provides full list of folders on startup
             LLInventoryModelBackgroundFetch::instance().start(folder_id, false);
         }
+        else if (cat && cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+        {
+            // At the moment background fetch only cares about VERSION_UNKNOWN,
+            // so do not check isCategoryComplete that compares descendant count,
+            // but if that is nesesary, do a forced scheduleFolderFetch.
+            cat->fetch();
+        }
 	}
 
     if (!checkAgainstFilterThumbnails(folder_id))
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 212f8b0446..9fb2783506 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2386,7 +2386,7 @@ BOOL LLInventoryGallery::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
     return handled;
 }
 
-void LLInventoryGallery::startDrag() 
+void LLInventoryGallery::startDrag()
 {
     std::vector<EDragAndDropType> types;
     uuid_vec_t ids;
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 01bf7b3270..7f60e6c509 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3911,19 +3911,22 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
 
 	for (cat_array_t::iterator cit = folders.begin(); cit != folders.end(); ++cit)
 	{
-		gInventory.updateCategory(*cit);
-
-        // Temporary workaround: just fetch the item using AIS to get missing fields.
-        // If this works fine we might want to extract ids only from the message
-        // then use AIS as a primary fetcher
-        LLInventoryModelBackgroundFetch::instance().scheduleFolderFetch((*cit)->getUUID(), true /*force, since it has changes*/);
+        gInventory.updateCategory(*cit);
+        if ((*cit)->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN)
+        {
+            // Temporary workaround: just fetch the item using AIS to get missing fields.
+            // If this works fine we might want to extract 'ids only' from the message
+            // then use AIS as a primary fetcher
+            LLInventoryModelBackgroundFetch::instance().scheduleFolderFetch((*cit)->getUUID(), true /*force, since it has changes*/);
+        }
+        // else already called fetch() above
 	}
 	for (item_array_t::iterator iit = items.begin(); iit != items.end(); ++iit)
 	{
 		gInventory.updateItem(*iit);
 
         // Temporary workaround: just fetch the item using AIS to get missing fields.
-        // If this works fine we might want to extract ids only from the message
+        // If this works fine we might want to extract 'ids only' from the message
         // then use AIS as a primary fetcher
         LLInventoryModelBackgroundFetch::instance().scheduleItemFetch((*iit)->getUUID(), true);
 	}
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 5ee613d49d..6d5049347f 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -648,15 +648,14 @@ void LLViewerInventoryCategory::setVersion(S32 version)
 	mVersion = version;
 }
 
-bool LLViewerInventoryCategory::fetch()
+bool LLViewerInventoryCategory::fetch(S32 expiry_seconds)
 {
 	if((VERSION_UNKNOWN == getVersion())
 	   && mDescendentsRequested.hasExpired())	//Expired check prevents multiple downloads.
 	{
 		LL_DEBUGS(LOG_INV) << "Fetching category children: " << mName << ", UUID: " << mUUID << LL_ENDL;
-		const F32 FETCH_TIMER_EXPIRY = 10.0f;
 		mDescendentsRequested.reset();
-		mDescendentsRequested.setTimerExpirySec(FETCH_TIMER_EXPIRY);
+		mDescendentsRequested.setTimerExpirySec(expiry_seconds);
 
 		std::string url;
 		if (gAgent.getRegion())
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index bce8da0a69..4297e194dd 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -209,8 +209,9 @@ public:
 	S32 getVersion() const;
 	void setVersion(S32 version);
 
-	// Returns true if a fetch was issued (not nessesary in progress).
-	bool fetch();
+    // Returns true if a fetch was issued (not nessesary in progress).
+    // no requests will happen during expiry_seconds even if fetch completed
+    bool fetch(S32 expiry_seconds = 10);
 
     typedef enum {
         FETCH_NONE = 0,
-- 
cgit v1.2.3


From 728a91b288c88131db032db687a3e6f0e0a09301 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 29 Nov 2023 22:33:59 +0200
Subject: SL-20181 Use back-of compatible fetch

If fetch failed for some reason, old version would cause excessive
rerequests.
---
 indra/newview/llinventorybridge.cpp | 7 +++++--
 indra/newview/llviewerinventory.cpp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index de987d2dbd..ff92af32ff 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2284,8 +2284,11 @@ BOOL LLFolderBridge::isItemMovable() const
 
 void LLFolderBridge::selectItem()
 {
-	// Have no fear: the first thing start() does is to test if everything for that folder has been fetched...
-	LLInventoryModelBackgroundFetch::instance().start(getUUID(), true);
+    LLViewerInventoryCategory* cat = gInventory.getCategory(getUUID());
+    if (cat)
+    {
+        cat->fetch();
+    }
 }
 
 void LLFolderBridge::buildDisplayName() const
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6d5049347f..a976cdc06d 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -664,7 +664,7 @@ bool LLViewerInventoryCategory::fetch(S32 expiry_seconds)
 		}
 		else
 		{
-			LL_WARNS(LOG_INV) << "agent region is null" << LL_ENDL;
+			LL_WARNS_ONCE(LOG_INV) << "agent region is null" << LL_ENDL;
 		}
 		if (!url.empty() || AISAPI::isAvailable())
 		{
-- 
cgit v1.2.3


From 38fbe5267bef11d57cb3ad7795c3a9b602e414c5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 30 Nov 2023 00:21:46 +0200
Subject: SL-20181 Optimize marketplace fetch request

- Move it to the back unless requested by floater
(prioritize main inventory)
- Instead of fetching whole folder which likely has pending changes
from web side, fetch folder individually, then fetch changed content
in bulk
---
 indra/newview/llfloatermarketplacelistings.cpp    | 25 ++++++---
 indra/newview/llfloatermarketplacelistings.h      |  4 +-
 indra/newview/llinventorymodelbackgroundfetch.cpp | 67 ++++++++++++++++-------
 indra/newview/llinventorymodelbackgroundfetch.h   |  3 +-
 4 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 71b3b16809..6216f4e39a 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -183,7 +183,8 @@ void LLPanelMarketplaceListings::draw()
     // Get the audit button enabled only after the whole inventory is fetched
     if (!mAuditBtn->getEnabled())
     {
-        mAuditBtn->setEnabled(LLInventoryModelBackgroundFetch::instance().isEverythingFetched());
+        LLInventoryModelBackgroundFetch* inst = LLInventoryModelBackgroundFetch::getInstance();
+        mAuditBtn->setEnabled(inst->isEverythingFetched() && !inst->folderFetchActive());
     }
     
 	LLPanel::draw();
@@ -410,8 +411,14 @@ BOOL LLFloaterMarketplaceListings::postBuild()
 	mCategoryAddedObserver = new LLMarketplaceListingsAddedObserver(this);
 	gInventory.addObserver(mCategoryAddedObserver);
 	
-    // Fetch aggressively so we can interact with listings right onOpen()
-	fetchContents();
+
+    // Fetch aggressively so we can interact with listings as soon as possible
+    if (!fetchContents())
+    {
+        const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+        LLInventoryModelBackgroundFetch::instance().start(marketplacelistings_id, true);
+    }
+	
 
 	return TRUE;
 }
@@ -440,17 +447,19 @@ void LLFloaterMarketplaceListings::onFocusReceived()
 	updateView();
 }
 
-void LLFloaterMarketplaceListings::fetchContents()
+bool LLFloaterMarketplaceListings::fetchContents()
 {
-	if (mRootFolderId.notNull() &&
+    if (mRootFolderId.notNull() &&
         (LLMarketplaceData::instance().getSLMDataFetched() != MarketplaceFetchCodes::MARKET_FETCH_LOADING) &&
         (LLMarketplaceData::instance().getSLMDataFetched() != MarketplaceFetchCodes::MARKET_FETCH_DONE))
-	{
+    {
         LLMarketplaceData::instance().setDataFetchedSignal(boost::bind(&LLFloaterMarketplaceListings::updateView, this));
         LLMarketplaceData::instance().setSLMDataFetched(MarketplaceFetchCodes::MARKET_FETCH_LOADING);
-		LLInventoryModelBackgroundFetch::instance().start(mRootFolderId, true);
+        LLInventoryModelBackgroundFetch::instance().start(mRootFolderId, true);
         LLMarketplaceData::instance().getSLMListings();
-	}
+        return true;
+    }
+    return false;
 }
 
 void LLFloaterMarketplaceListings::setRootFolder()
diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h
index 085e517a9d..78d43f97a9 100644
--- a/indra/newview/llfloatermarketplacelistings.h
+++ b/indra/newview/llfloatermarketplacelistings.h
@@ -114,8 +114,8 @@ public:
 protected:
 	void setRootFolder();
 	void setPanels();
-	void fetchContents();
-    
+    bool fetchContents();
+
 	void setStatusString(const std::string& statusString);
 
 	void onClose(bool app_quitting);
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index f1c5104e76..493fb139ac 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -193,13 +193,16 @@ LLInventoryModelBackgroundFetch::LLInventoryModelBackgroundFetch():
     mLastFetchCount(0),
     mFetchFolderCount(0),
     mAllRecursiveFoldersFetched(false),
-	mRecursiveInventoryFetchStarted(false),
-	mRecursiveLibraryFetchStarted(false),
-	mMinTimeBetweenFetches(0.3f)
+    mRecursiveInventoryFetchStarted(false),
+    mRecursiveLibraryFetchStarted(false),
+    mRecursiveMarketplaceFetchStarted(false),
+    mMinTimeBetweenFetches(0.3f)
 {}
 
 LLInventoryModelBackgroundFetch::~LLInventoryModelBackgroundFetch()
-{}
+{
+    gIdleCallbacks.deleteFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+}
 
 bool LLInventoryModelBackgroundFetch::isBulkFetchProcessingComplete() const
 {
@@ -314,6 +317,23 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
 		}
+        else if (cat && cat->getPreferredType() == LLFolderType::FT_MARKETPLACE_LISTINGS)
+        {
+            if (mFetchFolderQueue.empty() || mFetchFolderQueue.back().mUUID != id)
+            {
+                if (recursive && AISAPI::isAvailable())
+                {
+                    // Request marketplace folder and content separately
+                    mFetchFolderQueue.push_front(FetchQueueInfo(id, FT_FOLDER_AND_CONTENT));
+                }
+                else
+                {
+                    mFetchFolderQueue.push_front(FetchQueueInfo(id, recursion_type));
+                }
+                gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
+                mRecursiveMarketplaceFetchStarted = true;
+            }
+        }
 		else
 		{
             if (AISAPI::isAvailable())
@@ -724,7 +744,26 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
     
     if (isFolderFetchProcessingComplete() && mFolderFetchActive)
     {
-        setAllFoldersFetched();
+        if (!mRecursiveInventoryFetchStarted || mRecursiveMarketplaceFetchStarted)
+        {
+            setAllFoldersFetched();
+        }
+        else
+        {
+            // Intent is for marketplace request to happen after
+            // main inventory is done, unless requested by floater
+            mRecursiveMarketplaceFetchStarted = true;
+            const LLUUID& marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
+            if (marketplacelistings_id.notNull())
+            {
+                mFetchFolderQueue.push_front(FetchQueueInfo(marketplacelistings_id, FT_FOLDER_AND_CONTENT));
+            }
+            else
+            {
+                setAllFoldersFetched();
+            }
+        }
+        
     }
 
     if (isBulkFetchProcessingComplete())
@@ -784,22 +823,8 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
 
                         if (child_cat->getPreferredType() == LLFolderType::FT_MARKETPLACE_LISTINGS)
                         {
-                            // special case
-                            content_done = false;
-                            if (children.empty())
-                            {
-                                // fetch marketplace alone
-                                // Should it actually be fetched as FT_FOLDER_AND_CONTENT?
-                                children.push_back(child_cat->getUUID());
-                                mExpectedFolderIds.push_back(child_cat->getUUID());
-                                child_cat->setFetching(target_state);
-                                break;
-                            }
-                            else
-                            {
-                                // fetch marketplace alone next run
-                                continue;
-                            }
+                            // special case, marketplace will fetch that as needed
+                            continue;
                         }
 
                         children.push_back(child_cat->getUUID());
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 5d66985b40..3343b4dd4e 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -69,7 +69,6 @@ public:
     void incrFetchFolderCount(S32 fetching);
 
 	bool isBulkFetchProcessingComplete() const;
-    bool isFolderFetchProcessingComplete() const;
 	void setAllFoldersFetched();
 
     typedef boost::function<void()> folders_fetched_callback_t;
@@ -79,6 +78,7 @@ public:
 	void addRequestAtBack(const LLUUID & id, bool recursive, bool is_category);
 
 protected:
+    bool isFolderFetchProcessingComplete() const;
 
     typedef enum {
         FT_DEFAULT = 0,
@@ -115,6 +115,7 @@ protected:
 private:
  	bool mRecursiveInventoryFetchStarted;
 	bool mRecursiveLibraryFetchStarted;
+    bool mRecursiveMarketplaceFetchStarted; // AIS3 specific
 	bool mAllRecursiveFoldersFetched;
     typedef boost::signals2::signal<void()> folders_fetched_signal_t;
     folders_fetched_signal_t mFoldersFetchedSignal;
-- 
cgit v1.2.3


From 71d547b255c87297a4b97a9b05d004a743ab68e6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 4 Dec 2023 22:48:00 +0200
Subject: SL-20181 Back off on failure

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 7 +++++--
 indra/newview/llviewerinventory.cpp               | 8 +++++++-
 indra/newview/llviewerinventory.h                 | 1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 493fb139ac..12debd7923 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -582,6 +582,7 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
         return;
     }
 
+    LLViewerInventoryCategory::EFetchType new_state = LLViewerInventoryCategory::FETCH_NONE;
     bool request_descendants = false;
     if (response_id.isNull()) // Failure
     {
@@ -599,10 +600,12 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
 
             // set folder's version to prevent viewer from trying to request folder indefinetely
             LLViewerInventoryCategory* cat(gInventory.getCategory(request_id));
-            if (cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+            if (cat && cat->getVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
             {
                 cat->setVersion(0);
             }
+            // back off for a bit in case something tries to force-request immediately
+            new_state = LLViewerInventoryCategory::FETCH_FAILED;
         }
     }
     else
@@ -655,7 +658,7 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i
     LLViewerInventoryCategory * cat(gInventory.getCategory(request_id));
     if (cat)
     {
-        cat->setFetching(LLViewerInventoryCategory::FETCH_NONE);
+        cat->setFetching(new_state);
     }
 }
 
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index a976cdc06d..a58ca182fc 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -688,7 +688,13 @@ LLViewerInventoryCategory::EFetchType LLViewerInventoryCategory::getFetching()
 
 void LLViewerInventoryCategory::setFetching(LLViewerInventoryCategory::EFetchType fetching)
 {
-    if (fetching > mFetching) // allow a switch from normal to recursive
+    if (fetching == FETCH_FAILED)
+    {
+        const F32 FETCH_FAILURE_EXPIRY = 60.0f;
+        mDescendentsRequested.setTimerExpirySec(FETCH_FAILURE_EXPIRY);
+        mFetching = fetching;
+    }
+    else if (fetching > mFetching) // allow a switch from normal to recursive
     {
         if (mDescendentsRequested.hasExpired() || (mFetching == FETCH_NONE))
         {
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 4297e194dd..1adc5403fd 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -217,6 +217,7 @@ public:
         FETCH_NONE = 0,
         FETCH_NORMAL,
         FETCH_RECURSIVE,
+        FETCH_FAILED, // back off
     } EFetchType;
     EFetchType getFetching();
     // marks as fetch being in progress or as done
-- 
cgit v1.2.3


From 4fc7bc0703df40566c4c33f8406d1301079a3ff8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 4 Dec 2023 22:54:53 +0200
Subject: SL-20181 Small tweak for requests

---
 indra/newview/llinventorymodelbackgroundfetch.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 12debd7923..49b2cb74af 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -317,7 +317,7 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
 				gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
 			}
 		}
-        else if (cat && cat->getPreferredType() == LLFolderType::FT_MARKETPLACE_LISTINGS)
+        else if (recursive && cat && cat->getPreferredType() == LLFolderType::FT_MARKETPLACE_LISTINGS)
         {
             if (mFetchFolderQueue.empty() || mFetchFolderQueue.back().mUUID != id)
             {
@@ -381,7 +381,7 @@ void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id,
         if (forced)
         {
             // check if already requested
-            if (mForceFetchSet.find(cat_id) != mForceFetchSet.end())
+            if (mForceFetchSet.find(cat_id) == mForceFetchSet.end())
             {
                 mForceFetchSet.insert(cat_id);
                 mFetchItemQueue.push_front(FetchQueueInfo(cat_id, FT_FORCED));
@@ -406,7 +406,7 @@ void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id, b
         if (forced)
         {
             // check if already requested
-            if (mForceFetchSet.find(item_id)!= mForceFetchSet.end())
+            if (mForceFetchSet.find(item_id) == mForceFetchSet.end())
             {
                 mForceFetchSet.insert(item_id);
                 mFetchItemQueue.push_front(FetchQueueInfo(item_id, FT_FORCED, false));
-- 
cgit v1.2.3


From 5accc1feff322c89e63fbfa0f3ac6911abcf6436 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 6 Dec 2023 12:58:20 +0200
Subject: SL-20695 Fix hardware probes

CoCreateInstance returns 'no interface supported'
Preferable not to mix init types so switched everything.
---
 indra/llwindow/lldxhardware.cpp | 22 ++++++++++------------
 indra/newview/llmachineid.cpp   |  3 +--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index 07856edefc..aaa2f6aef1 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -65,13 +65,12 @@ HRESULT GetVideoMemoryViaWMI(WCHAR* strInputDeviceID, DWORD* pdwAdapterRam)
 {
     HRESULT hr;
     bool bGotMemory = false;
-    HRESULT hrCoInitialize = S_OK;
     IWbemLocator* pIWbemLocator = nullptr;
     IWbemServices* pIWbemServices = nullptr;
     BSTR pNamespace = nullptr;
 
     *pdwAdapterRam = 0;
-    hrCoInitialize = CoInitializeEx(0, COINIT_MULTITHREADED);
+    CoInitializeEx(0, COINIT_APARTMENTTHREADED);
 
     hr = CoCreateInstance( CLSID_WbemLocator,
                            nullptr,
@@ -208,8 +207,7 @@ HRESULT GetVideoMemoryViaWMI(WCHAR* strInputDeviceID, DWORD* pdwAdapterRam)
 
     SAFE_RELEASE( pIWbemLocator );
 
-    if( SUCCEEDED( hrCoInitialize ) )
-        CoUninitialize();
+    CoUninitialize();
 
     if( bGotMemory )
         return S_OK;
@@ -232,9 +230,8 @@ S32 LLDXHardware::getMBVideoMemoryViaWMI()
 std::string LLDXHardware::getDriverVersionWMI(EGPUVendor vendor)
 {
 	std::string mDriverVersion;
-	HRESULT hrCoInitialize = S_OK;
 	HRESULT hres;
-	hrCoInitialize = CoInitializeEx(0, COINIT_MULTITHREADED);
+	CoInitializeEx(0, COINIT_APARTMENTTHREADED);
 	IWbemLocator *pLoc = NULL;
 
 	hres = CoCreateInstance(
@@ -437,10 +434,10 @@ std::string LLDXHardware::getDriverVersionWMI(EGPUVendor vendor)
 	{
 		pEnumerator->Release();
 	}
-	if (SUCCEEDED(hrCoInitialize))
-	{
-		CoUninitialize();
-	}
+
+    // supposed to always call CoUninitialize even if init returned false
+	CoUninitialize();
+
 	return mDriverVersion;
 }
 
@@ -687,7 +684,8 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
 	BOOL ok = FALSE;
     HRESULT       hr;
 
-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    // CLSID_DxDiagProvider does not work with Multithreaded?
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 
     IDxDiagProvider *dx_diag_providerp = NULL;
     IDxDiagContainer *dx_diag_rootp = NULL;
@@ -976,7 +974,7 @@ LLSD LLDXHardware::getDisplayInfo()
 	LLTimer hw_timer;
     HRESULT       hr;
 	LLSD ret;
-    CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 
     IDxDiagProvider *dx_diag_providerp = NULL;
     IDxDiagContainer *dx_diag_rootp = NULL;
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp
index 8f03b13d2d..1f4418f119 100644
--- a/indra/newview/llmachineid.cpp
+++ b/indra/newview/llmachineid.cpp
@@ -85,12 +85,11 @@ void LLWMIMethods::initCOMObjects()
     // Step 1: --------------------------------------------------
     // Initialize COM. ------------------------------------------
 
-    mHR = CoInitializeEx(0, COINIT_MULTITHREADED);
+    mHR = CoInitializeEx(0, COINIT_APARTMENTTHREADED);
     if (FAILED(mHR))
     {
         // if result S_FALSE, it's already initialized
         LL_DEBUGS("AppInit") << "Failed to initialize COM library. Error code = 0x" << std::hex << mHR << LL_ENDL;
-        return;
     }
 
     // Step 2: --------------------------------------------------
-- 
cgit v1.2.3


From bf8fb4ef0d5345f65cfc2e8a750eea6a4ef3d05c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 6 Dec 2023 14:10:30 +0200
Subject: SL-20694 FIXED Unable to publish classified if first entered
 insufficient L$ amount

---
 indra/newview/llpanelprofileclassifieds.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index dec6cfd83b..f9529e9d23 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -954,7 +954,7 @@ void LLPanelProfileClassified::onSaveClick()
     }
     if(isNew() || isNewWithErrors())
     {
-        if(gStatusBar->getBalance() < getPriceForListing())
+        if(gStatusBar->getBalance() < MINIMUM_PRICE_FOR_LISTING)
         {
             LLNotificationsUtil::add("ClassifiedInsufficientFunds");
             return;
-- 
cgit v1.2.3


From b2b1aeffc72fda7b2857f2dd9069d65b23bd7021 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 6 Dec 2023 14:11:33 +0200
Subject: SL-20693 FIXED Classifieds publish price field misinterprets invalid
 values

---
 indra/newview/llpanelprofileclassifieds.cpp                       | 8 ++++++++
 indra/newview/skins/default/xui/en/floater_publish_classified.xml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index f9529e9d23..393deb41ab 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -1427,6 +1427,14 @@ void LLPanelProfileClassified::doSave()
 
 void LLPanelProfileClassified::onPublishFloaterPublishClicked()
 {
+    if (mPublishFloater->getPrice() < MINIMUM_PRICE_FOR_LISTING)
+    {
+        LLSD args;
+        args["MIN_PRICE"] = MINIMUM_PRICE_FOR_LISTING;
+        LLNotificationsUtil::add("MinClassifiedPrice", args);
+        return;
+    }
+
     setPriceForListing(mPublishFloater->getPrice());
 
     doSave();
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index 84e0b489d0..3e68011b6c 100644
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -25,6 +25,7 @@ Remember, Classified fees are non-refundable.
     </text>
     <spinner
      decimal_digits="0"
+     allow_digits_only="true"
      follows="left|top"
      font="SansSerif"
      halign="left"
@@ -36,7 +37,6 @@ Remember, Classified fees are non-refundable.
      layout="topleft"
      left="15"
      value="50"
-     min_val="50"
      max_val="999999"
      name="price_for_listing"
      top_pad="10"
-- 
cgit v1.2.3


From 810a3d24c2e3671f926091c062b101bdec6a1517 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 6 Dec 2023 03:54:06 +0100
Subject: SL-20140 Setting shape hand size to 36 won't save

---
 indra/newview/character/avatar_lad.xml      | 17 ++++----
 indra/newview/llscrollingpanelparam.cpp     | 63 +++++++++--------------------
 indra/newview/llscrollingpanelparam.h       |  3 --
 indra/newview/llscrollingpanelparambase.cpp | 29 ++++++-------
 indra/newview/llscrollingpanelparambase.h   |  7 +++-
 5 files changed, 47 insertions(+), 72 deletions(-)

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 2cdd86267e..aef402d4db 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -2021,7 +2021,7 @@
      value_min="-1"
      value_max="1">
       <param_skeleton>
-	  
+
         <bone
          name="mEyeLeft"
          scale="0 0 0"
@@ -2031,9 +2031,8 @@
          name="mEyeRight"
          scale="0 0 0"
          offset="-.005 0 0" />
-		 
-	  
-<bone
+
+        <bone
          name="mFaceEyeAltLeft"
          scale="0 0 0"
          offset="-.005 0 0" />
@@ -2042,7 +2041,7 @@
          name="mFaceEyeAltRight"
          scale="0 0 0"
          offset="-.005 0 0" />
-	  
+
         <bone
          name="mFaceEyeLidLowerRight"
          scale="0 0.3 0.7"
@@ -2053,7 +2052,7 @@
          scale="0 0.3 0.7"
          offset="0 0 0" />
 
-		 <bone
+        <bone
          name="mFaceEyeLidUpperRight"
          scale="0 0.3 0.7"
          offset=" 0 0 0" />
@@ -2062,17 +2061,17 @@
          name="mFaceEyeLidUpperLeft"
          scale="0 0.3 0.7"
          offset=" 0 0 0" />
-		 
+
         <bone
          name="mFaceEyecornerInnerLeft"
          scale="0 0 0"
          offset="-0.005 -0.008 0.0" />
-		 
+
         <bone
          name="mFaceEyecornerInnerRight"
          scale="0 0 0"
          offset="-0.005 0.008 0.0" />
-		 
+
       </param_skeleton>
     </param>
 
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp
index bfa453a0ae..efd84eaa6d 100644
--- a/indra/newview/llscrollingpanelparam.cpp
+++ b/indra/newview/llscrollingpanelparam.cpp
@@ -259,19 +259,15 @@ void LLScrollingPanelParam::onHintHeldDown( LLVisualParamHint* hint )
 
 		// Make sure we're not taking the slider out of bounds
 		// (this is where some simple UI limits are stored)
-		F32 new_percent = weightToPercent(new_weight);
-		LLSliderCtrl* slider = getChild<LLSliderCtrl>("param slider");
-		if (slider)
+		F32 new_percent = weightToSlider(new_weight);
+		if (mSlider->getMinValue() < new_percent
+			&& new_percent < mSlider->getMaxValue())
 		{
-			if (slider->getMinValue() < new_percent
-				&& new_percent < slider->getMaxValue())
-			{
-				mWearable->setVisualParamWeight( hint->getVisualParam()->getID(), new_weight);
-				mWearable->writeToAvatar(gAgentAvatarp);
-				gAgentAvatarp->updateVisualParams();
+			mWearable->setVisualParamWeight( hint->getVisualParam()->getID(), new_weight);
+			mWearable->writeToAvatar(gAgentAvatarp);
+			gAgentAvatarp->updateVisualParams();
 
-				slider->setValue( weightToPercent( new_weight ) );
-			}
+			mSlider->setValue( weightToSlider( new_weight ) );
 		}
 	}
 }
@@ -292,17 +288,13 @@ void LLScrollingPanelParam::onHintMinMouseUp( void* userdata )
 		F32 range = self->mHintMax->getVisualParamWeight() - self->mHintMin->getVisualParamWeight();
 		// step a fraction in the negative directiona
 		F32 new_weight = current_weight - (range / 10.f);
-		F32 new_percent = self->weightToPercent(new_weight);
-		LLSliderCtrl* slider = self->getChild<LLSliderCtrl>("param slider");
-		if (slider)
+		F32 new_percent = self->weightToSlider(new_weight);
+		if (self->mSlider->getMinValue() < new_percent
+			&& new_percent < self->mSlider->getMaxValue())
 		{
-			if (slider->getMinValue() < new_percent
-				&& new_percent < slider->getMaxValue())
-			{
-				self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
-				self->mWearable->writeToAvatar(gAgentAvatarp);
-				slider->setValue( self->weightToPercent( new_weight ) );
-			}
+			self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
+			self->mWearable->writeToAvatar(gAgentAvatarp);
+			self->mSlider->setValue( self->weightToSlider( new_weight ) );
 		}
 	}
 
@@ -326,33 +318,16 @@ void LLScrollingPanelParam::onHintMaxMouseUp( void* userdata )
 			F32 range = self->mHintMax->getVisualParamWeight() - self->mHintMin->getVisualParamWeight();
 			// step a fraction in the negative direction
 			F32 new_weight = current_weight + (range / 10.f);
-			F32 new_percent = self->weightToPercent(new_weight);
-			LLSliderCtrl* slider = self->getChild<LLSliderCtrl>("param slider");
-			if (slider)
+			F32 new_percent = self->weightToSlider(new_weight);
+			if (self->mSlider->getMinValue() < new_percent
+				&& new_percent < self->mSlider->getMaxValue())
 			{
-				if (slider->getMinValue() < new_percent
-					&& new_percent < slider->getMaxValue())
-				{
-					self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
-					self->mWearable->writeToAvatar(gAgentAvatarp);
-					slider->setValue( self->weightToPercent( new_weight ) );
-				}
+				self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
+				self->mWearable->writeToAvatar(gAgentAvatarp);
+				self->mSlider->setValue( self->weightToSlider( new_weight ) );
 			}
 		}
 	}
 
 	LLVisualParamHint::requestHintUpdates( self->mHintMin, self->mHintMax );
 }
-
-
-F32 LLScrollingPanelParam::weightToPercent( F32 weight )
-{
-	LLViewerVisualParam* param = mParam;
-	return (weight - param->getMinWeight()) /  (param->getMaxWeight() - param->getMinWeight()) * 100.f;
-}
-
-F32 LLScrollingPanelParam::percentToWeight( F32 percent )
-{
-	LLViewerVisualParam* param = mParam;
-	return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
-}
diff --git a/indra/newview/llscrollingpanelparam.h b/indra/newview/llscrollingpanelparam.h
index c7a47d5c7a..dc344486fc 100644
--- a/indra/newview/llscrollingpanelparam.h
+++ b/indra/newview/llscrollingpanelparam.h
@@ -61,9 +61,6 @@ public:
 	void				onHintMouseDown( LLVisualParamHint* hint );
 	void				onHintHeldDown( LLVisualParamHint* hint );
 
-	F32					weightToPercent( F32 weight );
-	F32					percentToWeight( F32 percent );
-
 public:
 	// Constants for LLPanelVisualParam
 	const static F32 PARAM_STEP_TIME_THRESHOLD;
diff --git a/indra/newview/llscrollingpanelparambase.cpp b/indra/newview/llscrollingpanelparambase.cpp
index fe7a362723..2a6c25235d 100644
--- a/indra/newview/llscrollingpanelparambase.cpp
+++ b/indra/newview/llscrollingpanelparambase.cpp
@@ -43,6 +43,7 @@ LLScrollingPanelParamBase::LLScrollingPanelParamBase( const LLPanel::Params& pan
 						      LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints)
 	: LLScrollingPanel( panel_params ),
 	  mParam(param),
+	  mSlider(nullptr),
 	  mAllowModify(allow_modify),
 	  mWearable(wearable)
 {
@@ -50,13 +51,15 @@ LLScrollingPanelParamBase::LLScrollingPanelParamBase( const LLPanel::Params& pan
 		buildFromFile( "panel_scrolling_param.xml");
 	else
 		buildFromFile( "panel_scrolling_param_base.xml");
-	
-	getChild<LLUICtrl>("param slider")->setValue(weightToPercent(param->getWeight()));
+
+	mSlider = getChild<LLSliderCtrl>("param slider");
+	mSlider->setMaxValue(100.f * (mParam->getMaxWeight() - mParam->getMinWeight()));
+	mSlider->setValue(weightToSlider(param->getWeight()));
 
 	std::string display_name = LLTrans::getString(param->getDisplayName());
-	getChild<LLUICtrl>("param slider")->setLabelArg("[DESC]", display_name);
-	getChildView("param slider")->setEnabled(mAllowModify);
-	childSetCommitCallback("param slider", LLScrollingPanelParamBase::onSliderMoved, this);
+	mSlider->setLabelArg("[DESC]", display_name);
+	mSlider->setEnabled(mAllowModify);
+	mSlider->setCommitCallback(boost::bind(LLScrollingPanelParamBase::onSliderMoved, mSlider, this));
 
 	setVisible(FALSE);
 	setBorderVisible( FALSE );
@@ -77,9 +80,9 @@ void LLScrollingPanelParamBase::updatePanel(BOOL allow_modify)
 	}
 
 	F32 current_weight = mWearable->getVisualParamWeight( param->getID() );
-	getChild<LLUICtrl>("param slider")->setValue(weightToPercent( current_weight ) );
+	mSlider->setValue(weightToSlider( current_weight ) );
 	mAllowModify = allow_modify;
-	getChildView("param slider")->setEnabled(mAllowModify);
+	mSlider->setEnabled(mAllowModify);
 }
 
 // static
@@ -90,7 +93,7 @@ void LLScrollingPanelParamBase::onSliderMoved(LLUICtrl* ctrl, void* userdata)
 	LLViewerVisualParam* param = self->mParam;
 	
 	F32 current_weight = self->mWearable->getVisualParamWeight( param->getID() );
-	F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
+	F32 new_weight = self->sliderToWeight( (F32)slider->getValue().asReal() );
 	if (current_weight != new_weight )
 	{
 		self->mWearable->setVisualParamWeight( param->getID(), new_weight);
@@ -99,14 +102,12 @@ void LLScrollingPanelParamBase::onSliderMoved(LLUICtrl* ctrl, void* userdata)
 	}
 }
 
-F32 LLScrollingPanelParamBase::weightToPercent( F32 weight )
+F32 LLScrollingPanelParamBase::weightToSlider(F32 weight)
 {
-	LLViewerVisualParam* param = mParam;
-	return (weight - param->getMinWeight()) /  (param->getMaxWeight() - param->getMinWeight()) * 100.f;
+	return (weight - mParam->getMinWeight()) * 100.f;
 }
 
-F32 LLScrollingPanelParamBase::percentToWeight( F32 percent )
+F32 LLScrollingPanelParamBase::sliderToWeight(F32 slider)
 {
-	LLViewerVisualParam* param = mParam;
-	return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
+	return slider / 100.f + mParam->getMinWeight();
 }
diff --git a/indra/newview/llscrollingpanelparambase.h b/indra/newview/llscrollingpanelparambase.h
index 9538826251..e7f88a21bd 100644
--- a/indra/newview/llscrollingpanelparambase.h
+++ b/indra/newview/llscrollingpanelparambase.h
@@ -36,6 +36,7 @@ class LLViewerVisualParam;
 class LLWearable;
 class LLVisualParamHint;
 class LLViewerVisualParam;
+class LLSliderCtrl;
 class LLJoint;
 
 class LLScrollingPanelParamBase : public LLScrollingPanel
@@ -49,11 +50,13 @@ public:
 
 	static void			onSliderMoved(LLUICtrl* ctrl, void* userdata);
 
-	F32					weightToPercent( F32 weight );
-	F32					percentToWeight( F32 percent );
+	F32					weightToSlider(F32 weight);
+	F32					sliderToWeight(F32 slider);
 
 public:
 	LLViewerVisualParam* mParam;
+	LLSliderCtrl* mSlider;
+
 protected:
 	BOOL mAllowModify;
 	LLWearable *mWearable;
-- 
cgit v1.2.3


From d109b84c8d80a628b95afdc52b84962114b8c6fd Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 7 Dec 2023 17:37:41 +0200
Subject: SL-20696 FIXED llLoopSoundSlave producing no sound since viewer
 update

---
 indra/llaudio/llaudioengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index a387bb23cd..ece0a12a7a 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -398,7 +398,7 @@ void LLAudioEngine::idle()
 	for (source_map::value_type& src_pair : mAllSources)
 	{
 		LLAudioSource *sourcep = src_pair.second;
-		if (sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
+		if (!sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
 		{
 			sync_masterp = sourcep;
 			master_channelp = sync_masterp->getChannel();
-- 
cgit v1.2.3


From cde3816ed07489415257e3bda3f64069ca580b0d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 11 Dec 2023 23:42:31 +0200
Subject:  SL-20709 FIXED Avatar Maximum Complexity changing upon cancelling
 Advanced Graphics

---
 indra/newview/llfloaterpreference.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d4e40ff103..fb726ff051 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -978,7 +978,6 @@ void LLFloaterPreference::onBtnCancel(const LLSD& userdata)
 	if (userdata.asString() == "closeadvanced")
 	{
 		LLFloaterReg::hideInstance("prefs_graphics_advanced");
-		updateMaxComplexity();
 	}
 	else
 	{
-- 
cgit v1.2.3


From 8c1aa6d6623995e56e1cf5de127befcf9033c8ca Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 12 Dec 2023 00:15:29 +0200
Subject: SL-20714 Crash accessing mControlAVBridge

Looks like control avatar was recreated after cleanup then object was
deleted
---
 indra/newview/llviewermessage.cpp | 2 +-
 indra/newview/llviewerobject.cpp  | 5 +++++
 indra/newview/llvovolume.cpp      | 7 ++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8b6a6807e4..c50365db2a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4229,7 +4229,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     LLObjectSignaledAnimationMap::instance().getMap()[uuid] = signaled_anims;
     
     LLViewerObject *objp = gObjectList.findObject(uuid);
-    if (!objp)
+    if (!objp || objp->isDead())
     {
 		LL_DEBUGS("AnimatedObjectsNotify") << "Received animation state for unknown object " << uuid << LL_ENDL;
         return;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d6443b0bfb..1458570de2 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -391,6 +391,7 @@ LLViewerObject::~LLViewerObject()
 	sNumObjects--;
 	sNumZombieObjects--;
 	llassert(mChildList.size() == 0);
+    llassert(mControlAvatar.isNull()); // Should have been cleaned by now
 
 	clearInventoryListeners();
 }
@@ -3106,6 +3107,10 @@ void LLViewerObject::updateControlAvatar()
         return;
     }
 
+    // caller isn't supposed to operate on a dead object,
+    // avatar was already cleaned up
+    llassert(!isDead());
+
     bool should_have_control_avatar = false;
     if (is_animated_object)
     {
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ec2f490742..1e212250a3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5494,6 +5494,11 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME;
     llassert(!gCubeSnapshot);
 
+    if (group->isDead())
+    {
+        return;
+    }
+
 	if (group->changeLOD())
 	{
 		group->mLastUpdateDistance = group->mDistance;
@@ -5577,7 +5582,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 	
 			LLVOVolume* vobj = drawablep->getVOVolume();
             
-			if (!vobj)
+			if (!vobj || vobj->isDead())
 			{
 				continue;
 			}
-- 
cgit v1.2.3


From 7e6578dc0f71fa969d6b301fd3d3ef4090d68d50 Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Fri, 8 Dec 2023 22:27:14 +0900
Subject: Fix nonnull error in gcc version 13 on Linux.

---
 indra/newview/llfasttimerview.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 5b8ca6c49c..a7998f6e9e 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -947,7 +947,7 @@ void LLFastTimerView::printLineStats()
 	{
 		std::string legend_stat;
 		bool first = true;
-		for(block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
+		for(LLTrace::block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
 			it != LLTrace::end_block_timer_tree_df();
 			++it)
 		{
@@ -969,7 +969,7 @@ void LLFastTimerView::printLineStats()
 
 		std::string timer_stat;
 		first = true;
-		for(block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
+		for(LLTrace::block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
 			it != LLTrace::end_block_timer_tree_df();
 			++it)
 		{
@@ -1046,7 +1046,7 @@ void LLFastTimerView::drawLineGraph()
 	F32Seconds cur_max(0);
 	U32 cur_max_calls = 0;
 
-	for(block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
+	for(LLTrace::block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
 		it != LLTrace::end_block_timer_tree_df();
 		++it)
 	{
@@ -1195,8 +1195,8 @@ void LLFastTimerView::drawLegend()
 		S32 scroll_offset = 0; // element's y offset from top of the inner scroll's rect
 		ft_display_idx.clear();
 		std::map<BlockTimerStatHandle*, S32> display_line;
-		for (block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
-			it != block_timer_tree_df_iterator_t();
+		for (LLTrace::block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
+			it != LLTrace::end_block_timer_tree_df();
 			++it)
 		{
 			BlockTimerStatHandle* idp = (*it);
@@ -1311,8 +1311,8 @@ void LLFastTimerView::generateUniqueColors()
 
 		F32 hue = 0.f;
 
-		for (block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
-			it != block_timer_tree_df_iterator_t();
+		for (LLTrace::block_timer_tree_df_iterator_t it = LLTrace::begin_block_timer_tree_df(FTM_FRAME);
+			it != LLTrace::end_block_timer_tree_df();
 			++it)
 		{
 			BlockTimerStatHandle* idp = (*it);
-- 
cgit v1.2.3


From 67ee70a6abe1e1b8ae1cc8e89e404357495fb313 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 12 Dec 2023 00:39:59 +0200
Subject: SL-20713 Crash at isAvatar

Likely object was NULL
---
 indra/newview/llselectmgr.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index d172a87b1d..f0d3e878dd 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4308,9 +4308,12 @@ BOOL LLSelectMgr::selectGetAggregateTexturePermissions(LLAggregatePermissions& r
 
 BOOL LLSelectMgr::isMovableAvatarSelected()
 {
-	if (mAllowSelectAvatar)
+	if (mAllowSelectAvatar && getSelection()->getObjectCount() == 1)
 	{
-		return (getSelection()->getObjectCount() == 1) && (getSelection()->getFirstRootObject()->isAvatar()) && getSelection()->getFirstMoveableNode(TRUE);
+        // nothing but avatar should be selected, so check that
+        // there is only one selected object and it is a root
+        LLViewerObject* obj = getSelection()->getFirstRootObject();
+		return obj && obj->isAvatar() && getSelection()->getFirstMoveableNode(TRUE);
 	}
 	return FALSE;
 }
-- 
cgit v1.2.3


From 7b3a0d86e2c8ec35f2cd1e5c4991d06ed460dee7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 12 Dec 2023 01:12:15 +0200
Subject: SL-20712 Crash at null cache buffer

---
 indra/newview/llviewerregion.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 452dcdd8fd..6c0e25ae39 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2467,7 +2467,10 @@ void LLViewerRegion::decodeBoundingInfo(LLVOCacheEntry* entry)
 
 		//set parent id
 		U32	parent_id = 0;
-		LLViewerObject::unpackParentID(entry->getDP(), parent_id);
+        if (entry->getDP()) // NULL if nothing cached
+        {
+            LLViewerObject::unpackParentID(entry->getDP(), parent_id);
+        }
 		if(parent_id != entry->getParentID())
 		{				
 			entry->setParentID(parent_id);
@@ -2487,7 +2490,7 @@ void LLViewerRegion::decodeBoundingInfo(LLVOCacheEntry* entry)
 	LLQuaternion rot;
 
 	//decode spatial info and parent info
-	U32 parent_id = LLViewerObject::extractSpatialExtents(entry->getDP(), pos, scale, rot);
+	U32 parent_id = entry->getDP() ? LLViewerObject::extractSpatialExtents(entry->getDP(), pos, scale, rot) : entry->getParentID();
 	
 	U32 old_parent_id = entry->getParentID();
 	bool same_old_parent = false;
-- 
cgit v1.2.3


From 5abcec163c46c2bcb06ba9703c717f0e037f087e Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 12 Dec 2023 18:29:55 +0200
Subject: SL-20710 ignore pelvis fixup when sitting in mouselook

---
 indra/newview/llagentcamera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 29642d3f45..e54d3a2042 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1773,7 +1773,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 
 		head_offset.clearVec();
 		F32 fixup;
-		if (gAgentAvatarp->hasPelvisFixup(fixup))
+        if (gAgentAvatarp->hasPelvisFixup(fixup) && !gAgentAvatarp->isSitting())
 		{
 			head_offset[VZ] -= fixup;
 		}
-- 
cgit v1.2.3


From 5b789e05f560c14024bd3749fe7ebc8c29926746 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 12 Dec 2023 19:02:54 +0200
Subject: DRTVWR-489 Update freetype to v.2.12.1.557becd

---
 autobuild.xml | 1478 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 744 insertions(+), 734 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index cf4d20c232..5c11097b11 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" ?>
-<llsd>
-<map>
-    <key>version</key>
-    <string>1.3</string>
-    <key>type</key>
-    <string>autobuild</string>
+<llsd><map>
     <key>installables</key>
     <map>
       <key>SDL</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
+        <key>description</key>
+        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/SDL.txt</string>
+        <key>name</key>
+        <string>SDL</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -24,21 +29,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/SDL.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
         <key>version</key>
         <string>1.2.15</string>
-        <key>name</key>
-        <string>SDL</string>
-        <key>description</key>
-        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
       </map>
       <key>apr_suite</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
+        <key>description</key>
+        <string>Apache portable runtime project</string>
+        <key>license</key>
+        <string>apache</string>
+        <key>license_file</key>
+        <string>LICENSES/apr_suite.txt</string>
+        <key>name</key>
+        <string>apr_suite</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -82,21 +87,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>apache</string>
-        <key>license_file</key>
-        <string>LICENSES/apr_suite.txt</string>
-        <key>copyright</key>
-        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
         <key>version</key>
         <string>1.7.2-e935465</string>
-        <key>name</key>
-        <string>apr_suite</string>
-        <key>description</key>
-        <string>Apache portable runtime project</string>
       </map>
       <key>boost</key>
       <map>
+        <key>copyright</key>
+        <string>(see individual source files)</string>
+        <key>description</key>
+        <string>Boost C++ Libraries</string>
+        <key>license</key>
+        <string>boost 1.0</string>
+        <key>license_file</key>
+        <string>LICENSES/boost.txt</string>
+        <key>name</key>
+        <string>boost</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -128,21 +133,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>boost 1.0</string>
-        <key>license_file</key>
-        <string>LICENSES/boost.txt</string>
-        <key>copyright</key>
-        <string>(see individual source files)</string>
         <key>version</key>
         <string>1.81-09d25a7</string>
-        <key>name</key>
-        <string>boost</string>
-        <key>description</key>
-        <string>Boost C++ Libraries</string>
       </map>
       <key>bugsplat</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2003-2017, BugSplat</string>
+        <key>description</key>
+        <string>Bugsplat crash reporting package</string>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
+        <key>name</key>
+        <string>bugsplat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -174,21 +179,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2003-2017, BugSplat</string>
         <key>version</key>
         <string>4.0.3.0-527603a</string>
-        <key>name</key>
-        <string>bugsplat</string>
-        <key>description</key>
-        <string>Bugsplat crash reporting package</string>
       </map>
       <key>colladadom</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
+        <key>license</key>
+        <string>SCEA</string>
+        <key>license_file</key>
+        <string>LICENSES/collada.txt</string>
+        <key>name</key>
+        <string>colladadom</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -220,19 +223,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>SCEA</string>
-        <key>license_file</key>
-        <string>LICENSES/collada.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
         <key>version</key>
         <string>2.3.ab0c124</string>
-        <key>name</key>
-        <string>colladadom</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
+        <key>name</key>
+        <string>cubemaptoequirectangular</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -276,19 +279,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
         <key>version</key>
         <string>1.1.0</string>
-        <key>name</key>
-        <string>cubemaptoequirectangular</string>
       </map>
       <key>curl</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
+        <key>description</key>
+        <string>Library for transferring data specified with URL syntax</string>
+        <key>license</key>
+        <string>curl</string>
+        <key>license_file</key>
+        <string>LICENSES/curl.txt</string>
+        <key>name</key>
+        <string>curl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -332,21 +337,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>curl</string>
-        <key>license_file</key>
-        <string>LICENSES/curl.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
         <key>version</key>
         <string>7.54.1-5a4a82d</string>
-        <key>name</key>
-        <string>curl</string>
-        <key>description</key>
-        <string>Library for transferring data specified with URL syntax</string>
       </map>
       <key>dbus_glib</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) Red Hat Inc.</string>
+        <key>description</key>
+        <string>D-Bus bindings for glib</string>
+        <key>license</key>
+        <string>Academic Free License v. 2.1</string>
+        <key>license_file</key>
+        <string>LICENSES/dbus-glib.txt</string>
+        <key>name</key>
+        <string>dbus_glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -362,21 +367,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Academic Free License v. 2.1</string>
-        <key>license_file</key>
-        <string>LICENSES/dbus-glib.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) Red Hat Inc.</string>
         <key>version</key>
         <string>0.76</string>
-        <key>name</key>
-        <string>dbus_glib</string>
-        <key>description</key>
-        <string>D-Bus bindings for glib</string>
       </map>
       <key>dictionaries</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2014 Apache OpenOffice software</string>
+        <key>description</key>
+        <string>Spell checking dictionaries to bundled into the viewer</string>
+        <key>license</key>
+        <string>various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/dictionaries.txt</string>
+        <key>name</key>
+        <string>dictionaries</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -394,21 +399,21 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>various open source</string>
-        <key>license_file</key>
-        <string>LICENSES/dictionaries.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2014 Apache OpenOffice software</string>
         <key>version</key>
         <string>None</string>
-        <key>name</key>
-        <string>dictionaries</string>
-        <key>description</key>
-        <string>Spell checking dictionaries to bundled into the viewer</string>
       </map>
       <key>dullahan</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2017, Linden Research, Inc.</string>
+        <key>description</key>
+        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
+        <key>license</key>
+        <string>MPL</string>
+        <key>license_file</key>
+        <string>LICENSES/LICENSE.txt</string>
+        <key>name</key>
+        <string>dullahan</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -440,18 +445,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MPL</string>
-        <key>license_file</key>
-        <string>LICENSES/LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.14.0.202310131404_118.4.1_g3dd6078_chromium-118.0.5993.54</string>
-        <key>name</key>
-        <string>dullahan</string>
-        <key>description</key>
-        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
       </map>
       <key>emoji_shortcodes</key>
       <map>
@@ -499,6 +494,16 @@
       </map>
       <key>expat</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
+        <key>description</key>
+        <string>Expat is an XML parser library written in C</string>
+        <key>license</key>
+        <string>expat</string>
+        <key>license_file</key>
+        <string>LICENSES/expat.txt</string>
+        <key>name</key>
+        <string>expat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -544,21 +549,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>expat</string>
-        <key>license_file</key>
-        <string>LICENSES/expat.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
         <key>version</key>
         <string>2.1.1.1f36d02</string>
-        <key>name</key>
-        <string>expat</string>
-        <key>description</key>
-        <string>Expat is an XML parser library written in C</string>
       </map>
       <key>fmodstudio</key>
       <map>
+        <key>copyright</key>
+        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
+        <key>description</key>
+        <string>FMOD Studio API</string>
+        <key>license</key>
+        <string>fmod</string>
+        <key>license_file</key>
+        <string>LICENSES/fmodstudio.txt</string>
+        <key>name</key>
+        <string>fmodstudio</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -610,21 +615,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>fmod</string>
-        <key>license_file</key>
-        <string>LICENSES/fmodstudio.txt</string>
-        <key>copyright</key>
-        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
         <key>version</key>
         <string>2.02.13.578928</string>
-        <key>name</key>
-        <string>fmodstudio</string>
-        <key>description</key>
-        <string>FMOD Studio API</string>
       </map>
       <key>fontconfig</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
+        <key>description</key>
+        <string>Fontconfig is a library for configuring and customizing font access.</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/fontconfig.txt</string>
+        <key>name</key>
+        <string>fontconfig</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -640,21 +645,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/fontconfig.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
         <key>version</key>
         <string>2.11.0</string>
-        <key>name</key>
-        <string>fontconfig</string>
-        <key>description</key>
-        <string>Fontconfig is a library for configuring and customizing font access.</string>
       </map>
       <key>freetype</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
+        <key>description</key>
+        <string>Font rendering library</string>
+        <key>license</key>
+        <string>FreeType</string>
+        <key>license_file</key>
+        <string>LICENSES/freetype.txt</string>
+        <key>name</key>
+        <string>freetype</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -662,11 +667,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>bc05f1d79b2935607af127c286b93a6804d27463</string>
+              <string>d90a5c2fb4a729eeff3965ea6dd0a35cf146d379</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.1f4d9cc/freetype-2.12.1.1f4d9cc-darwin64-1f4d9cc.tar.zst</string>
+              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-darwin64-557becd.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -676,45 +681,59 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>92b7a5f300c1cc419800e5a664216e5955b475fc</string>
+              <string>4a999279562e8f3e4ba02d3e78a844ddf6fe18f1</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.1f4d9cc/freetype-2.12.1.1f4d9cc-linux64-1f4d9cc.tar.zst</string>
+              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-linux64-557becd.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
           </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>4fecff41a38d67d6b1c97c7c73980667b6a8a1bd</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-windows-557becd.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>20fd901015919c1c70160dc49effa2624fcd591b</string>
+              <string>1837fdfd44204c78e79134944f824b0211817883</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.1f4d9cc/freetype-2.12.1.1f4d9cc-windows64-1f4d9cc.tar.zst</string>
+              <string>https://github.com/secondlife/3p-freetype/releases/download/v.2.12.1.557becd/freetype-2.12.1.557becd-windows64-557becd.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>FreeType</string>
-        <key>license_file</key>
-        <string>LICENSES/freetype.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
         <key>version</key>
-        <string>2.12.1.1f4d9cc</string>
-        <key>name</key>
-        <string>freetype</string>
-        <key>description</key>
-        <string>Font rendering library</string>
+        <string>2.12.1.557becd</string>
       </map>
       <key>glext</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
+        <key>description</key>
+        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
+        <key>license</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
+        <key>license_file</key>
+        <string>LICENSES/glext.txt</string>
+        <key>name</key>
+        <string>glext</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -732,21 +751,21 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
-        <key>license_file</key>
-        <string>LICENSES/glext.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
         <key>version</key>
         <string>68</string>
-        <key>name</key>
-        <string>glext</string>
-        <key>description</key>
-        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
       </map>
       <key>glh_linear</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2000 Cass Everitt</string>
+        <key>description</key>
+        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/glh-linear.txt</string>
+        <key>name</key>
+        <string>glh_linear</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -764,21 +783,21 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/glh-linear.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2000 Cass Everitt</string>
         <key>version</key>
         <string>None</string>
-        <key>name</key>
-        <string>glh_linear</string>
-        <key>description</key>
-        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
       </map>
       <key>googlemock</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2008, Google Inc.</string>
+        <key>description</key>
+        <string>a library for writing and using C++ mock classes</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/gmock.txt</string>
+        <key>name</key>
+        <string>googlemock</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -810,21 +829,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/gmock.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2008, Google Inc.</string>
         <key>version</key>
         <string>1.7.0.2b109d4</string>
-        <key>name</key>
-        <string>googlemock</string>
-        <key>description</key>
-        <string>a library for writing and using C++ mock classes</string>
       </map>
       <key>gstreamer</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/gstreamer.txt</string>
+        <key>name</key>
+        <string>gstreamer</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -840,19 +857,19 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/gstreamer.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
         <key>version</key>
         <string>0.10.6.314267</string>
-        <key>name</key>
-        <string>gstreamer</string>
       </map>
       <key>gtk-atk-pango-glib</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (various, see sources)</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/gtk-atk-pango-glib.txt</string>
+        <key>name</key>
+        <string>gtk-atk-pango-glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -868,19 +885,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/gtk-atk-pango-glib.txt</string>
-        <key>copyright</key>
-        <string>Copyright (various, see sources)</string>
         <key>version</key>
         <string>0.1</string>
-        <key>name</key>
-        <string>gtk-atk-pango-glib</string>
       </map>
       <key>havok-source</key>
       <map>
+        <key>copyright</key>
+        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
+        <key>description</key>
+        <string>Havok source code for libs and demos</string>
+        <key>license</key>
+        <string>havok</string>
+        <key>license_file</key>
+        <string>LICENSES/havok.txt</string>
+        <key>name</key>
+        <string>havok-source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -928,18 +947,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>havok</string>
-        <key>license_file</key>
-        <string>LICENSES/havok.txt</string>
-        <key>copyright</key>
-        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
         <key>version</key>
         <string>2012.1-2</string>
-        <key>name</key>
-        <string>havok-source</string>
-        <key>description</key>
-        <string>Havok source code for libs and demos</string>
       </map>
       <key>icu4c</key>
       <map>
@@ -991,6 +1000,14 @@
       </map>
       <key>jpegencoderbasic</key>
       <map>
+        <key>copyright</key>
+        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
+        <key>license</key>
+        <string>NONE</string>
+        <key>license_file</key>
+        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
+        <key>name</key>
+        <string>jpegencoderbasic</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1034,19 +1051,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>NONE</string>
-        <key>license_file</key>
-        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
         <key>version</key>
         <string>1.0</string>
-        <key>name</key>
-        <string>jpegencoderbasic</string>
       </map>
       <key>jpeglib</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
+        <key>description</key>
+        <string>JPEG encoding, decoding library</string>
+        <key>license</key>
+        <string>jpeglib</string>
+        <key>license_file</key>
+        <string>LICENSES/jpeglib.txt</string>
+        <key>name</key>
+        <string>jpeglib</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1092,21 +1111,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>jpeglib</string>
-        <key>license_file</key>
-        <string>LICENSES/jpeglib.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
         <key>version</key>
         <string>8c.7846234</string>
-        <key>name</key>
-        <string>jpeglib</string>
-        <key>description</key>
-        <string>JPEG encoding, decoding library</string>
       </map>
       <key>jsoncpp</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
+        <key>description</key>
+        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
+        <key>license</key>
+        <string>public domain</string>
+        <key>license_file</key>
+        <string>LICENSES/jsoncpp.txt</string>
+        <key>name</key>
+        <string>jsoncpp</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1152,21 +1171,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>public domain</string>
-        <key>license_file</key>
-        <string>LICENSES/jsoncpp.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
         <key>version</key>
         <string>0.5.0.bc46e62</string>
-        <key>name</key>
-        <string>jsoncpp</string>
-        <key>description</key>
-        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
       </map>
       <key>kdu</key>
       <map>
+        <key>copyright</key>
+        <string>Kakadu software</string>
+        <key>description</key>
+        <string>JPEG2000 library by Kakadu</string>
+        <key>license</key>
+        <string>Kakadu</string>
+        <key>license_file</key>
+        <string>LICENSES/kdu.txt</string>
+        <key>name</key>
+        <string>kdu</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1218,21 +1237,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Kakadu</string>
-        <key>license_file</key>
-        <string>LICENSES/kdu.txt</string>
-        <key>copyright</key>
-        <string>Kakadu software</string>
         <key>version</key>
         <string>7.10.4.539108</string>
-        <key>name</key>
-        <string>kdu</string>
-        <key>description</key>
-        <string>JPEG2000 library by Kakadu</string>
       </map>
       <key>libhunspell</key>
       <map>
+        <key>copyright</key>
+        <string>See hunspell.txt</string>
+        <key>description</key>
+        <string>Spell checking library</string>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/hunspell.txt</string>
+        <key>name</key>
+        <string>libhunspell</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1278,21 +1297,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/hunspell.txt</string>
-        <key>copyright</key>
-        <string>See hunspell.txt</string>
         <key>version</key>
         <string>1.3.2.650fb94</string>
-        <key>name</key>
-        <string>libhunspell</string>
-        <key>description</key>
-        <string>Spell checking library</string>
       </map>
       <key>libndofdev</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
+        <key>description</key>
+        <string>3DConnexion SDK</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/libndofdev.txt</string>
+        <key>name</key>
+        <string>libndofdev</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1324,21 +1343,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/libndofdev.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
         <key>version</key>
         <string>0.1.8e9edc7</string>
-        <key>name</key>
-        <string>libndofdev</string>
-        <key>description</key>
-        <string>3DConnexion SDK</string>
       </map>
       <key>libpng</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
+        <key>description</key>
+        <string>PNG Reference library</string>
+        <key>license</key>
+        <string>libpng</string>
+        <key>license_file</key>
+        <string>LICENSES/libpng.txt</string>
+        <key>name</key>
+        <string>libpng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1382,21 +1401,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>libpng</string>
-        <key>license_file</key>
-        <string>LICENSES/libpng.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
         <key>version</key>
         <string>1.6.38-ca06e99</string>
-        <key>name</key>
-        <string>libpng</string>
-        <key>description</key>
-        <string>PNG Reference library</string>
       </map>
       <key>libuuid</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
+        <key>description</key>
+        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
+        <key>license</key>
+        <string>UUID</string>
+        <key>license_file</key>
+        <string>LICENSES/uuid.txt</string>
+        <key>name</key>
+        <string>libuuid</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -1412,21 +1431,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>UUID</string>
-        <key>license_file</key>
-        <string>LICENSES/uuid.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
         <key>version</key>
         <string>1.6.2</string>
-        <key>name</key>
-        <string>libuuid</string>
-        <key>description</key>
-        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
       </map>
       <key>libxml2</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
+        <key>description</key>
+        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/libxml2.txt</string>
+        <key>name</key>
+        <string>libxml2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1472,21 +1491,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/libxml2.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
         <key>version</key>
         <string>2.9.4.7476681</string>
-        <key>name</key>
-        <string>libxml2</string>
-        <key>description</key>
-        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
       </map>
       <key>llappearance_utility</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
+        <key>description</key>
+        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/llappearanceutility.txt</string>
+        <key>name</key>
+        <string>llappearance_utility</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1502,21 +1521,20 @@
             <string>linux</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/llappearanceutility.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
         <key>version</key>
         <string>0.0.1</string>
-        <key>name</key>
-        <string>llappearance_utility</string>
-        <key>description</key>
-        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
       </map>
       <key>llca</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
+      </string>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/ca-license.txt</string>
+        <key>name</key>
+        <string>llca</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -1534,20 +1552,19 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/ca-license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
-      </string>
         <key>version</key>
         <string>202310121530.0</string>
-        <key>name</key>
-        <string>llca</string>
       </map>
       <key>llphysicsextensions_source</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/llphysicsextensions.txt</string>
+        <key>name</key>
+        <string>llphysicsextensions_source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1599,19 +1616,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/llphysicsextensions.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.565768</string>
-        <key>name</key>
-        <string>llphysicsextensions_source</string>
       </map>
       <key>llphysicsextensions_stub</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/llphysicsextensions.txt</string>
+        <key>name</key>
+        <string>llphysicsextensions_stub</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1651,19 +1668,19 @@
             <string>windows</string>
           </map>
         </map>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/llphysicsextensions.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.542456</string>
-        <key>name</key>
-        <string>llphysicsextensions_stub</string>
       </map>
       <key>llphysicsextensions_tpv</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/HavokSublicense.pdf</string>
+        <key>name</key>
+        <string>llphysicsextensions_tpv</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1703,19 +1720,17 @@
             <string>windows</string>
           </map>
         </map>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/HavokSublicense.pdf</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.561752</string>
-        <key>name</key>
-        <string>llphysicsextensions_tpv</string>
       </map>
       <key>mesa</key>
       <map>
+        <key>license</key>
+        <string>mesa</string>
+        <key>license_file</key>
+        <string>LICENSES/mesa.txt</string>
+        <key>name</key>
+        <string>mesa</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1731,17 +1746,23 @@
             <string>linux</string>
           </map>
         </map>
-        <key>license</key>
-        <string>mesa</string>
-        <key>license_file</key>
-        <string>LICENSES/mesa.txt</string>
         <key>version</key>
         <string>7.11.1.297294</string>
-        <key>name</key>
-        <string>mesa</string>
       </map>
       <key>meshoptimizer</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
+        <key>description</key>
+        <string>Meshoptimizer. Mesh optimization library.</string>
+        <key>license</key>
+        <string>meshoptimizer</string>
+        <key>license_file</key>
+        <string>LICENSES/meshoptimizer.txt</string>
+        <key>name</key>
+        <string>meshoptimizer</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1773,20 +1794,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>meshoptimizer</string>
-        <key>license_file</key>
-        <string>LICENSES/meshoptimizer.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
         <key>version</key>
         <string>160</string>
-        <key>name</key>
-        <string>meshoptimizer</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
-        <key>description</key>
-        <string>Meshoptimizer. Mesh optimization library.</string>
       </map>
       <key>mikktspace</key>
       <map>
@@ -1846,6 +1855,18 @@
       </map>
       <key>minizip-ng</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
+        <key>copyright</key>
+        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
+        <key>description</key>
+        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
+        <key>license</key>
+        <string>minizip-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/minizip-ng.txt</string>
+        <key>name</key>
+        <string>minizip-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1891,20 +1912,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>minizip-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/minizip-ng.txt</string>
-        <key>copyright</key>
-        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>3.0.2.3e9876e</string>
-        <key>name</key>
-        <string>minizip-ng</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
-        <key>description</key>
-        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
       </map>
       <key>nanosvg</key>
       <map>
@@ -1964,6 +1973,17 @@
       </map>
       <key>nghttp2</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
+Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
+        <key>description</key>
+        <string>Library providing HTTP 2 support for libcurl</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/nghttp2.txt</string>
+        <key>name</key>
+        <string>nghttp2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2009,24 +2029,23 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/nghttp2.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
-Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
-        <key>version</key>
-        <string>1.40.0.b1526c6</string>
-        <key>name</key>
-        <string>nghttp2</string>
-        <key>description</key>
-        <string>Library providing HTTP 2 support for libcurl</string>
         <key>source_type</key>
         <string>hg</string>
+        <key>version</key>
+        <string>1.40.0.b1526c6</string>
       </map>
       <key>nvapi</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
+        <key>description</key>
+        <string>NVAPI provides an interface to NVIDIA devices.</string>
+        <key>license</key>
+        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
+        <key>license_file</key>
+        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
+        <key>name</key>
+        <string>nvapi</string>
         <key>platforms</key>
         <map>
           <key>windows64</key>
@@ -2044,21 +2063,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
-        <key>license_file</key>
-        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
-        <key>copyright</key>
-        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
         <key>version</key>
         <string>352.aac0e19</string>
-        <key>name</key>
-        <string>nvapi</string>
-        <key>description</key>
-        <string>NVAPI provides an interface to NVIDIA devices.</string>
       </map>
       <key>ogg_vorbis</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2002, Xiph.org Foundation</string>
+        <key>description</key>
+        <string>Audio encoding library</string>
+        <key>license</key>
+        <string>ogg-vorbis</string>
+        <key>license_file</key>
+        <string>LICENSES/ogg-vorbis.txt</string>
+        <key>name</key>
+        <string>ogg_vorbis</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2102,96 +2121,96 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>ogg-vorbis</string>
-        <key>license_file</key>
-        <string>LICENSES/ogg-vorbis.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2002, Xiph.org Foundation</string>
         <key>version</key>
         <string>1.3.3-1.3.6.e4101b6</string>
-        <key>name</key>
-        <string>ogg_vorbis</string>
-        <key>description</key>
-        <string>Audio encoding library</string>
       </map>
       <key>open-libndofdev</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
+        <key>description</key>
+        <string>Open Source replacement for 3DConnection SDK</string>
         <key>license</key>
         <string>BSD</string>
         <key>license_file</key>
         <string>LICENSES/libndofdev.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
-        <key>version</key>
-        <string>0.3</string>
         <key>name</key>
         <string>open-libndofdev</string>
-        <key>description</key>
-        <string>Open Source replacement for 3DConnection SDK</string>
+        <key>version</key>
+        <string>0.3</string>
       </map>
       <key>openal</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1999-2007 by authors.</string>
+        <key>description</key>
+        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
+        <key>license</key>
+        <string>LGPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/openal-soft.txt</string>
+        <key>name</key>
+        <string>openal</string>
         <key>platforms</key>
         <map>
-          <key>linux64</key>
+          <key>darwin64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
+              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>darwin64</string>
           </map>
-          <key>windows64</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
+              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>linux64</string>
           </map>
-          <key>darwin64</key>
+          <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
+              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>darwin64</string>
+            <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/openal-soft.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1999-2007 by authors.</string>
         <key>version</key>
         <string>1.23.1</string>
-        <key>name</key>
-        <string>openal</string>
-        <key>description</key>
-        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
       </map>
       <key>openjpeg</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
+        <key>description</key>
+        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/openjpeg.txt</string>
+        <key>name</key>
+        <string>openjpeg</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2237,21 +2256,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/openjpeg.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
         <key>version</key>
         <string>2.5.0.ea12248</string>
-        <key>name</key>
-        <string>openjpeg</string>
-        <key>description</key>
-        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
       </map>
       <key>openssl</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
+        <key>description</key>
+        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
+        <key>license</key>
+        <string>openssl</string>
+        <key>license_file</key>
+        <string>LICENSES/openssl.txt</string>
+        <key>name</key>
+        <string>openssl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2297,21 +2316,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>openssl</string>
-        <key>license_file</key>
-        <string>LICENSES/openssl.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
         <key>version</key>
         <string>1.1.1q.de53f55</string>
-        <key>name</key>
-        <string>openssl</string>
-        <key>description</key>
-        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
       </map>
       <key>pcre</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
+        <key>description</key>
+        <string>PCRE Perl-compatible regular expression library</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/pcre-license.txt</string>
+        <key>name</key>
+        <string>pcre</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2355,21 +2374,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/pcre-license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
         <key>version</key>
         <string>8.35.979fd86</string>
-        <key>name</key>
-        <string>pcre</string>
-        <key>description</key>
-        <string>PCRE Perl-compatible regular expression library</string>
       </map>
       <key>slvoice</key>
       <map>
+        <key>copyright</key>
+        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
+        <key>description</key>
+        <string>Vivox SDK components</string>
+        <key>license</key>
+        <string>Mixed</string>
+        <key>license_file</key>
+        <string>LICENSES/vivox_licenses.txt</string>
+        <key>name</key>
+        <string>slvoice</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2417,21 +2436,19 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Mixed</string>
-        <key>license_file</key>
-        <string>LICENSES/vivox_licenses.txt</string>
-        <key>copyright</key>
-        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
         <key>version</key>
         <string>4.10.0000.32327.5fc3fe7c.571099</string>
-        <key>name</key>
-        <string>slvoice</string>
-        <key>description</key>
-        <string>Vivox SDK components</string>
       </map>
       <key>threejs</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright © 2010-2021 three.js authors</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/THREEJS_LICENSE.txt</string>
+        <key>name</key>
+        <string>threejs</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2475,16 +2492,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/THREEJS_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright © 2010-2021 three.js authors</string>
         <key>version</key>
         <string>0.132.2</string>
-        <key>name</key>
-        <string>threejs</string>
       </map>
       <key>tinygltf</key>
       <map>
@@ -2524,6 +2533,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tracy</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
+        <key>description</key>
+        <string>Tracy Profiler Library</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tracy_license.txt</string>
+        <key>name</key>
+        <string>tracy</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2553,20 +2574,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
-        <key>version</key>
-        <string>v0.8.1.235e98f</string>
-        <key>name</key>
-        <string>tracy</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>description</key>
-        <string>Tracy Profiler Library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tracy</string>
         <key>source_type</key>
@@ -2576,6 +2583,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tut</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
+        <key>description</key>
+        <string>TUT is a small and portable unit test framework for C++.</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tut.txt</string>
+        <key>name</key>
+        <string>tut</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2593,21 +2610,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tut.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
         <key>version</key>
         <string>2008.11.30</string>
-        <key>name</key>
-        <string>tut</string>
-        <key>description</key>
-        <string>TUT is a small and portable unit test framework for C++.</string>
       </map>
       <key>uriparser</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
+        <key>description</key>
+        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
+        <key>license</key>
+        <string>New BSD license</string>
+        <key>license_file</key>
+        <string>LICENSES/uriparser.txt</string>
+        <key>name</key>
+        <string>uriparser</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2653,18 +2670,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>New BSD license</string>
-        <key>license_file</key>
-        <string>LICENSES/uriparser.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
         <key>version</key>
         <string>0.9.4</string>
-        <key>name</key>
-        <string>uriparser</string>
-        <key>description</key>
-        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
       </map>
       <key>viewer-fonts</key>
       <map>
@@ -2710,6 +2717,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>viewer-manager</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
+        <key>description</key>
+        <string>Linden Lab Viewer Management Process suite.</string>
+        <key>license</key>
+        <string>viewerlgpl</string>
+        <key>license_file</key>
+        <string>LICENSE</string>
+        <key>name</key>
+        <string>viewer-manager</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2755,25 +2772,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>viewerlgpl</string>
-        <key>license_file</key>
-        <string>LICENSE</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
-        <key>version</key>
-        <string>3.0.cc7ea1e</string>
-        <key>name</key>
-        <string>viewer-manager</string>
-        <key>description</key>
-        <string>Linden Lab Viewer Management Process suite.</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/vmp-standalone</string>
         <key>source_type</key>
         <string>hg</string>
+        <key>version</key>
+        <string>3.0.cc7ea1e</string>
       </map>
       <key>vlc-bin</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
+        <key>license</key>
+        <string>GPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/vlc.txt</string>
+        <key>name</key>
+        <string>vlc-bin</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2805,19 +2820,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>GPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/vlc.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
         <key>version</key>
         <string>3.0.16.c219a5d</string>
-        <key>name</key>
-        <string>vlc-bin</string>
       </map>
-      <key>xmlrpc-epi</key>
+      <key>vulkan_gltf</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>description</key>
+        <string>Vulkan GLTF Sample Implementation</string>
+        <key>license</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>license_file</key>
+        <string>LICENSES/vulkan_gltf.txt</string>
+        <key>name</key>
+        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2825,71 +2844,53 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>8cff2060843db3db788511ee34a8e8cc</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>linux64</key>
+          <key>windows</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>58eea384be49ba756ce9c5e66669540b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>windows</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>xmlrpc-epi</string>
-        <key>license_file</key>
-        <string>LICENSES/xmlrpc-epi.txt</string>
-        <key>copyright</key>
-        <string>Copyright: (C) 2000 Epinions, Inc.</string>
         <key>version</key>
-        <string>0.54.1.8a05acf</string>
-        <key>name</key>
-        <string>xmlrpc-epi</string>
-        <key>description</key>
-        <string>XMLRPC Library</string>
+        <string>1</string>
       </map>
-      <key>vulkan_gltf</key>
+      <key>xmlrpc-epi</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
         <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
+        <string>Copyright: (C) 2000 Epinions, Inc.</string>
         <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
+        <string>XMLRPC Library</string>
         <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
+        <string>xmlrpc-epi</string>
         <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
+        <string>LICENSES/xmlrpc-epi.txt</string>
         <key>name</key>
-        <string>vulkan_gltf</string>
+        <string>xmlrpc-epi</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2897,43 +2898,59 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8cff2060843db3db788511ee34a8e8cc</string>
+              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>windows</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>58eea384be49ba756ce9c5e66669540b</string>
+              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows</string>
+            <string>linux64</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
+              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1</string>
+        <string>0.54.1.8a05acf</string>
       </map>
       <key>xxhash</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2012-2021 Yann Collet</string>
+        <key>description</key>
+        <string>xxHash Library</string>
+        <key>license</key>
+        <string>xxhash</string>
+        <key>license_file</key>
+        <string>LICENSES/xxhash.txt</string>
+        <key>name</key>
+        <string>xxhash</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2991,21 +3008,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>xxhash</string>
-        <key>license_file</key>
-        <string>LICENSES/xxhash.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2012-2021 Yann Collet</string>
         <key>version</key>
         <string>0.8.1.7501c90</string>
-        <key>name</key>
-        <string>xxhash</string>
-        <key>description</key>
-        <string>xxHash Library</string>
       </map>
       <key>zlib-ng</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
+        <key>description</key>
+        <string>zlib data compression library for the next generation systems</string>
+        <key>license</key>
+        <string>zlib-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/zlib-ng.txt</string>
+        <key>name</key>
+        <string>zlib-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -3051,24 +3070,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>zlib-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/zlib-ng.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>1.2.11.zlib-ng.32fd361</string>
-        <key>name</key>
-        <string>zlib-ng</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
-        <key>description</key>
-        <string>zlib data compression library for the next generation systems</string>
       </map>
     </map>
     <key>package_description</key>
     <map>
+      <key>canonical_repo</key>
+      <string>https://github.com/secondlife/viewer</string>
+      <key>copyright</key>
+      <string>Copyright (c) 2020, Linden Research, Inc.</string>
+      <key>description</key>
+      <string>Second Life Viewer</string>
+      <key>license</key>
+      <string>LGPL</string>
+      <key>license_file</key>
+      <string>docs/LICENSE-source.txt</string>
+      <key>name</key>
+      <string>Second Life Viewer</string>
       <key>platforms</key>
       <map>
         <key>common</key>
@@ -3077,6 +3096,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
           <map>
             <key>RelWithDebInfo</key>
             <map>
+              <key>build</key>
+              <map>
+              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3089,9 +3111,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
                 </array>
               </map>
-              <key>build</key>
-              <map>
-              </map>
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -3099,6 +3118,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -3108,16 +3131,15 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                 </array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
             </map>
             <key>Release</key>
             <map>
+              <key>build</key>
+              <map>
+              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3130,9 +3152,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
                 </array>
               </map>
-              <key>build</key>
-              <map>
-              </map>
               <key>name</key>
               <string>Release</string>
             </map>
@@ -3140,6 +3159,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -3149,10 +3172,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                 </array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3163,22 +3182,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         </map>
         <key>darwin64</key>
         <map>
+          <key>build_directory</key>
+          <string>build-darwin-x86_64</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>Xcode</string>
-                </array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3192,21 +3201,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
-              <key>default</key>
-              <string>True</string>
-              <key>name</key>
-              <string>RelWithDebInfo</string>
-            </map>
-            <key>RelWithDebInfoOS</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
                 </array>
               </map>
+              <key>default</key>
+              <string>True</string>
+              <key>name</key>
+              <string>RelWithDebInfo</string>
+            </map>
+            <key>RelWithDebInfoOS</key>
+            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3220,11 +3233,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoOS</string>
-            </map>
-            <key>Release</key>
-            <map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -3232,11 +3240,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Xcode</string>
                 </array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3250,19 +3259,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
-              <key>name</key>
-              <string>Release</string>
-            </map>
-            <key>ReleaseOS</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
                 </array>
               </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3276,38 +3289,46 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>Xcode</string>
+                </array>
+              </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
-          <key>build_directory</key>
-          <string>build-darwin-x86_64</string>
           <key>name</key>
           <string>darwin64</string>
         </map>
         <key>linux64</key>
         <map>
+          <key>build_directory</key>
+          <string>build-linux-x86_64</string>
           <key>configurations</key>
           <map>
             <key>Release</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
+              </map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
                 </array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
-              </map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3316,6 +3337,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseOS</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
+              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -3325,11 +3351,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DLL_TESTS=Off</string>
                 </array>
               </map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
-              </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
@@ -3342,33 +3363,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
               <string>default</string>
             </map>
           </map>
-          <key>build_directory</key>
-          <string>build-linux-x86_64</string>
           <key>name</key>
           <string>linux64</string>
         </map>
         <key>windows</key>
         <map>
+          <key>build_directory</key>
+          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>configure</key>
+              <key>build</key>
               <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
+                  <string>SecondLife.sln</string>
                 </array>
-              </map>
-              <key>build</key>
-              <map>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
@@ -3376,9 +3387,19 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/build</string>
                   <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
                 </array>
+              </map>
+              <key>configure</key>
+              <map>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
+                  <string>..\indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
                 </array>
               </map>
               <key>default</key>
@@ -3388,25 +3409,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>RelWithDebInfoOS</key>
             <map>
-              <key>configure</key>
+              <key>build</key>
               <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
-                </array>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
+                  <string>SecondLife.sln</string>
                 </array>
-              </map>
-              <key>build</key>
-              <map>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3418,32 +3426,35 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
                 </array>
-                <key>arguments</key>
-                <array>
-                  <string>SecondLife.sln</string>
-                </array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoOS</string>
-            </map>
-            <key>Release</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
-                <key>arguments</key>
-                <array>
-                  <string>..\indra</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
                 </array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
               <key>build</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
@@ -3451,36 +3462,32 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/build</string>
                   <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
                 </array>
-                <key>arguments</key>
-                <array>
-                  <string>SecondLife.sln</string>
-                </array>
               </map>
-              <key>name</key>
-              <string>Release</string>
-            </map>
-            <key>ReleaseOS</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
-                </array>
-                <key>arguments</key>
-                <array>
-                  <string>..\indra</string>
                 </array>
               </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
               <key>build</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3492,35 +3499,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
                 </array>
+              </map>
+              <key>configure</key>
+              <map>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
+                  <string>..\indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
                 </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
-          <key>build_directory</key>
-          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>name</key>
           <string>windows</string>
         </map>
       </map>
-      <key>license</key>
-      <string>LGPL</string>
-      <key>license_file</key>
-      <string>docs/LICENSE-source.txt</string>
-      <key>copyright</key>
-      <string>Copyright (c) 2020, Linden Research, Inc.</string>
       <key>version_file</key>
       <string>newview/viewer_version.txt</string>
-      <key>name</key>
-      <string>Second Life Viewer</string>
-      <key>canonical_repo</key>
-      <string>https://github.com/secondlife/viewer</string>
-      <key>description</key>
-      <string>Second Life Viewer</string>
     </map>
-  </map>
-</llsd>
+    <key>type</key>
+    <string>autobuild</string>
+    <key>version</key>
+    <string>1.3</string>
+  </map></llsd>
-- 
cgit v1.2.3


From 88921452adf528bf7aecc2d2fe893ecb5574bde0 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 13 Dec 2023 06:26:06 +0200
Subject: DRTVWR-489 Restore autobuild.xml format

---
 autobuild.xml | 1430 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 717 insertions(+), 713 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5c11097b11..8d8ffe0084 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" ?>
-<llsd><map>
+<llsd>
+<map>
+    <key>version</key>
+    <string>1.3</string>
+    <key>type</key>
+    <string>autobuild</string>
     <key>installables</key>
     <map>
       <key>SDL</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
-        <key>description</key>
-        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/SDL.txt</string>
-        <key>name</key>
-        <string>SDL</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -29,21 +24,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/SDL.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
         <key>version</key>
         <string>1.2.15</string>
+        <key>name</key>
+        <string>SDL</string>
+        <key>description</key>
+        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
       </map>
       <key>apr_suite</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
-        <key>description</key>
-        <string>Apache portable runtime project</string>
-        <key>license</key>
-        <string>apache</string>
-        <key>license_file</key>
-        <string>LICENSES/apr_suite.txt</string>
-        <key>name</key>
-        <string>apr_suite</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -87,21 +82,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>apache</string>
+        <key>license_file</key>
+        <string>LICENSES/apr_suite.txt</string>
+        <key>copyright</key>
+        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
         <key>version</key>
         <string>1.7.2-e935465</string>
+        <key>name</key>
+        <string>apr_suite</string>
+        <key>description</key>
+        <string>Apache portable runtime project</string>
       </map>
       <key>boost</key>
       <map>
-        <key>copyright</key>
-        <string>(see individual source files)</string>
-        <key>description</key>
-        <string>Boost C++ Libraries</string>
-        <key>license</key>
-        <string>boost 1.0</string>
-        <key>license_file</key>
-        <string>LICENSES/boost.txt</string>
-        <key>name</key>
-        <string>boost</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -133,21 +128,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>boost 1.0</string>
+        <key>license_file</key>
+        <string>LICENSES/boost.txt</string>
+        <key>copyright</key>
+        <string>(see individual source files)</string>
         <key>version</key>
         <string>1.81-09d25a7</string>
+        <key>name</key>
+        <string>boost</string>
+        <key>description</key>
+        <string>Boost C++ Libraries</string>
       </map>
       <key>bugsplat</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2003-2017, BugSplat</string>
-        <key>description</key>
-        <string>Bugsplat crash reporting package</string>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
-        <key>name</key>
-        <string>bugsplat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -179,19 +174,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2003-2017, BugSplat</string>
         <key>version</key>
         <string>4.0.3.0-527603a</string>
+        <key>name</key>
+        <string>bugsplat</string>
+        <key>description</key>
+        <string>Bugsplat crash reporting package</string>
       </map>
       <key>colladadom</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
-        <key>license</key>
-        <string>SCEA</string>
-        <key>license_file</key>
-        <string>LICENSES/collada.txt</string>
-        <key>name</key>
-        <string>colladadom</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -223,19 +220,19 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>SCEA</string>
+        <key>license_file</key>
+        <string>LICENSES/collada.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
         <key>version</key>
         <string>2.3.ab0c124</string>
+        <key>name</key>
+        <string>colladadom</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
-        <key>name</key>
-        <string>cubemaptoequirectangular</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -279,21 +276,19 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
         <key>version</key>
         <string>1.1.0</string>
+        <key>name</key>
+        <string>cubemaptoequirectangular</string>
       </map>
       <key>curl</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
-        <key>description</key>
-        <string>Library for transferring data specified with URL syntax</string>
-        <key>license</key>
-        <string>curl</string>
-        <key>license_file</key>
-        <string>LICENSES/curl.txt</string>
-        <key>name</key>
-        <string>curl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -337,21 +332,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>curl</string>
+        <key>license_file</key>
+        <string>LICENSES/curl.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
         <key>version</key>
         <string>7.54.1-5a4a82d</string>
+        <key>name</key>
+        <string>curl</string>
+        <key>description</key>
+        <string>Library for transferring data specified with URL syntax</string>
       </map>
       <key>dbus_glib</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) Red Hat Inc.</string>
-        <key>description</key>
-        <string>D-Bus bindings for glib</string>
-        <key>license</key>
-        <string>Academic Free License v. 2.1</string>
-        <key>license_file</key>
-        <string>LICENSES/dbus-glib.txt</string>
-        <key>name</key>
-        <string>dbus_glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -367,21 +362,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Academic Free License v. 2.1</string>
+        <key>license_file</key>
+        <string>LICENSES/dbus-glib.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) Red Hat Inc.</string>
         <key>version</key>
         <string>0.76</string>
+        <key>name</key>
+        <string>dbus_glib</string>
+        <key>description</key>
+        <string>D-Bus bindings for glib</string>
       </map>
       <key>dictionaries</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2014 Apache OpenOffice software</string>
-        <key>description</key>
-        <string>Spell checking dictionaries to bundled into the viewer</string>
-        <key>license</key>
-        <string>various open source</string>
-        <key>license_file</key>
-        <string>LICENSES/dictionaries.txt</string>
-        <key>name</key>
-        <string>dictionaries</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -399,21 +394,21 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/dictionaries.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2014 Apache OpenOffice software</string>
         <key>version</key>
         <string>None</string>
+        <key>name</key>
+        <string>dictionaries</string>
+        <key>description</key>
+        <string>Spell checking dictionaries to bundled into the viewer</string>
       </map>
       <key>dullahan</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2017, Linden Research, Inc.</string>
-        <key>description</key>
-        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
-        <key>license</key>
-        <string>MPL</string>
-        <key>license_file</key>
-        <string>LICENSES/LICENSE.txt</string>
-        <key>name</key>
-        <string>dullahan</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -445,8 +440,18 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MPL</string>
+        <key>license_file</key>
+        <string>LICENSES/LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.14.0.202310131404_118.4.1_g3dd6078_chromium-118.0.5993.54</string>
+        <key>name</key>
+        <string>dullahan</string>
+        <key>description</key>
+        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
       </map>
       <key>emoji_shortcodes</key>
       <map>
@@ -494,16 +499,6 @@
       </map>
       <key>expat</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
-        <key>description</key>
-        <string>Expat is an XML parser library written in C</string>
-        <key>license</key>
-        <string>expat</string>
-        <key>license_file</key>
-        <string>LICENSES/expat.txt</string>
-        <key>name</key>
-        <string>expat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -549,21 +544,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>expat</string>
+        <key>license_file</key>
+        <string>LICENSES/expat.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
         <key>version</key>
         <string>2.1.1.1f36d02</string>
+        <key>name</key>
+        <string>expat</string>
+        <key>description</key>
+        <string>Expat is an XML parser library written in C</string>
       </map>
       <key>fmodstudio</key>
       <map>
-        <key>copyright</key>
-        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
-        <key>description</key>
-        <string>FMOD Studio API</string>
-        <key>license</key>
-        <string>fmod</string>
-        <key>license_file</key>
-        <string>LICENSES/fmodstudio.txt</string>
-        <key>name</key>
-        <string>fmodstudio</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -615,21 +610,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>fmod</string>
+        <key>license_file</key>
+        <string>LICENSES/fmodstudio.txt</string>
+        <key>copyright</key>
+        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
         <key>version</key>
         <string>2.02.13.578928</string>
+        <key>name</key>
+        <string>fmodstudio</string>
+        <key>description</key>
+        <string>FMOD Studio API</string>
       </map>
       <key>fontconfig</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
-        <key>description</key>
-        <string>Fontconfig is a library for configuring and customizing font access.</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/fontconfig.txt</string>
-        <key>name</key>
-        <string>fontconfig</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -645,8 +640,18 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/fontconfig.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
         <key>version</key>
         <string>2.11.0</string>
+        <key>name</key>
+        <string>fontconfig</string>
+        <key>description</key>
+        <string>Fontconfig is a library for configuring and customizing font access.</string>
       </map>
       <key>freetype</key>
       <map>
@@ -724,16 +729,6 @@
       </map>
       <key>glext</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
-        <key>description</key>
-        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
-        <key>license</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
-        <key>license_file</key>
-        <string>LICENSES/glext.txt</string>
-        <key>name</key>
-        <string>glext</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -751,21 +746,21 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
+        <key>license_file</key>
+        <string>LICENSES/glext.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
         <key>version</key>
         <string>68</string>
+        <key>name</key>
+        <string>glext</string>
+        <key>description</key>
+        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
       </map>
       <key>glh_linear</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2000 Cass Everitt</string>
-        <key>description</key>
-        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/glh-linear.txt</string>
-        <key>name</key>
-        <string>glh_linear</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -783,21 +778,21 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/glh-linear.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2000 Cass Everitt</string>
         <key>version</key>
         <string>None</string>
+        <key>name</key>
+        <string>glh_linear</string>
+        <key>description</key>
+        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
       </map>
       <key>googlemock</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2008, Google Inc.</string>
-        <key>description</key>
-        <string>a library for writing and using C++ mock classes</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/gmock.txt</string>
-        <key>name</key>
-        <string>googlemock</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -829,19 +824,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/gmock.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2008, Google Inc.</string>
         <key>version</key>
         <string>1.7.0.2b109d4</string>
+        <key>name</key>
+        <string>googlemock</string>
+        <key>description</key>
+        <string>a library for writing and using C++ mock classes</string>
       </map>
       <key>gstreamer</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/gstreamer.txt</string>
-        <key>name</key>
-        <string>gstreamer</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -857,19 +854,19 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/gstreamer.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
         <key>version</key>
         <string>0.10.6.314267</string>
+        <key>name</key>
+        <string>gstreamer</string>
       </map>
       <key>gtk-atk-pango-glib</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (various, see sources)</string>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/gtk-atk-pango-glib.txt</string>
-        <key>name</key>
-        <string>gtk-atk-pango-glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -885,21 +882,19 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/gtk-atk-pango-glib.txt</string>
+        <key>copyright</key>
+        <string>Copyright (various, see sources)</string>
         <key>version</key>
         <string>0.1</string>
+        <key>name</key>
+        <string>gtk-atk-pango-glib</string>
       </map>
       <key>havok-source</key>
       <map>
-        <key>copyright</key>
-        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
-        <key>description</key>
-        <string>Havok source code for libs and demos</string>
-        <key>license</key>
-        <string>havok</string>
-        <key>license_file</key>
-        <string>LICENSES/havok.txt</string>
-        <key>name</key>
-        <string>havok-source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -947,8 +942,18 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>havok</string>
+        <key>license_file</key>
+        <string>LICENSES/havok.txt</string>
+        <key>copyright</key>
+        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
         <key>version</key>
         <string>2012.1-2</string>
+        <key>name</key>
+        <string>havok-source</string>
+        <key>description</key>
+        <string>Havok source code for libs and demos</string>
       </map>
       <key>icu4c</key>
       <map>
@@ -1000,14 +1005,6 @@
       </map>
       <key>jpegencoderbasic</key>
       <map>
-        <key>copyright</key>
-        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
-        <key>license</key>
-        <string>NONE</string>
-        <key>license_file</key>
-        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
-        <key>name</key>
-        <string>jpegencoderbasic</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1051,21 +1048,19 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>NONE</string>
+        <key>license_file</key>
+        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
         <key>version</key>
         <string>1.0</string>
+        <key>name</key>
+        <string>jpegencoderbasic</string>
       </map>
       <key>jpeglib</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
-        <key>description</key>
-        <string>JPEG encoding, decoding library</string>
-        <key>license</key>
-        <string>jpeglib</string>
-        <key>license_file</key>
-        <string>LICENSES/jpeglib.txt</string>
-        <key>name</key>
-        <string>jpeglib</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1111,21 +1106,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>jpeglib</string>
+        <key>license_file</key>
+        <string>LICENSES/jpeglib.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
         <key>version</key>
         <string>8c.7846234</string>
+        <key>name</key>
+        <string>jpeglib</string>
+        <key>description</key>
+        <string>JPEG encoding, decoding library</string>
       </map>
       <key>jsoncpp</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
-        <key>description</key>
-        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
-        <key>license</key>
-        <string>public domain</string>
-        <key>license_file</key>
-        <string>LICENSES/jsoncpp.txt</string>
-        <key>name</key>
-        <string>jsoncpp</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1171,21 +1166,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>public domain</string>
+        <key>license_file</key>
+        <string>LICENSES/jsoncpp.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
         <key>version</key>
         <string>0.5.0.bc46e62</string>
+        <key>name</key>
+        <string>jsoncpp</string>
+        <key>description</key>
+        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
       </map>
       <key>kdu</key>
       <map>
-        <key>copyright</key>
-        <string>Kakadu software</string>
-        <key>description</key>
-        <string>JPEG2000 library by Kakadu</string>
-        <key>license</key>
-        <string>Kakadu</string>
-        <key>license_file</key>
-        <string>LICENSES/kdu.txt</string>
-        <key>name</key>
-        <string>kdu</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1237,21 +1232,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Kakadu</string>
+        <key>license_file</key>
+        <string>LICENSES/kdu.txt</string>
+        <key>copyright</key>
+        <string>Kakadu software</string>
         <key>version</key>
         <string>7.10.4.539108</string>
+        <key>name</key>
+        <string>kdu</string>
+        <key>description</key>
+        <string>JPEG2000 library by Kakadu</string>
       </map>
       <key>libhunspell</key>
       <map>
-        <key>copyright</key>
-        <string>See hunspell.txt</string>
-        <key>description</key>
-        <string>Spell checking library</string>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/hunspell.txt</string>
-        <key>name</key>
-        <string>libhunspell</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1297,21 +1292,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/hunspell.txt</string>
+        <key>copyright</key>
+        <string>See hunspell.txt</string>
         <key>version</key>
         <string>1.3.2.650fb94</string>
+        <key>name</key>
+        <string>libhunspell</string>
+        <key>description</key>
+        <string>Spell checking library</string>
       </map>
       <key>libndofdev</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
-        <key>description</key>
-        <string>3DConnexion SDK</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/libndofdev.txt</string>
-        <key>name</key>
-        <string>libndofdev</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1343,21 +1338,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/libndofdev.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
         <key>version</key>
         <string>0.1.8e9edc7</string>
+        <key>name</key>
+        <string>libndofdev</string>
+        <key>description</key>
+        <string>3DConnexion SDK</string>
       </map>
       <key>libpng</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
-        <key>description</key>
-        <string>PNG Reference library</string>
-        <key>license</key>
-        <string>libpng</string>
-        <key>license_file</key>
-        <string>LICENSES/libpng.txt</string>
-        <key>name</key>
-        <string>libpng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1401,21 +1396,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>libpng</string>
+        <key>license_file</key>
+        <string>LICENSES/libpng.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
         <key>version</key>
         <string>1.6.38-ca06e99</string>
+        <key>name</key>
+        <string>libpng</string>
+        <key>description</key>
+        <string>PNG Reference library</string>
       </map>
       <key>libuuid</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
-        <key>description</key>
-        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
-        <key>license</key>
-        <string>UUID</string>
-        <key>license_file</key>
-        <string>LICENSES/uuid.txt</string>
-        <key>name</key>
-        <string>libuuid</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -1431,21 +1426,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>UUID</string>
+        <key>license_file</key>
+        <string>LICENSES/uuid.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
         <key>version</key>
         <string>1.6.2</string>
+        <key>name</key>
+        <string>libuuid</string>
+        <key>description</key>
+        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
       </map>
       <key>libxml2</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
-        <key>description</key>
-        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/libxml2.txt</string>
-        <key>name</key>
-        <string>libxml2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1491,21 +1486,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/libxml2.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
         <key>version</key>
         <string>2.9.4.7476681</string>
+        <key>name</key>
+        <string>libxml2</string>
+        <key>description</key>
+        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
       </map>
       <key>llappearance_utility</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
-        <key>description</key>
-        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/llappearanceutility.txt</string>
-        <key>name</key>
-        <string>llappearance_utility</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1521,20 +1516,21 @@
             <string>linux</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/llappearanceutility.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
         <key>version</key>
         <string>0.0.1</string>
+        <key>name</key>
+        <string>llappearance_utility</string>
+        <key>description</key>
+        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
       </map>
       <key>llca</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
-      </string>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/ca-license.txt</string>
-        <key>name</key>
-        <string>llca</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -1552,19 +1548,20 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/ca-license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
+      </string>
         <key>version</key>
         <string>202310121530.0</string>
+        <key>name</key>
+        <string>llca</string>
       </map>
       <key>llphysicsextensions_source</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/llphysicsextensions.txt</string>
-        <key>name</key>
-        <string>llphysicsextensions_source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1616,19 +1613,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>version</key>
-        <string>1.0.565768</string>
-      </map>
-      <key>llphysicsextensions_stub</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>license</key>
         <string>internal</string>
         <key>license_file</key>
         <string>LICENSES/llphysicsextensions.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
+        <key>version</key>
+        <string>1.0.565768</string>
         <key>name</key>
-        <string>llphysicsextensions_stub</string>
+        <string>llphysicsextensions_source</string>
+      </map>
+      <key>llphysicsextensions_stub</key>
+      <map>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1668,19 +1665,19 @@
             <string>windows</string>
           </map>
         </map>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/llphysicsextensions.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.542456</string>
+        <key>name</key>
+        <string>llphysicsextensions_stub</string>
       </map>
       <key>llphysicsextensions_tpv</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/HavokSublicense.pdf</string>
-        <key>name</key>
-        <string>llphysicsextensions_tpv</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1720,17 +1717,19 @@
             <string>windows</string>
           </map>
         </map>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/HavokSublicense.pdf</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.561752</string>
+        <key>name</key>
+        <string>llphysicsextensions_tpv</string>
       </map>
       <key>mesa</key>
       <map>
-        <key>license</key>
-        <string>mesa</string>
-        <key>license_file</key>
-        <string>LICENSES/mesa.txt</string>
-        <key>name</key>
-        <string>mesa</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1746,23 +1745,17 @@
             <string>linux</string>
           </map>
         </map>
+        <key>license</key>
+        <string>mesa</string>
+        <key>license_file</key>
+        <string>LICENSES/mesa.txt</string>
         <key>version</key>
         <string>7.11.1.297294</string>
+        <key>name</key>
+        <string>mesa</string>
       </map>
       <key>meshoptimizer</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
-        <key>description</key>
-        <string>Meshoptimizer. Mesh optimization library.</string>
-        <key>license</key>
-        <string>meshoptimizer</string>
-        <key>license_file</key>
-        <string>LICENSES/meshoptimizer.txt</string>
-        <key>name</key>
-        <string>meshoptimizer</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1794,8 +1787,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>meshoptimizer</string>
+        <key>license_file</key>
+        <string>LICENSES/meshoptimizer.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
         <key>version</key>
         <string>160</string>
+        <key>name</key>
+        <string>meshoptimizer</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
+        <key>description</key>
+        <string>Meshoptimizer. Mesh optimization library.</string>
       </map>
       <key>mikktspace</key>
       <map>
@@ -1855,18 +1860,6 @@
       </map>
       <key>minizip-ng</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
-        <key>copyright</key>
-        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
-        <key>description</key>
-        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
-        <key>license</key>
-        <string>minizip-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/minizip-ng.txt</string>
-        <key>name</key>
-        <string>minizip-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1912,8 +1905,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>minizip-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/minizip-ng.txt</string>
+        <key>copyright</key>
+        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>3.0.2.3e9876e</string>
+        <key>name</key>
+        <string>minizip-ng</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
+        <key>description</key>
+        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
       </map>
       <key>nanosvg</key>
       <map>
@@ -1973,17 +1978,6 @@
       </map>
       <key>nghttp2</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
-Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
-        <key>description</key>
-        <string>Library providing HTTP 2 support for libcurl</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/nghttp2.txt</string>
-        <key>name</key>
-        <string>nghttp2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2029,23 +2023,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>source_type</key>
-        <string>hg</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/nghttp2.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
+Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>version</key>
         <string>1.40.0.b1526c6</string>
+        <key>name</key>
+        <string>nghttp2</string>
+        <key>description</key>
+        <string>Library providing HTTP 2 support for libcurl</string>
+        <key>source_type</key>
+        <string>hg</string>
       </map>
       <key>nvapi</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
-        <key>description</key>
-        <string>NVAPI provides an interface to NVIDIA devices.</string>
-        <key>license</key>
-        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
-        <key>license_file</key>
-        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
-        <key>name</key>
-        <string>nvapi</string>
         <key>platforms</key>
         <map>
           <key>windows64</key>
@@ -2063,21 +2058,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
+        <key>license_file</key>
+        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
+        <key>copyright</key>
+        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
         <key>version</key>
         <string>352.aac0e19</string>
+        <key>name</key>
+        <string>nvapi</string>
+        <key>description</key>
+        <string>NVAPI provides an interface to NVIDIA devices.</string>
       </map>
       <key>ogg_vorbis</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2002, Xiph.org Foundation</string>
-        <key>description</key>
-        <string>Audio encoding library</string>
-        <key>license</key>
-        <string>ogg-vorbis</string>
-        <key>license_file</key>
-        <string>LICENSES/ogg-vorbis.txt</string>
-        <key>name</key>
-        <string>ogg_vorbis</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2121,96 +2116,96 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>ogg-vorbis</string>
+        <key>license_file</key>
+        <string>LICENSES/ogg-vorbis.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2002, Xiph.org Foundation</string>
         <key>version</key>
         <string>1.3.3-1.3.6.e4101b6</string>
+        <key>name</key>
+        <string>ogg_vorbis</string>
+        <key>description</key>
+        <string>Audio encoding library</string>
       </map>
       <key>open-libndofdev</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
-        <key>description</key>
-        <string>Open Source replacement for 3DConnection SDK</string>
         <key>license</key>
         <string>BSD</string>
         <key>license_file</key>
         <string>LICENSES/libndofdev.txt</string>
-        <key>name</key>
-        <string>open-libndofdev</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
         <key>version</key>
         <string>0.3</string>
+        <key>name</key>
+        <string>open-libndofdev</string>
+        <key>description</key>
+        <string>Open Source replacement for 3DConnection SDK</string>
       </map>
       <key>openal</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1999-2007 by authors.</string>
-        <key>description</key>
-        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
-        <key>license</key>
-        <string>LGPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/openal-soft.txt</string>
-        <key>name</key>
-        <string>openal</string>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
+              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>darwin64</string>
+            <string>linux64</string>
           </map>
-          <key>linux64</key>
+          <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
+              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>windows64</string>
           </map>
-          <key>windows64</key>
+          <key>darwin64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
+              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>darwin64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/openal-soft.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1999-2007 by authors.</string>
         <key>version</key>
         <string>1.23.1</string>
+        <key>name</key>
+        <string>openal</string>
+        <key>description</key>
+        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
       </map>
       <key>openjpeg</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
-        <key>description</key>
-        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/openjpeg.txt</string>
-        <key>name</key>
-        <string>openjpeg</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2256,21 +2251,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/openjpeg.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
         <key>version</key>
         <string>2.5.0.ea12248</string>
+        <key>name</key>
+        <string>openjpeg</string>
+        <key>description</key>
+        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
       </map>
       <key>openssl</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
-        <key>description</key>
-        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
-        <key>license</key>
-        <string>openssl</string>
-        <key>license_file</key>
-        <string>LICENSES/openssl.txt</string>
-        <key>name</key>
-        <string>openssl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2316,21 +2311,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>openssl</string>
+        <key>license_file</key>
+        <string>LICENSES/openssl.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
         <key>version</key>
         <string>1.1.1q.de53f55</string>
+        <key>name</key>
+        <string>openssl</string>
+        <key>description</key>
+        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
       </map>
       <key>pcre</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
-        <key>description</key>
-        <string>PCRE Perl-compatible regular expression library</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/pcre-license.txt</string>
-        <key>name</key>
-        <string>pcre</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2374,21 +2369,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/pcre-license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
         <key>version</key>
         <string>8.35.979fd86</string>
+        <key>name</key>
+        <string>pcre</string>
+        <key>description</key>
+        <string>PCRE Perl-compatible regular expression library</string>
       </map>
       <key>slvoice</key>
       <map>
-        <key>copyright</key>
-        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
-        <key>description</key>
-        <string>Vivox SDK components</string>
-        <key>license</key>
-        <string>Mixed</string>
-        <key>license_file</key>
-        <string>LICENSES/vivox_licenses.txt</string>
-        <key>name</key>
-        <string>slvoice</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2436,19 +2431,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Mixed</string>
+        <key>license_file</key>
+        <string>LICENSES/vivox_licenses.txt</string>
+        <key>copyright</key>
+        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
         <key>version</key>
         <string>4.10.0000.32327.5fc3fe7c.571099</string>
+        <key>name</key>
+        <string>slvoice</string>
+        <key>description</key>
+        <string>Vivox SDK components</string>
       </map>
       <key>threejs</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright © 2010-2021 three.js authors</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/THREEJS_LICENSE.txt</string>
-        <key>name</key>
-        <string>threejs</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2492,8 +2489,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/THREEJS_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright © 2010-2021 three.js authors</string>
         <key>version</key>
         <string>0.132.2</string>
+        <key>name</key>
+        <string>threejs</string>
       </map>
       <key>tinygltf</key>
       <map>
@@ -2533,18 +2538,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tracy</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
-        <key>description</key>
-        <string>Tracy Profiler Library</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
-        <key>name</key>
-        <string>tracy</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2574,6 +2567,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tracy_license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
+        <key>version</key>
+        <string>v0.8.1.235e98f</string>
+        <key>name</key>
+        <string>tracy</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <key>description</key>
+        <string>Tracy Profiler Library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tracy</string>
         <key>source_type</key>
@@ -2583,16 +2590,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tut</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
-        <key>description</key>
-        <string>TUT is a small and portable unit test framework for C++.</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tut.txt</string>
-        <key>name</key>
-        <string>tut</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2610,21 +2607,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tut.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
         <key>version</key>
         <string>2008.11.30</string>
+        <key>name</key>
+        <string>tut</string>
+        <key>description</key>
+        <string>TUT is a small and portable unit test framework for C++.</string>
       </map>
       <key>uriparser</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
-        <key>description</key>
-        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
-        <key>license</key>
-        <string>New BSD license</string>
-        <key>license_file</key>
-        <string>LICENSES/uriparser.txt</string>
-        <key>name</key>
-        <string>uriparser</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2670,8 +2667,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>New BSD license</string>
+        <key>license_file</key>
+        <string>LICENSES/uriparser.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
         <key>version</key>
         <string>0.9.4</string>
+        <key>name</key>
+        <string>uriparser</string>
+        <key>description</key>
+        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
       </map>
       <key>viewer-fonts</key>
       <map>
@@ -2717,16 +2724,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>viewer-manager</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
-        <key>description</key>
-        <string>Linden Lab Viewer Management Process suite.</string>
-        <key>license</key>
-        <string>viewerlgpl</string>
-        <key>license_file</key>
-        <string>LICENSE</string>
-        <key>name</key>
-        <string>viewer-manager</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2772,23 +2769,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>viewerlgpl</string>
+        <key>license_file</key>
+        <string>LICENSE</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
+        <key>version</key>
+        <string>3.0.cc7ea1e</string>
+        <key>name</key>
+        <string>viewer-manager</string>
+        <key>description</key>
+        <string>Linden Lab Viewer Management Process suite.</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/vmp-standalone</string>
         <key>source_type</key>
         <string>hg</string>
-        <key>version</key>
-        <string>3.0.cc7ea1e</string>
       </map>
       <key>vlc-bin</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
-        <key>license</key>
-        <string>GPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/vlc.txt</string>
-        <key>name</key>
-        <string>vlc-bin</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2820,23 +2819,19 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>GPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/vlc.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
         <key>version</key>
         <string>3.0.16.c219a5d</string>
+        <key>name</key>
+        <string>vlc-bin</string>
       </map>
-      <key>vulkan_gltf</key>
+      <key>xmlrpc-epi</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
-        <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
-        <key>name</key>
-        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2844,53 +2839,71 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8cff2060843db3db788511ee34a8e8cc</string>
+              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>windows</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>58eea384be49ba756ce9c5e66669540b</string>
+              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows</string>
+            <string>linux64</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
+              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>xmlrpc-epi</string>
+        <key>license_file</key>
+        <string>LICENSES/xmlrpc-epi.txt</string>
+        <key>copyright</key>
+        <string>Copyright: (C) 2000 Epinions, Inc.</string>
         <key>version</key>
-        <string>1</string>
+        <string>0.54.1.8a05acf</string>
+        <key>name</key>
+        <string>xmlrpc-epi</string>
+        <key>description</key>
+        <string>XMLRPC Library</string>
       </map>
-      <key>xmlrpc-epi</key>
+      <key>vulkan_gltf</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
         <key>copyright</key>
-        <string>Copyright: (C) 2000 Epinions, Inc.</string>
+        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>description</key>
-        <string>XMLRPC Library</string>
+        <string>Vulkan GLTF Sample Implementation</string>
         <key>license</key>
-        <string>xmlrpc-epi</string>
+        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>license_file</key>
-        <string>LICENSES/xmlrpc-epi.txt</string>
+        <string>LICENSES/vulkan_gltf.txt</string>
         <key>name</key>
-        <string>xmlrpc-epi</string>
+        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2898,59 +2911,43 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>8cff2060843db3db788511ee34a8e8cc</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>linux64</key>
+          <key>windows</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>58eea384be49ba756ce9c5e66669540b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>windows</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>0.54.1.8a05acf</string>
+        <string>1</string>
       </map>
       <key>xxhash</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2012-2021 Yann Collet</string>
-        <key>description</key>
-        <string>xxHash Library</string>
-        <key>license</key>
-        <string>xxhash</string>
-        <key>license_file</key>
-        <string>LICENSES/xxhash.txt</string>
-        <key>name</key>
-        <string>xxhash</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -3008,23 +3005,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>xxhash</string>
+        <key>license_file</key>
+        <string>LICENSES/xxhash.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2012-2021 Yann Collet</string>
         <key>version</key>
         <string>0.8.1.7501c90</string>
+        <key>name</key>
+        <string>xxhash</string>
+        <key>description</key>
+        <string>xxHash Library</string>
       </map>
       <key>zlib-ng</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
-        <key>description</key>
-        <string>zlib data compression library for the next generation systems</string>
-        <key>license</key>
-        <string>zlib-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/zlib-ng.txt</string>
-        <key>name</key>
-        <string>zlib-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -3070,24 +3065,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>zlib-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/zlib-ng.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>1.2.11.zlib-ng.32fd361</string>
+        <key>name</key>
+        <string>zlib-ng</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
+        <key>description</key>
+        <string>zlib data compression library for the next generation systems</string>
       </map>
     </map>
     <key>package_description</key>
     <map>
-      <key>canonical_repo</key>
-      <string>https://github.com/secondlife/viewer</string>
-      <key>copyright</key>
-      <string>Copyright (c) 2020, Linden Research, Inc.</string>
-      <key>description</key>
-      <string>Second Life Viewer</string>
-      <key>license</key>
-      <string>LGPL</string>
-      <key>license_file</key>
-      <string>docs/LICENSE-source.txt</string>
-      <key>name</key>
-      <string>Second Life Viewer</string>
       <key>platforms</key>
       <map>
         <key>common</key>
@@ -3096,9 +3091,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>build</key>
-              <map>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3111,6 +3103,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
                 </array>
               </map>
+              <key>build</key>
+              <map>
+              </map>
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -3118,10 +3113,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -3131,15 +3122,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                 </array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
             </map>
             <key>Release</key>
             <map>
-              <key>build</key>
-              <map>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -3152,6 +3144,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
                 </array>
               </map>
+              <key>build</key>
+              <map>
+              </map>
               <key>name</key>
               <string>Release</string>
             </map>
@@ -3159,10 +3154,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -3172,6 +3163,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                 </array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3182,12 +3177,22 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         </map>
         <key>darwin64</key>
         <map>
-          <key>build_directory</key>
-          <string>build-darwin-x86_64</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>Xcode</string>
+                </array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3201,25 +3206,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
+              <key>default</key>
+              <string>True</string>
+              <key>name</key>
+              <string>RelWithDebInfo</string>
+            </map>
+            <key>RelWithDebInfoOS</key>
+            <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
                 </array>
               </map>
-              <key>default</key>
-              <string>True</string>
-              <key>name</key>
-              <string>RelWithDebInfo</string>
-            </map>
-            <key>RelWithDebInfoOS</key>
-            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3233,6 +3234,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -3240,12 +3246,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Xcode</string>
                 </array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoOS</string>
-            </map>
-            <key>Release</key>
-            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3259,23 +3264,19 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
                 </array>
               </map>
-              <key>name</key>
-              <string>Release</string>
-            </map>
-            <key>ReleaseOS</key>
-            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3289,46 +3290,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-parallelizeTargets</string>
                 </array>
               </map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>Xcode</string>
-                </array>
-              </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
+          <key>build_directory</key>
+          <string>build-darwin-x86_64</string>
           <key>name</key>
           <string>darwin64</string>
         </map>
         <key>linux64</key>
         <map>
-          <key>build_directory</key>
-          <string>build-linux-x86_64</string>
           <key>configurations</key>
           <map>
             <key>Release</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
-              </map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
                 </array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3337,11 +3330,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseOS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -3351,6 +3339,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DLL_TESTS=Off</string>
                 </array>
               </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
+              </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
@@ -3363,23 +3356,33 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
               <string>default</string>
             </map>
           </map>
+          <key>build_directory</key>
+          <string>build-linux-x86_64</string>
           <key>name</key>
           <string>linux64</string>
         </map>
         <key>windows</key>
         <map>
-          <key>build_directory</key>
-          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>build</key>
+              <key>configure</key>
               <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                </array>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
+                  <string>..\indra</string>
                 </array>
+              </map>
+              <key>build</key>
+              <map>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
@@ -3387,19 +3390,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/build</string>
                   <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
                 </array>
-              </map>
-              <key>configure</key>
-              <map>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-                </array>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>SecondLife.sln</string>
                 </array>
               </map>
               <key>default</key>
@@ -3409,12 +3402,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>RelWithDebInfoOS</key>
             <map>
-              <key>build</key>
+              <key>configure</key>
               <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
+                </array>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
+                  <string>..\indra</string>
                 </array>
+              </map>
+              <key>build</key>
+              <map>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3426,22 +3432,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
                 </array>
-              </map>
-              <key>configure</key>
-              <map>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-                </array>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
+                  <string>SecondLife.sln</string>
                 </array>
               </map>
               <key>name</key>
@@ -3449,12 +3442,22 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>Release</key>
             <map>
-              <key>build</key>
+              <key>configure</key>
               <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                </array>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
+                  <string>..\indra</string>
                 </array>
+              </map>
+              <key>build</key>
+              <map>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
@@ -3462,19 +3465,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/build</string>
                   <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
                 </array>
-              </map>
-              <key>configure</key>
-              <map>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-                </array>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>SecondLife.sln</string>
                 </array>
               </map>
               <key>name</key>
@@ -3482,12 +3475,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseOS</key>
             <map>
-              <key>build</key>
+              <key>configure</key>
               <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
+                </array>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
+                  <string>..\indra</string>
                 </array>
+              </map>
+              <key>build</key>
+              <map>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3499,38 +3506,35 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
                 </array>
-              </map>
-              <key>configure</key>
-              <map>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-                </array>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
+                  <string>SecondLife.sln</string>
                 </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
+          <key>build_directory</key>
+          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>name</key>
           <string>windows</string>
         </map>
       </map>
+      <key>license</key>
+      <string>LGPL</string>
+      <key>license_file</key>
+      <string>docs/LICENSE-source.txt</string>
+      <key>copyright</key>
+      <string>Copyright (c) 2020, Linden Research, Inc.</string>
       <key>version_file</key>
       <string>newview/viewer_version.txt</string>
+      <key>name</key>
+      <string>Second Life Viewer</string>
+      <key>canonical_repo</key>
+      <string>https://github.com/secondlife/viewer</string>
+      <key>description</key>
+      <string>Second Life Viewer</string>
     </map>
-    <key>type</key>
-    <string>autobuild</string>
-    <key>version</key>
-    <string>1.3</string>
-  </map></llsd>
+  </map>
+</llsd>
-- 
cgit v1.2.3


From 0db9bcf21fd4b7172e8a35cdb2805ccdc736e273 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 13 Dec 2023 20:20:01 +0100
Subject: SL-20279 BugSplat Crash #1327171: gl_debug_callback(111)

---
 indra/llrender/llgl.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 4c7c8e6f5c..f7fb46e310 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -94,6 +94,17 @@ void APIENTRY gl_debug_callback(GLenum source,
         return;
     }*/
 
+    if (gGLManager.mIsDisabled &&
+        severity == GL_DEBUG_SEVERITY_HIGH_ARB &&
+        source == GL_DEBUG_SOURCE_API_ARB &&
+        type == GL_DEBUG_TYPE_ERROR_ARB &&
+        id == GL_INVALID_VALUE)
+    {
+        // Suppress messages about deleting already deleted objects called from LLViewerWindow::stopGL()
+        // "GL_INVALID_VALUE error generated. Handle does not refer to an object generated by OpenGL."
+        return;
+    }
+
     // list of messages to suppress
     const char* suppress[] =
     {
@@ -148,8 +159,9 @@ void APIENTRY gl_debug_callback(GLenum source,
         glGetBufferParameteriv(GL_UNIFORM_BUFFER, GL_BUFFER_SIZE, &ubo_size);
         glGetBufferParameteriv(GL_UNIFORM_BUFFER, GL_BUFFER_IMMUTABLE_STORAGE, &ubo_immutable);
     }
-    
-    if (severity == GL_DEBUG_SEVERITY_HIGH)
+
+    // No needs to halt when is called from LLViewerWindow::stopGL()
+    if (severity == GL_DEBUG_SEVERITY_HIGH && !gGLManager.mIsDisabled)
     {
         LL_ERRS() << "Halting on GL Error" << LL_ENDL;
     }
-- 
cgit v1.2.3


From 009cd9adccd117357fa4054c523218a0e990bb80 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 13 Dec 2023 23:22:22 +0200
Subject: SL-20729 Crash in getObject

in "new_folder_from_selected" at gInventory.getObject(*ids.begin());
according to bugsplat argument id was a null pointer so I assume there
was an issue geting id out of the list.
---
 indra/newview/llinventoryfunctions.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 4aeacae6ed..6ac8bbee76 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2949,6 +2949,23 @@ bool get_selection_object_uuids(LLFolderView *root, uuid_vec_t& ids)
 void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root, const std::string& action, BOOL user_confirm)
 {
 	std::set<LLFolderViewItem*> selected_items = root->getSelectionList();
+    if (selected_items.empty()
+        && action != "wear"
+        && action != "wear_add"
+        && !isRemoveAction(action))
+    {
+        // Was item removed while user was checking menu?
+        // "wear" and removal exlusions are due to use of
+        // getInventorySelectedUUIDs() below
+        LL_WARNS("Inventory") << "Menu tried to operate on empty selection" << LL_ENDL;
+
+        if (("copy" == action) || ("cut" == action))
+        {
+            LLClipboard::instance().reset();
+        }
+
+        return;
+    }
     
     // Prompt the user and check for authorization for some marketplace active listing edits
 	if (user_confirm && (("delete" == action) || ("cut" == action) || ("rename" == action) || ("properties" == action) || ("task_properties" == action) || ("open" == action)))
-- 
cgit v1.2.3


From dc1676af27b1a6a1d33d293b22627a6fa3749316 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 15 Dec 2023 00:41:40 +0200
Subject: SL-20734 Uploaded Materials should use 'Uploads' permissions

---
 indra/newview/llmaterialeditor.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 292ddb765f..ae61198110 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1376,10 +1376,23 @@ bool LLMaterialEditor::saveIfNeeded()
         LLPermissions local_permissions;
         local_permissions.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
 
-        U32 everyone_perm = LLFloaterPerms::getEveryonePerms("Materials");
-        U32 group_perm = LLFloaterPerms::getGroupPerms("Materials");
-        U32 next_owner_perm = LLFloaterPerms::getNextOwnerPerms("Materials");
-        local_permissions.initMasks(PERM_ALL, PERM_ALL, everyone_perm, group_perm, next_owner_perm);
+        if (mIsOverride)
+        {
+            // Shouldn't happen, but just in case it ever changes
+            U32 everyone_perm = LLFloaterPerms::getEveryonePerms("Materials");
+            U32 group_perm = LLFloaterPerms::getGroupPerms("Materials");
+            U32 next_owner_perm = LLFloaterPerms::getNextOwnerPerms("Materials");
+            local_permissions.initMasks(PERM_ALL, PERM_ALL, everyone_perm, group_perm, next_owner_perm);
+
+        }
+        else
+        {
+            // Uploads are supposed to use Upload permissions, not material permissions
+            U32 everyone_perm = LLFloaterPerms::getEveryonePerms("Uploads");
+            U32 group_perm = LLFloaterPerms::getGroupPerms("Uploads");
+            U32 next_owner_perm = LLFloaterPerms::getNextOwnerPerms("Uploads");
+            local_permissions.initMasks(PERM_ALL, PERM_ALL, everyone_perm, group_perm, next_owner_perm);
+        }
 
         std::string res_desc = buildMaterialDescription();
         createInventoryItem(buffer, mMaterialName, res_desc, local_permissions);
-- 
cgit v1.2.3


From 8ea1f4a3fc77145cb60a7b8182e0da9c0e43ed69 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 14 Dec 2023 22:51:18 +0200
Subject: SL-15628 Crash inside ~LLModelInstanceBase

More explicit cleanup in hopes of narrowing down which of the models
failed
---
 indra/llmath/llvolume.h          |  2 +-
 indra/llprimitive/llmodel.cpp    |  1 +
 indra/llprimitive/llmodel.h      | 16 +++++++++++++++-
 indra/newview/llmodelpreview.cpp | 10 ++++++++++
 indra/newview/llmodelpreview.h   |  1 -
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index afed98ff36..71878b8cb6 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -1000,7 +1000,7 @@ class LLVolume : public LLRefCount
 	friend class LLVolumeLODGroup;
 
 protected:
-	~LLVolume(); // use unref
+	virtual ~LLVolume(); // use unref
 
 public:
 	typedef std::vector<LLVolumeFace> face_list_t;
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index ee493968de..68a7f29378 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -67,6 +67,7 @@ LLModel::~LLModel()
 	{
 		LLConvexDecomposition::getInstance()->deleteDecomposition(mDecompID);
 	}
+    mPhysics.mMesh.clear();
 }
 
 //static
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 4505d6b3b9..040257e00e 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -106,6 +106,8 @@ public:
 		std::vector<LLVector3> mPositions;
 		std::vector<LLVector3> mNormals;
 
+        ~PhysicsMesh() {}
+
 		void clear()
 		{
 			mPositions.clear();
@@ -131,6 +133,7 @@ public:
 	public:
 		Decomposition() { }
 		Decomposition(LLSD& data);
+		~Decomposition() { }
 		void fromLLSD(LLSD& data);
 		LLSD asLLSD() const;
 		bool hasHullList() const;
@@ -365,7 +368,7 @@ class LLModelInstanceBase
 {
 public:
 	LLPointer<LLModel> mModel;
-	LLPointer<LLModel> mLOD[5];
+	LLPointer<LLModel> mLOD[LLModel::NUM_LODS];
 	LLUUID mMeshID;
 
 	LLMatrix4 mTransform;
@@ -380,6 +383,15 @@ public:
 		: mModel(NULL)
 	{
 	}
+
+    virtual ~LLModelInstanceBase()
+    {
+        mModel = NULL;
+        for (int j = 0; j < LLModel::NUM_LODS; ++j)
+        {
+            mLOD[j] = NULL;
+        }
+    };
 };
 
 typedef std::vector<LLModelInstanceBase> model_instance_list;
@@ -399,6 +411,8 @@ public:
 
 	LLModelInstance(LLSD& data);
 
+    ~LLModelInstance() {}
+
 	LLSD asLLSD();
 };
 
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index ccae1030f1..ad22e84c6e 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -220,6 +220,16 @@ LLModelPreview::~LLModelPreview()
         mPreviewAvatar->markDead();
         mPreviewAvatar = NULL;
     }
+
+    mUploadData.clear();
+    mTextureSet.clear();
+
+    for (U32 i = 0; i < LLModel::NUM_LODS; i++)
+    {
+        clearModel(i);
+    }
+    mBaseModel.clear();
+    mBaseScene.clear();
 }
 
 void LLModelPreview::updateDimentionsAndOffsets()
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h
index df7320768c..d4d5d087bd 100644
--- a/indra/newview/llmodelpreview.h
+++ b/indra/newview/llmodelpreview.h
@@ -310,7 +310,6 @@ protected:
     vv_LLVolumeFace_t mBaseModelFacesCopy;
 
     U32 mGroup;
-    std::map<LLPointer<LLModel>, U32> mObject;
 
     // Amount of triangles in original(base) model
     U32 mMaxTriangleLimit;
-- 
cgit v1.2.3


From 8968f21763db711722e61d5b716873271bae1ed4 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 15 Dec 2023 07:23:24 +0200
Subject: Fix EOF in VIEWER_VERSION.txt

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 0e7b60da8a..a8a1887568 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.2
\ No newline at end of file
+7.1.2
-- 
cgit v1.2.3


From 422c006e32109890aa3cde23c40f334868187cbf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 15 Dec 2023 18:02:55 +0200
Subject: SL-20702 Remove ALM info in About

---
 indra/newview/llappviewer.cpp                  | 1 -
 indra/newview/skins/default/xui/en/strings.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 4a43133ff6..e6a47f1c64 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3328,7 +3328,6 @@ LLSD LLAppViewer::getViewerInfo() const
     info["NET_BANDWITH"] = gSavedSettings.getF32("ThrottleBandwidthKBPS");
     info["LOD_FACTOR"] = gSavedSettings.getF32("RenderVolumeLODFactor");
     info["RENDER_QUALITY"] = (F32)gSavedSettings.getU32("RenderQualityPerformance");
-    info["GPU_SHADERS"] = gSavedSettings.getBOOL("RenderDeferred") ? "Enabled" : "Disabled";
     info["TEXTURE_MEMORY"] = gGLManager.mVRAM;
 
 #if LL_DARWIN
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5d33853adc..e405d9ea10 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -53,7 +53,6 @@ Draw distance: [DRAW_DISTANCE]m
 Bandwidth: [NET_BANDWITH]kbit/s
 LOD factor: [LOD_FACTOR]
 Render quality: [RENDER_QUALITY]
-Advanced Lighting Model: [GPU_SHADERS]
 Texture memory: [TEXTURE_MEMORY]MB
 Disk cache: [DISK_CACHE_INFO]
 	</string>
-- 
cgit v1.2.3


From 27f6dd5767edc4f96f3267d81bb4d386d2df0a71 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Fri, 15 Dec 2023 20:17:14 +0200
Subject: Fix EOF in VIEWER_VERSION.txt

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 0e7b60da8a..a8a1887568 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.2
\ No newline at end of file
+7.1.2
-- 
cgit v1.2.3


From 1cc91fac587ae0edf86d2dec42e2846e57bfafd0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 15 Dec 2023 19:32:05 +0200
Subject: SL-20737 Crash clearing texture callbacks

shutdown crash
---
 indra/newview/llfloaterprofiletexture.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llfloaterprofiletexture.cpp b/indra/newview/llfloaterprofiletexture.cpp
index bf1f56a6d1..ec2e627165 100644
--- a/indra/newview/llfloaterprofiletexture.cpp
+++ b/indra/newview/llfloaterprofiletexture.cpp
@@ -58,6 +58,8 @@ LLFloaterProfileTexture::~LLFloaterProfileTexture()
         mImage->setBoostLevel(mImageOldBoostLevel);
         mImage = NULL;
     }
+
+    LLLoadedCallbackEntry::cleanUpCallbackList(&mCallbackTextureList);
 }
 
 // virtual
-- 
cgit v1.2.3


From a069a21d318abd4eded46556c3252fec08eea84c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 7 Dec 2023 13:59:22 +0200
Subject: SL-20696 FIXED llLoopSoundSlave producing no sound since viewer
 update

---
 indra/llaudio/llaudioengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index a387bb23cd..ece0a12a7a 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -398,7 +398,7 @@ void LLAudioEngine::idle()
 	for (source_map::value_type& src_pair : mAllSources)
 	{
 		LLAudioSource *sourcep = src_pair.second;
-		if (sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
+		if (!sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
 		{
 			sync_masterp = sourcep;
 			master_channelp = sync_masterp->getChannel();
-- 
cgit v1.2.3


From 1df31d64e8f06c3aa64714af631750263e9cc9ce Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 15 Dec 2023 16:13:51 -0500
Subject: DRTVWR-601: Update mikktspace and tinygltf to GHA package builds.

Ditch 32-bit Windows build of mikktspace.
---
 autobuild.xml | 88 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 0e5a5a2a25..936c86c84d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1734,18 +1734,6 @@
       </map>
       <key>mikktspace</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
-        <key>description</key>
-        <string>Mikktspace Tangent Generator</string>
-        <key>license</key>
-        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
-        <key>license_file</key>
-        <string>mikktspace.txt</string>
-        <key>name</key>
-        <string>mikktspace</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1753,40 +1741,58 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b48b7ac0792d3ea8f087d99d9e4a29d8</string>
+              <string>6542ca342661ec4dc7f3fbcd29ca7962d3bf4a01</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104415/914944/mikktspace-1-darwin64-574859.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-12b73ee/mikktspace-1-darwin64-12b73ee.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>windows</key>
+          <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0a016b9c0c1e2c0b557e0124094da6c5</string>
+              <string>b4c1138005a224018e8c1b9c057f03695b23e70b</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104407/914918/mikktspace-1-windows-574859.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-12b73ee/mikktspace-1-windows64-12b73ee.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows</string>
+            <string>windows64</string>
           </map>
-          <key>windows64</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>02e9e5b6fe6788f4d2babb83ec544843</string>
+              <string>e61c1e678b82d75764e29cac107431bdddb3f21f</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/104406/914909/mikktspace-1-windows64-574859.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-12b73ee/mikktspace-1-linux64-12b73ee.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
+        <key>license_file</key>
+        <string>mikktspace.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2011 by Morten S. Mikkelsen</string>
         <key>version</key>
         <string>1</string>
+        <key>name</key>
+        <string>mikktspace</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-mikktspace</string>
+        <key>description</key>
+        <string>Mikktspace Tangent Generator</string>
       </map>
       <key>minizip-ng</key>
       <map>
@@ -2376,18 +2382,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tinygltf</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
-        <key>copyright</key>
-        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
-        <key>description</key>
-        <string>tinygltf import library</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/tinygltf_license.txt</string>
-        <key>name</key>
-        <string>tinygltf</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2395,20 +2389,34 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4dad1c0948141e1667c01a3ee755e4dc</string>
+              <string>eee6b755cea664e228dcc28b2ea2a036741a4d77</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/105849/926137/tinygltf-v2.5.0-common-575729.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-tinygltf/releases/download/v2.5.0-5d136c3/tinygltf-v2.5.0-common-5d136c3.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/tinygltf_license.txt</string>
+        <key>copyright</key>
+        <string>// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many contributors.</string>
+        <key>version</key>
+        <string>v2.5.0</string>
+        <key>name</key>
+        <string>tinygltf</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
+        <key>description</key>
+        <string>tinygltf import library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tinygltf</string>
         <key>source_type</key>
         <string>git</string>
-        <key>version</key>
-        <string>v2.5.0</string>
       </map>
       <key>tracy</key>
       <map>
@@ -2448,7 +2456,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>copyright</key>
         <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
         <key>version</key>
-        <string>v0.8.1.235e98f</string>
+        <string>v0.8.1.578241</string>
         <key>name</key>
         <string>tracy</string>
         <key>canonical_repo</key>
@@ -2459,8 +2467,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <string>https://bitbucket.org/lindenlab/3p-tracy</string>
         <key>source_type</key>
         <string>git</string>
-        <key>version</key>
-        <string>v0.8.1.578241</string>
       </map>
       <key>tut</key>
       <map>
-- 
cgit v1.2.3


From d07cd115e3bdef8a2b1d2f6a5a507ddb67ff8cd9 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 15 Dec 2023 16:14:38 -0500
Subject: DRTVWR-601: Drop 32-bit Windows build of llphysicsextension_stub.

---
 autobuild.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 936c86c84d..a3cf4970e8 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1582,18 +1582,6 @@
             <key>name</key>
             <string>linux64</string>
           </map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>2e5f1f7046a49d8b0bc295aa878116bc</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/60043/564063/llphysicsextensions_stub-1.0.542456-windows-542456.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
         </map>
         <key>license</key>
         <string>internal</string>
-- 
cgit v1.2.3


From 67da0c7f604c970c6f637700d84ae0f631b9843a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 15 Dec 2023 16:23:49 -0500
Subject: DRTVWR-601: Update vulkan_gltf to GHA build.

---
 autobuild.xml | 60 +++++++++++++++++++----------------------------------------
 1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index a3cf4970e8..6004096ac7 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2718,59 +2718,37 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>vulkan_gltf</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
-        <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
-        <key>name</key>
-        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>8cff2060843db3db788511ee34a8e8cc</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>58eea384be49ba756ce9c5e66669540b</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
-          <key>windows64</key>
+          <key>common</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
+              <string>0c4742a4b1a870de9ef0ecfc3ba7ee7d996cb8fc</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-vulkan-gltf-pbr/releases/download/v1.0.0-93b7b3b/vulkan_gltf-1.0.0-common-93b7b3b.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>license_file</key>
+        <string>vulkan_gltf.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>version</key>
-        <string>1</string>
+        <string>1.0.0</string>
+        <key>name</key>
+        <string>vulkan_gltf</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
+        <key>description</key>
+        <string>Vulkan GLTF Sample Implementation</string>
       </map>
       <key>xxhash</key>
       <map>
-- 
cgit v1.2.3


From c85d244b61cce60c110da415fb8adf9760455e33 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 08:38:05 -0500
Subject: DRTVWR-601: fix source nanny complaint about VIEWER_VERSION.txt EOL

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 0e7b60da8a..a8a1887568 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.2
\ No newline at end of file
+7.1.2
-- 
cgit v1.2.3


From b782ab73e640e434e4ed67fa8dfc951f09757585 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 10:59:03 -0500
Subject: DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision

in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.
---
 .github/workflows/build.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 849c10d62e..ad494cb3a4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,6 +33,9 @@ jobs:
       AUTOBUILD_GITHUB_TOKEN: ${{ secrets.SHARED_AUTOBUILD_GITHUB_TOKEN }}
       AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables
       AUTOBUILD_VARIABLES_FILE: ${{ github.workspace }}/.build-variables/variables
+      # Direct autobuild to store vcs_url, vcs_branch and vcs_revision in
+      # autobuild-package.xml.
+      AUTOBUILD_VCS_INFO: "true"
       AUTOBUILD_VSVER: "170"
       DEVELOPER_DIR: ${{ matrix.developer_dir }}
       # Ensure that Linden viewer builds engage Bugsplat.
@@ -192,6 +195,11 @@ jobs:
           fi
           export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
 
+          # branch will be something like "origin/mybranch"
+          branch="$(git branch -r --contains ${{ github.event.pull_request.head.sha || github.sha }} | head -n 1)"
+          # strip off "origin/"
+          export AUTOBUILD_VCS_BRANCH="${branch#*/}"
+
           ./build.sh
 
           # Each artifact is downloaded as a distinct .zip file. Multiple jobs
-- 
cgit v1.2.3


From 6f4dcd58b75b536f78eaa1314ce3daa76621c283 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 14:47:03 -0500
Subject: DRTVWR-601: Update mikktspace, tinygltf, tracy, vulkan_gltf, xxhash

to latest GitHub builds. Some of these were still referencing codeticket
builds produced by TeamCity.
---
 autobuild.xml | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6004096ac7..f036675b15 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1729,11 +1729,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6542ca342661ec4dc7f3fbcd29ca7962d3bf4a01</string>
+              <string>6cc1585dba85b0226a2e7033a7e2a2ceaae7c983</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-12b73ee/mikktspace-1-darwin64-12b73ee.tar.zst</string>
+              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-5cee1f4/mikktspace-1-darwin64-5cee1f4.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1743,11 +1743,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b4c1138005a224018e8c1b9c057f03695b23e70b</string>
+              <string>6b7d01ad54e4a88a001f66840c32329cedb28202</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-12b73ee/mikktspace-1-windows64-12b73ee.tar.zst</string>
+              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-5cee1f4/mikktspace-1-windows64-5cee1f4.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -1757,11 +1757,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e61c1e678b82d75764e29cac107431bdddb3f21f</string>
+              <string>edc9782bf209e17ad1845498b42f16d733582082</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-12b73ee/mikktspace-1-linux64-12b73ee.tar.zst</string>
+              <string>https://github.com/secondlife/3p-mikktspace/releases/download/v1-5cee1f4/mikktspace-1-linux64-5cee1f4.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2377,11 +2377,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>eee6b755cea664e228dcc28b2ea2a036741a4d77</string>
+              <string>2c47ae2d0c38c86b8c2db8d9317f0ab15edfc74f</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-tinygltf/releases/download/v2.5.0-5d136c3/tinygltf-v2.5.0-common-5d136c3.tar.zst</string>
+              <string>https://github.com/secondlife/3p-tinygltf/releases/download/v2.5.0-1ae57fd/tinygltf-v2.5.0-common-1ae57fd.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
@@ -2415,9 +2415,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9b6e1a1f4b0969d38a1ca8ee00aeb548</string>
+              <string>49650353442698c3e05102676fe427d0ebe02f0b</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110584/960613/tracy-v0.8.1.578241-darwin64-578241.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-eecbf72/tracy-v0.8.1-eecbf72-darwin64-eecbf72.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2427,11 +2429,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>05b72ae5d733aed7d3bf142287601cc6</string>
+              <string>2b80e7407e4f3e82eff3879add0e9ad63e7fcace</string>
               <key>hash_algorithm</key>
-              <string>md5</string>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110586/960637/tracy-v0.8.1.578241-windows64-578241.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-tracy/releases/download/v0.8.1-eecbf72/tracy-v0.8.1-eecbf72-windows64-eecbf72.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -2444,7 +2446,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>copyright</key>
         <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
         <key>version</key>
-        <string>v0.8.1.578241</string>
+        <string>v0.8.1-eecbf72</string>
         <key>name</key>
         <string>tracy</string>
         <key>canonical_repo</key>
@@ -2725,11 +2727,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0c4742a4b1a870de9ef0ecfc3ba7ee7d996cb8fc</string>
+              <string>8e365eff8dcace48d91e2530f8b13e420849aefc</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-vulkan-gltf-pbr/releases/download/v1.0.0-93b7b3b/vulkan_gltf-1.0.0-common-93b7b3b.tar.zst</string>
+              <string>https://github.com/secondlife/3p-vulkan-gltf-pbr/releases/download/v1.0.0-d7c372f/vulkan_gltf-1.0.0-common-d7c372f.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
@@ -2771,11 +2773,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fdcc803a76a3359bb426db7dac161406676d51e7</string>
+              <string>71921e972a9181da916d9f9da6bceaa99935901b</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1.7501c90/xxhash-0.8.1.7501c90-darwin64-7501c90.tar.zst</string>
+              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-d405199/xxhash-0.8.1-d405199-darwin64-d405199.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2785,11 +2787,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7acb3f94a549fbb9bd7bc16604e34f33c5365a9b</string>
+              <string>b5b47855316f1f82266e3f9086997048b8d81952</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1.7501c90/xxhash-0.8.1.7501c90-linux64-7501c90.tar.zst</string>
+              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-d405199/xxhash-0.8.1-d405199-linux64-d405199.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -2799,11 +2801,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4522d075ea4703ef4b527c3039864ef735ea7953</string>
+              <string>069d5f4a4b25462092d74da24d03db34cc2b91f3</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1.7501c90/xxhash-0.8.1.7501c90-windows64-7501c90.tar.zst</string>
+              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-d405199/xxhash-0.8.1-d405199-windows64-d405199.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -2816,7 +2818,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>copyright</key>
         <string>Copyright (c) 2012-2021 Yann Collet</string>
         <key>version</key>
-        <string>0.8.1.7501c90</string>
+        <string>0.8.1-d405199</string>
         <key>name</key>
         <string>xxhash</string>
         <key>description</key>
@@ -3341,4 +3343,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <string>Second Life Viewer</string>
     </map>
   </map>
-</llsd>
+</llsd>
\ No newline at end of file
-- 
cgit v1.2.3


From 2c5066f1fcc0c9f145698ef3aaec72d27bce7181 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 17:35:23 -0500
Subject: DRTVWR-601: Use viewer-build-util/which-branch to determine branch.

---
 .github/workflows/build.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ad494cb3a4..dee1ca24ab 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -99,10 +99,17 @@ jobs:
         if: runner.os == 'Windows'
         run: choco install nsis-unicode
 
+      - name: Determine source branch
+        id: which-branch
+        uses: secondlife/viewer-build-util/which-branch@v1
+        with:
+          token: ${{ github.token }}
+
       - name: Build
         id: build
         shell: bash
         env:
+          AUTOBUILD_VCS_BRANCH: ${{ steps.which-branch.outputs.branch }}
           RUNNER_OS: ${{ runner.os }}
         run: |
           # set up things the viewer's build.sh script expects
@@ -153,7 +160,7 @@ jobs:
           }
           repo_branch()
           {
-            git -C "$1" branch | grep '^* ' | cut -c 3-
+            echo "$AUTOBUILD_VCS_BRANCH"
           }
           record_dependencies_graph()
           {
@@ -195,11 +202,6 @@ jobs:
           fi
           export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
 
-          # branch will be something like "origin/mybranch"
-          branch="$(git branch -r --contains ${{ github.event.pull_request.head.sha || github.sha }} | head -n 1)"
-          # strip off "origin/"
-          export AUTOBUILD_VCS_BRANCH="${branch#*/}"
-
           ./build.sh
 
           # Each artifact is downloaded as a distinct .zip file. Multiple jobs
-- 
cgit v1.2.3


From f43e4c6253e14309ceffbe215a7f03b49b7215e8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 19 Dec 2023 10:20:37 -0600
Subject: SL-20611 Followup -- fix for water haze artifacts on fullbright
 objects above water.

---
 indra/newview/pipeline.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 3a1edb0d00..f740fa60be 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -8359,7 +8359,7 @@ void LLPipeline::doWaterHaze()
         else
         {
             //render water patches like LLDrawPoolWater does
-            LLGLDepthTest depth(GL_FALSE);
+            LLGLDepthTest depth(GL_TRUE, GL_FALSE);
             LLGLDisable   cull(GL_CULL_FACE);
 
             gGLLastMatrix = NULL;
-- 
cgit v1.2.3


From 575dc8f4105828b421dd1a3856412a6dc4f16618 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 19 Dec 2023 15:36:34 -0600
Subject: SL-20754 Modify default midday to be a better approximation of Cloud
 Layers HDRI (addresses blue sheen).

---
 indra/newview/llenvironment.cpp    | 2 +-
 indra/newview/llmaterialeditor.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index edc7bdef5f..ffaca846dd 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -815,7 +815,7 @@ const F64Seconds LLEnvironment::TRANSITION_SLOW(10.0f);
 const F64Seconds LLEnvironment::TRANSITION_ALTITUDE(5.0f);
 
 const LLUUID LLEnvironment::KNOWN_SKY_SUNRISE("01e41537-ff51-2f1f-8ef7-17e4df760bfb");
-const LLUUID LLEnvironment::KNOWN_SKY_MIDDAY("651510b8-5f4d-8991-1592-e7eeab2a5a06");
+const LLUUID LLEnvironment::KNOWN_SKY_MIDDAY("c46226b4-0e43-5a56-9708-d27ca1df3292");
 const LLUUID LLEnvironment::KNOWN_SKY_LEGACY_MIDDAY("cef49723-0292-af49-9b14-9598a616b8a3");
 const LLUUID LLEnvironment::KNOWN_SKY_SUNSET("084e26cd-a900-28e8-08d0-64a9de5c15e2");
 const LLUUID LLEnvironment::KNOWN_SKY_MIDNIGHT("8a01b97a-cb20-c1ea-ac63-f7ea84ad0090");
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index ae61198110..db9589666c 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2241,7 +2241,7 @@ bool LLMaterialEditor::canModifyObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_MODIFY}), ItemSource::OBJECT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_MODIFY}), ItemSource::OBJECT, permissions, item_out);
 }
 
 bool LLMaterialEditor::canSaveObjectsMaterial()
@@ -2249,7 +2249,7 @@ bool LLMaterialEditor::canSaveObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item_out);
 }
 
 bool LLMaterialEditor::canClipboardObjectsMaterial()
@@ -2275,7 +2275,7 @@ bool LLMaterialEditor::canClipboardObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), ItemSource::OBJECT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), ItemSource::OBJECT, permissions, item_out);
 }
 
 void LLMaterialEditor::saveObjectsMaterialAs()
@@ -2283,7 +2283,7 @@ void LLMaterialEditor::saveObjectsMaterialAs()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item = nullptr;
-    bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item);
+    bool allowed = can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item);
     if (!allowed)
     {
         LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
-- 
cgit v1.2.3


From bc3076938ea3c812054db41a72bdd5d5fbc46d3f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 20 Dec 2023 12:50:34 -0500
Subject: DRTVWR-601: Update xxhash common platform to GHA build.

Remove identical platform-specific package references.
---
 autobuild.xml | 50 +++++---------------------------------------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index f036675b15..522d9e6df4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2761,54 +2761,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e4f77ba0a9b8ec3cc3fabc51c4da81d2</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110070/956941/xxhash-0.8.1.578006-windows-578006.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>common</string>
-          </map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>71921e972a9181da916d9f9da6bceaa99935901b</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-d405199/xxhash-0.8.1-d405199-darwin64-d405199.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>b5b47855316f1f82266e3f9086997048b8d81952</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-d405199/xxhash-0.8.1-d405199-linux64-d405199.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>linux64</string>
-          </map>
-          <key>windows64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>069d5f4a4b25462092d74da24d03db34cc2b91f3</string>
+              <string>1a73c476b371b62066d1c3eced249660e9467e53</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-d405199/xxhash-0.8.1-d405199-windows64-d405199.tar.zst</string>
+              <string>https://github.com/secondlife/3p-xxhash/releases/download/v0.8.1-69ff69a/xxhash-0.8.1-69ff69a-common-69ff69a.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>common</string>
           </map>
         </map>
         <key>license</key>
@@ -2818,7 +2778,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>copyright</key>
         <string>Copyright (c) 2012-2021 Yann Collet</string>
         <key>version</key>
-        <string>0.8.1-d405199</string>
+        <string>0.8.1-69ff69a</string>
         <key>name</key>
         <string>xxhash</string>
         <key>description</key>
@@ -3343,4 +3303,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       <string>Second Life Viewer</string>
     </map>
   </map>
-</llsd>
\ No newline at end of file
+</llsd>
-- 
cgit v1.2.3


From 602a2af309bd66f76bcf4ca10515a10ca57aa5d6 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Tue, 2 Jan 2024 20:55:44 +0200
Subject: SL-20759 Ctrl+O should close Avatar floater if Wearing tab is opened

---
 indra/newview/llpaneloutfitsinventory.h | 3 ++-
 indra/newview/llsidepanelappearance.cpp | 9 +++++++++
 indra/newview/llsidepanelappearance.h   | 2 ++
 indra/newview/llviewermenu.cpp          | 8 ++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
index 50d7074d4b..f9e29c0a92 100644
--- a/indra/newview/llpaneloutfitsinventory.h
+++ b/indra/newview/llpaneloutfitsinventory.h
@@ -61,6 +61,8 @@ public:
 
 	void openApearanceTab(const std::string& tab_name);
 
+    bool isCOFPanelActive() const;
+
 protected:
 	void updateVerbs();
 
@@ -73,7 +75,6 @@ private:
 protected:
 	void 					initTabPanels();
 	void 					onTabChange();
-	bool 					isCOFPanelActive() const;
 	bool 					isOutfitsListPanelActive() const;
 	bool 					isOutfitsGalleryPanelActive() const;
 
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index aed9dba7ef..7571d361a4 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -361,6 +361,15 @@ void LLSidepanelAppearance::toggleMyOutfitsPanel(BOOL visible, const std::string
     }
 }
 
+bool LLSidepanelAppearance::isCOFPanelVisible()
+{
+    if (mPanelOutfitsInventory && mPanelOutfitsInventory->getVisible())
+    {
+        return mPanelOutfitsInventory->isCOFPanelActive();
+    }
+    return false;
+}
+
 void LLSidepanelAppearance::toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch)
 {
 	if (!mOutfitEdit || mOutfitEdit->getVisible() == visible)
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index bb9709a2b8..e67652d6f7 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -66,6 +66,8 @@ public:
 	void updateToVisibility( const LLSD& new_visibility );
 	LLPanelEditWearable* getWearable(){ return mEditWearable; }
 
+    bool isCOFPanelVisible();
+
 private:
 	void onFilterEdit(const std::string& search_string);
 	void onVisibilityChanged ( const LLSD& new_visibility );
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 553eaaf9b2..0e3527ec36 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -102,6 +102,7 @@
 #include "llsceneview.h"
 #include "llscenemonitor.h"
 #include "llselectmgr.h"
+#include "llsidepanelappearance.h"
 #include "llspellcheckmenuhandler.h"
 #include "llstatusbar.h"
 #include "lltextureview.h"
@@ -6651,6 +6652,13 @@ void handle_edit_outfit()
 
 void handle_now_wearing()
 {
+    LLSidepanelAppearance *panel_appearance = dynamic_cast<LLSidepanelAppearance *>(LLFloaterSidePanelContainer::getPanel("appearance"));
+    if (panel_appearance && panel_appearance->isInVisibleChain() && panel_appearance->isCOFPanelVisible())
+    {
+        LLFloaterReg::findInstance("appearance")->closeFloater();
+        return;
+    }
+
     LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "now_wearing"));
 }
 
-- 
cgit v1.2.3


From a7dcb0df2a11377b1112dfa0720e876507e1ae3d Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 20 Dec 2023 17:41:03 +0100
Subject: Build fix for Visual Studio update (std::vector<PermissionBit>)

---
 indra/newview/llmaterialeditor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index a5437f7a88..5e78e15c72 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2131,7 +2131,7 @@ bool LLMaterialEditor::canModifyObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_MODIFY}), permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_MODIFY}), permissions, item_out);
 }
 
 bool LLMaterialEditor::canSaveObjectsMaterial()
@@ -2139,7 +2139,7 @@ bool LLMaterialEditor::canSaveObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), permissions, item_out);
 }
 
 bool LLMaterialEditor::canClipboardObjectsMaterial()
@@ -2165,7 +2165,7 @@ bool LLMaterialEditor::canClipboardObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), permissions, item_out);
 }
 
 void LLMaterialEditor::saveObjectsMaterialAs()
@@ -2173,7 +2173,7 @@ void LLMaterialEditor::saveObjectsMaterialAs()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item = nullptr;
-    bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), permissions, item);
+    bool allowed = can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), permissions, item);
     if (!allowed)
     {
         LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
-- 
cgit v1.2.3


From 706ae0afad2aaa054a1c8165a2a2ff0cd118e5e4 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 3 Jan 2024 17:27:37 +0200
Subject: SL-20769 Local textures shouldn't be used for Picks & Classifieds

---
 indra/newview/llpanelprofileclassifieds.cpp | 2 ++
 indra/newview/llpanelprofilepicks.cpp       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index e0902c5ce4..75477dcf75 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -650,6 +650,8 @@ BOOL LLPanelProfileClassified::postBuild()
     mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelProfileClassified::onTextureSelected, this));
     mSnapshotCtrl->setMouseEnterCallback(boost::bind(&LLPanelProfileClassified::onTexturePickerMouseEnter, this));
     mSnapshotCtrl->setMouseLeaveCallback(boost::bind(&LLPanelProfileClassified::onTexturePickerMouseLeave, this));
+    mSnapshotCtrl->setAllowLocalTexture(FALSE);
+    mSnapshotCtrl->setBakeTextureEnabled(FALSE);
     mEditIcon->setVisible(false);
 
     mMapButton->setCommitCallback(boost::bind(&LLPanelProfileClassified::onMapClick, this));
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index ff3f654d0e..6bedc11f9d 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -581,6 +581,8 @@ BOOL LLPanelProfilePick::postBuild()
 
     mSnapshotCtrl = getChild<LLTextureCtrl>("pick_snapshot");
     mSnapshotCtrl->setCommitCallback(boost::bind(&LLPanelProfilePick::onSnapshotChanged, this));
+    mSnapshotCtrl->setAllowLocalTexture(FALSE);
+    mSnapshotCtrl->setBakeTextureEnabled(FALSE);
 
     childSetAction("teleport_btn", boost::bind(&LLPanelProfilePick::onClickTeleport, this));
     childSetAction("show_on_map_btn", boost::bind(&LLPanelProfilePick::onClickMap, this));
-- 
cgit v1.2.3


From 9659527ffd2226293993d81ecca72982a56756cf Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 4 Jan 2024 16:19:24 +0200
Subject: SL-20771 FIXED Classifieds Title not immediately updating button name

---
 indra/newview/llpanelprofileclassifieds.cpp | 10 +++++++++-
 indra/newview/llpanelprofileclassifieds.h   |  1 +
 indra/newview/llpanelprofilepicks.cpp       |  2 ++
 indra/newview/llpanelprofilepicks.h         |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index 75477dcf75..307935f45f 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -669,7 +669,7 @@ BOOL LLPanelProfileClassified::postBuild()
         mCategoryCombo->add(LLTrans::getString(iter->second));
     }
 
-    mClassifiedNameEdit->setKeystrokeCallback(boost::bind(&LLPanelProfileClassified::onChange, this), NULL);
+    mClassifiedNameEdit->setKeystrokeCallback(boost::bind(&LLPanelProfileClassified::onTitleChange, this), NULL);
     mClassifiedDescEdit->setKeystrokeCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
     mCategoryCombo->setCommitCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
     mContentTypeCombo->setCommitCallback(boost::bind(&LLPanelProfileClassified::onChange, this));
@@ -937,6 +937,8 @@ void LLPanelProfileClassified::onCancelClick()
     }
     else
     {
+        updateTabLabel(mClassifiedNameText->getValue());
+
         // Reload data to undo changes to forms
         LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId());
     }
@@ -1405,6 +1407,12 @@ void LLPanelProfileClassified::onChange()
     enableSave(isDirty());
 }
 
+void LLPanelProfileClassified::onTitleChange()
+{
+    updateTabLabel(getClassifiedName());
+    onChange();
+}
+
 void LLPanelProfileClassified::doSave()
 {
     //*TODO: Fix all of this
diff --git a/indra/newview/llpanelprofileclassifieds.h b/indra/newview/llpanelprofileclassifieds.h
index 912819e86b..d1aa5f55e3 100644
--- a/indra/newview/llpanelprofileclassifieds.h
+++ b/indra/newview/llpanelprofileclassifieds.h
@@ -257,6 +257,7 @@ protected:
 
     void onSetLocationClick();
     void onChange();
+    void onTitleChange();
 
     void onPublishFloaterPublishClicked();
 
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index 6bedc11f9d..e02ecfaa0a 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -672,6 +672,7 @@ void LLPanelProfilePick::setSnapshotId(const LLUUID& id)
 void LLPanelProfilePick::setPickName(const std::string& name)
 {
     mPickName->setValue(name);
+    mPickNameStr = name;
 }
 
 const std::string LLPanelProfilePick::getPickName()
@@ -787,6 +788,7 @@ void LLPanelProfilePick::onClickSave()
 
 void LLPanelProfilePick::onClickCancel()
 {
+    updateTabLabel(mPickNameStr);
     LLAvatarPropertiesProcessor::getInstance()->sendPickInfoRequest(getAvatarId(), getPickId());
     mLocationChanged = false;
     enableSaveButton(FALSE);
diff --git a/indra/newview/llpanelprofilepicks.h b/indra/newview/llpanelprofilepicks.h
index f84463cc9b..27331831d3 100644
--- a/indra/newview/llpanelprofilepicks.h
+++ b/indra/newview/llpanelprofilepicks.h
@@ -237,6 +237,7 @@ protected:
     LLUUID mParcelId;
     LLUUID mPickId;
     LLUUID mRequestedId;
+    std::string mPickNameStr;
 
     bool mLocationChanged;
     bool mNewPick;
-- 
cgit v1.2.3


From 4392f1bc8f3e44cc5b92bc1ed7b51744ef3c4c38 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 5 Jan 2024 00:57:58 +0200
Subject: SL-20748 Fix library materials not being previewable on an object

---
 indra/newview/llpanelface.cpp |  3 ++-
 indra/newview/llselectmgr.cpp | 38 ++++++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 5f8071d3eb..033c396d08 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -5176,8 +5176,9 @@ void LLPanelFace::onPbrSelectionChanged(LLInventoryItem* itemp)
         bool can_modify = itemp->getPermissions().allowOperationBy(PERM_MODIFY, gAgentID); // do we have perm to transfer this material?
         bool is_object_owner = gAgentID == obj_owner_id; // does object for which we are going to apply material belong to the agent?
         bool not_for_sale = !sale_info.isForSale(); // is object for which we are going to apply material not for sale?
+        bool from_library = ALEXANDRIA_LINDEN_ID == itemp->getPermissions().getOwner();
 
-        if (can_copy && can_transfer && can_modify)
+        if ((can_copy && can_transfer && can_modify) || from_library)
         {
             pbr_ctrl->setCanApply(true, true);
             return;
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index d172a87b1d..c2e3857af0 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1959,26 +1959,30 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
             {
                 return false;
             }
-            if (mItem && objectp->isAttachment())
+            LLUUID asset_id = mMatId;
+            if (mItem)
             {
                 const LLPermissions& perm = mItem->getPermissions();
-                BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
-                if (!unrestricted)
+                bool from_library = perm.getOwner() == ALEXANDRIA_LINDEN_ID;
+                if (objectp->isAttachment())
                 {
-                    // Attachments are in world and in inventory simultaneously,
-                    // at the moment server doesn't support such a situation.
-                    return false;
+                    bool unrestricted = (perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED;
+
+                    if (!unrestricted && !from_library)
+                    {
+                        // Attachments are in world and in inventory simultaneously,
+                        // at the moment server doesn't support such a situation.
+                        return false;
+                    }
                 }
-            }
-            LLUUID asset_id = mMatId;
-            if (mItem)
-            {
-                // If success, the material may be copied into the object's inventory
-                BOOL success = LLToolDragAndDrop::handleDropMaterialProtections(objectp, mItem, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null);
-                if (!success)
+
+                if (!from_library
+                    // Check if item may be copied into the object's inventory
+                    && !LLToolDragAndDrop::handleDropMaterialProtections(objectp, mItem, LLToolDragAndDrop::SOURCE_AGENT, LLUUID::null))
                 {
                     return false;
                 }
+
                 asset_id = mItem->getAssetUUID();
                 if (asset_id.isNull())
                 {
@@ -1994,11 +1998,13 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
     };
 
     bool success = true;
-    if (item &&
-            (!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()) ||
+    if (item
+        &&  (!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()) ||
              !item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID()) ||
              !item->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID())
-            ))
+            )
+        && item->getPermissions().getOwner() != ALEXANDRIA_LINDEN_ID
+        )
     {
         success = success && getSelection()->applyRestrictedPbrMaterialToTEs(item);
     }
-- 
cgit v1.2.3


From a1c36a3218a7fe6eb7b646e64c6bf9bc29b24886 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <gavriliuk@gmail.com>
Date: Fri, 5 Jan 2024 19:45:58 +0100
Subject: DRTVWR-489 MacOS Release build fix (vertex_count and index_count
 aren't used)

---
 indra/newview/llvotree.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp
index 36e6da802b..575b1dbe7e 100644
--- a/indra/newview/llvotree.cpp
+++ b/indra/newview/llvotree.cpp
@@ -865,6 +865,10 @@ BOOL LLVOTree::updateGeometry(LLDrawable *drawable)
 		mReferenceBuffer->unmapBuffer();
 		llassert(vertex_count == max_vertices);
 		llassert(index_count == max_indices);
+#ifndef SHOW_ASSERT
+        (void)vertex_count;
+        (void)index_count;
+#endif
 	}
 
 	//generate tree mesh
-- 
cgit v1.2.3


From 7c8907522fe6600918dacc15ee138ca72b2cf35e Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Sat, 6 Jan 2024 23:29:06 +0900
Subject: replace boost library to standard

---
 indra/llappearance/llavatarappearance.cpp          |  2 +-
 indra/llcommon/lldoubledispatch.h                  |  2 +-
 indra/llcommon/llerror.cpp                         |  8 +++---
 indra/llcommon/llerrorcontrol.h                    |  2 +-
 indra/llcommon/llinitparam.h                       |  2 +-
 indra/llcommon/llleap.cpp                          |  4 +--
 indra/llcommon/llprocess.h                         |  2 +-
 indra/llcommon/llrun.h                             |  2 +-
 indra/llcommon/llstring.h                          |  2 +-
 indra/llcommon/tests/llerror_test.cpp              | 30 +++++++++++-----------
 indra/llcommon/tests/lleventcoro_test.cpp          |  8 +++---
 indra/llcommon/tests/llinstancetracker_test.cpp    |  4 +--
 indra/llcommon/tests/wrapllerrs.h                  |  4 +--
 indra/llcorehttp/_httplibcurl.h                    |  2 +-
 indra/llcorehttp/_httpoperation.cpp                |  2 +-
 indra/llcorehttp/_httpoperation.h                  | 14 +++++-----
 indra/llcorehttp/_httpoprequest.cpp                |  6 ++---
 indra/llcorehttp/_httpoprequest.h                  |  2 +-
 indra/llcorehttp/_httpopsetget.h                   |  2 +-
 indra/llcorehttp/_httppolicy.h                     |  2 +-
 indra/llcorehttp/_httpreplyqueue.h                 |  4 +--
 indra/llcorehttp/_httprequestqueue.h               |  2 +-
 indra/llcorehttp/httpcommon.h                      | 14 +++++-----
 indra/llcorehttp/httphandler.h                     |  4 +--
 indra/llcorehttp/httpheaders.h                     |  2 +-
 indra/llcorehttp/httpoptions.h                     |  2 +-
 indra/llcorehttp/httprequest.h                     |  6 ++---
 indra/llcorehttp/httpresponse.h                    |  2 +-
 indra/llimage/llimagej2c.cpp                       |  2 +-
 indra/llimage/llimagej2c.h                         |  2 +-
 indra/llkdu/llimagej2ckdu.h                        |  8 +++---
 indra/llmessage/llcoproceduremanager.cpp           |  8 +++---
 indra/llmessage/llcorehttputil.h                   |  8 +++---
 indra/llmessage/llexperiencecache.h                |  2 +-
 indra/llmessage/lliohttpserver.cpp                 |  2 +-
 indra/llmessage/lliopipe.h                         |  2 +-
 indra/llmessage/lliosocket.h                       |  4 +--
 indra/llmessage/llservice.h                        |  2 +-
 indra/llmessage/llstoredmessage.h                  |  2 +-
 indra/llmessage/tests/llcurl_stub.cpp              |  2 +-
 indra/llplugin/llpluginclassmedia.h                |  2 +-
 indra/llplugin/llpluginprocessparent.h             |  4 +--
 indra/llprimitive/tests/llmediaentry_test.cpp      |  2 +-
 indra/llui/llnotifications.h                       |  2 +-
 indra/newview/llagent.h                            |  4 +--
 indra/newview/llappearancemgr.cpp                  |  2 +-
 indra/newview/llchiclet.h                          |  2 +-
 indra/newview/llcompilequeue.cpp                   |  2 +-
 indra/newview/llconversationlog.cpp                |  2 +-
 indra/newview/llfloatereditsky.cpp                 |  2 +-
 indra/newview/llfloatereditwater.cpp               |  2 +-
 indra/newview/llfloaterimnearbychathandler.cpp     |  2 +-
 indra/newview/llfloaterimnearbychathandler.h       |  2 +-
 indra/newview/llfloateruipreview.cpp               |  2 +-
 indra/newview/llinventorybridge.cpp                | 10 ++++----
 indra/newview/llinventorybridge.h                  |  4 +--
 indra/newview/llinventorygallery.cpp               |  2 +-
 indra/newview/lllogchat.cpp                        |  2 +-
 indra/newview/lllogininstance.h                    |  2 +-
 indra/newview/llmaterialmgr.cpp                    |  2 +-
 indra/newview/llmediadataclient.h                  |  4 +--
 indra/newview/llmeshrepository.cpp                 |  6 ++---
 indra/newview/llpanellogin.h                       |  2 +-
 indra/newview/llpathfindingmanager.cpp             |  4 +--
 indra/newview/llpathfindingmanager.h               |  4 +--
 indra/newview/llpathfindingnavmesh.h               |  2 +-
 indra/newview/llpathfindingnavmeshzone.h           |  2 +-
 indra/newview/llpathfindingobject.h                |  2 +-
 indra/newview/llpathfindingobjectlist.h            |  2 +-
 indra/newview/llpreviewtexture.cpp                 |  2 +-
 indra/newview/llsculptidsize.cpp                   |  2 +-
 indra/newview/llsculptidsize.h                     |  2 +-
 indra/newview/llsearchableui.h                     |  2 +-
 indra/newview/llviewermedia.h                      |  2 +-
 indra/newview/llviewermenufile.h                   |  2 +-
 indra/newview/llviewerparcelaskplay.cpp            |  2 +-
 indra/newview/llviewershadermgr.cpp                |  2 +-
 indra/newview/llviewerwindow.h                     |  4 +--
 indra/newview/llvoicevivox.cpp                     |  2 +-
 indra/newview/llvoicevivox.h                       | 14 +++++-----
 indra/newview/llwindowlistener.cpp                 |  2 +-
 indra/newview/llxmlrpclistener.cpp                 |  2 +-
 indra/newview/llxmlrpctransaction.cpp              |  2 +-
 indra/newview/tests/llremoteparcelrequest_test.cpp |  4 +--
 indra/test/io.cpp                                  | 10 ++++----
 indra/test/llevents_tut.cpp                        |  4 +--
 indra/test/test.cpp                                | 20 +++++++--------
 indra/viewer_components/login/lllogin.h            |  2 +-
 88 files changed, 173 insertions(+), 173 deletions(-)

diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 18b03c1f89..b9c3aee839 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -230,7 +230,7 @@ void LLAvatarAppearance::initInstance()
 		for (U32 lod = 0; lod < mesh_dict->mLOD; lod++)
 		{
 			LLAvatarJointMesh* mesh = createAvatarJointMesh();
-			std::string mesh_name = "m" + mesh_dict->mName + boost::lexical_cast<std::string>(lod);
+			std::string mesh_name = "m" + mesh_dict->mName + std::to_string(lod);
 			// We pre-pended an m - need to capitalize first character for camelCase
 			mesh_name[1] = toupper(mesh_name[1]);
 			mesh->setName(mesh_name);
diff --git a/indra/llcommon/lldoubledispatch.h b/indra/llcommon/lldoubledispatch.h
index 8ed295b6f1..ce6731e864 100644
--- a/indra/llcommon/lldoubledispatch.h
+++ b/indra/llcommon/lldoubledispatch.h
@@ -255,7 +255,7 @@ private:
     };
 
     /// shared_ptr manages Entry lifespan for us
-    typedef boost::shared_ptr<EntryBase> EntryPtr;
+    typedef std::shared_ptr<EntryBase> EntryPtr;
     /// use a @c list to make it easy to insert
     typedef std::list<EntryPtr> DispatchTable;
     DispatchTable mDispatch;
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 414515854a..4268f107e9 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1070,7 +1070,7 @@ namespace LLError
     //
     // NOTE!!! Requires external mutex lock!!!
     template <typename RECORDER>
-    std::pair<boost::shared_ptr<RECORDER>, Recorders::iterator>
+    std::pair<std::shared_ptr<RECORDER>, Recorders::iterator>
     findRecorderPos(SettingsConfigPtr &s)
     {
         // Since we promise to return an iterator, use a classic iterator
@@ -1081,7 +1081,7 @@ namespace LLError
             // *it is a RecorderPtr, a shared_ptr<Recorder>. Use a
             // dynamic_pointer_cast to try to downcast to test if it's also a
             // shared_ptr<RECORDER>.
-            auto ptr = boost::dynamic_pointer_cast<RECORDER>(*it);
+            auto ptr = std::dynamic_pointer_cast<RECORDER>(*it);
             if (ptr)
             {
                 // found the entry we want
@@ -1101,7 +1101,7 @@ namespace LLError
     // shared_ptr might be empty (operator!() returns true) if there was no
     // such RECORDER subclass instance in mRecorders.
     template <typename RECORDER>
-    boost::shared_ptr<RECORDER> findRecorder()
+    std::shared_ptr<RECORDER> findRecorder()
     {
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
         LLMutexLock lock(&s->mRecorderMutex);
@@ -1134,7 +1134,7 @@ namespace LLError
 
 		if (!file_name.empty())
 		{
-			boost::shared_ptr<RecordToFile> recordToFile(new RecordToFile(file_name));
+			std::shared_ptr<RecordToFile> recordToFile(new RecordToFile(file_name));
 			if (recordToFile->okay())
 			{
 				addRecorder(recordToFile);
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h
index 57f10b7895..77b187a80f 100644
--- a/indra/llcommon/llerrorcontrol.h
+++ b/indra/llcommon/llerrorcontrol.h
@@ -174,7 +174,7 @@ namespace LLError
 		bool mWantsMultiline;
 	};
 
-	typedef boost::shared_ptr<Recorder> RecorderPtr;
+	typedef std::shared_ptr<Recorder> RecorderPtr;
 
     /**
      * Instantiate GenericRecorder with a callable(level, message) to get
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
index 9edc7e40f3..e0d0ab9ac7 100644
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -627,7 +627,7 @@ namespace LLInitParam
 		UserData*			mUserData;
 	};
 
-	typedef boost::shared_ptr<ParamDescriptor> ParamDescriptorPtr;
+	typedef std::shared_ptr<ParamDescriptor> ParamDescriptorPtr;
 
 	// each derived Block class keeps a static data structure maintaining offsets to various params
 	class LL_COMMON_API BlockDescriptor
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index 8f88e728ce..b2b1162f63 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -462,10 +462,10 @@ private:
     LLProcessPtr mChild;
     LLTempBoundListener
         mStdinConnection, mStdoutConnection, mStdoutDataConnection, mStderrConnection;
-    boost::scoped_ptr<LLEventPump::Blocker> mBlocker;
+    std::unique_ptr<LLEventPump::Blocker> mBlocker;
     LLProcess::ReadPipe::size_type mExpect;
     LLError::RecorderPtr mRecorder;
-    boost::scoped_ptr<LLLeapListener> mListener;
+    std::unique_ptr<LLLeapListener> mListener;
 };
 
 // These must follow the declaration of LLLeapImpl, so they may as well be last.
diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h
index 0842f2eb07..c57821bf52 100644
--- a/indra/llcommon/llprocess.h
+++ b/indra/llcommon/llprocess.h
@@ -51,7 +51,7 @@ class LLEventPump;
 class LLProcess;
 /// LLProcess instances are created on the heap by static factory methods and
 /// managed by ref-counted pointers.
-typedef boost::shared_ptr<LLProcess> LLProcessPtr;
+typedef std::shared_ptr<LLProcess> LLProcessPtr;
 
 /**
  * LLProcess handles launching an external process with specified command line
diff --git a/indra/llcommon/llrun.h b/indra/llcommon/llrun.h
index d610f86234..42e3d9b47a 100644
--- a/indra/llcommon/llrun.h
+++ b/indra/llcommon/llrun.h
@@ -48,7 +48,7 @@ public:
 	/**
 	 * @brief The pointer to a runnable.
 	 */
-	typedef boost::shared_ptr<LLRunnable> run_ptr_t;
+	typedef std::shared_ptr<LLRunnable> run_ptr_t;
 
 	/**
 	 * @brief The handle for use in the API.
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 1fd6cac14a..61fc47e4d0 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -1199,7 +1199,7 @@ void LLStringUtilBase<T>::getTokens(const string_type& string, std::vector<strin
 {
 	// This overload must deal with escapes. Delegate that to InEscString
 	// (unless there ARE no escapes).
-	boost::scoped_ptr< LLStringUtilBaseImpl::InString<T> > instrp;
+	std::unique_ptr< LLStringUtilBaseImpl::InString<T> > instrp;
 	if (escapes.empty())
 		instrp.reset(new LLStringUtilBaseImpl::InString<T>(string.begin(), string.end()));
 	else
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 148c18aabe..b4cdbdc6bf 100644
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -153,27 +153,27 @@ namespace tut
 
 		int countMessages()
 		{
-			return boost::dynamic_pointer_cast<TestRecorder>(mRecorder)->countMessages();
+			return std::dynamic_pointer_cast<TestRecorder>(mRecorder)->countMessages();
 		}
 
 		void clearMessages()
 		{
-			boost::dynamic_pointer_cast<TestRecorder>(mRecorder)->clearMessages();
+			std::dynamic_pointer_cast<TestRecorder>(mRecorder)->clearMessages();
 		}
 
 		void setWantsTime(bool t)
             {
-                boost::dynamic_pointer_cast<TestRecorder>(mRecorder)->showTime(t);
+                std::dynamic_pointer_cast<TestRecorder>(mRecorder)->showTime(t);
             }
 
 		void setWantsMultiline(bool t)
             {
-                boost::dynamic_pointer_cast<TestRecorder>(mRecorder)->showMultiline(t);
+                std::dynamic_pointer_cast<TestRecorder>(mRecorder)->showMultiline(t);
             }
 
 		std::string message(int n)
 		{
-			return boost::dynamic_pointer_cast<TestRecorder>(mRecorder)->message(n);
+			return std::dynamic_pointer_cast<TestRecorder>(mRecorder)->message(n);
 		}
 
 		void ensure_message_count(int expectedCount)
@@ -497,12 +497,12 @@ namespace
 	void testLogName(LLError::RecorderPtr recorder, LogFromFunction f,
 		const std::string& class_name = "")
 	{
-		boost::dynamic_pointer_cast<tut::TestRecorder>(recorder)->clearMessages();
+		std::dynamic_pointer_cast<tut::TestRecorder>(recorder)->clearMessages();
 		std::string name = f(false);
 		f(true);
 
-		std::string messageWithoutName = boost::dynamic_pointer_cast<tut::TestRecorder>(recorder)->message(0);
-		std::string messageWithName = boost::dynamic_pointer_cast<tut::TestRecorder>(recorder)->message(1);
+		std::string messageWithoutName = std::dynamic_pointer_cast<tut::TestRecorder>(recorder)->message(0);
+		std::string messageWithName = std::dynamic_pointer_cast<tut::TestRecorder>(recorder)->message(1);
 
 		ensure_has(name + " logged without name",
 			messageWithoutName, name);
@@ -691,13 +691,13 @@ namespace tut
 		LL_INFOS() << "boo" << LL_ENDL;
 
 		ensure_message_field_equals(0, MSG_FIELD, "boo");
-		ensure_equals("alt recorder count", boost::dynamic_pointer_cast<TestRecorder>(altRecorder)->countMessages(), 1);
-		ensure_contains("alt recorder message 0", boost::dynamic_pointer_cast<TestRecorder>(altRecorder)->message(0), "boo");
+		ensure_equals("alt recorder count", std::dynamic_pointer_cast<TestRecorder>(altRecorder)->countMessages(), 1);
+		ensure_contains("alt recorder message 0", std::dynamic_pointer_cast<TestRecorder>(altRecorder)->message(0), "boo");
 
 		LLError::setTimeFunction(roswell);
 
 		LLError::RecorderPtr anotherRecorder(new TestRecorder());
-		boost::dynamic_pointer_cast<TestRecorder>(anotherRecorder)->showTime(true);
+		std::dynamic_pointer_cast<TestRecorder>(anotherRecorder)->showTime(true);
 		LLError::addRecorder(anotherRecorder);
 
 		LL_INFOS() << "baz" << LL_ENDL;
@@ -705,10 +705,10 @@ namespace tut
 		std::string when = roswell();
 
 		ensure_message_does_not_contain(1, when);
-		ensure_equals("alt recorder count", boost::dynamic_pointer_cast<TestRecorder>(altRecorder)->countMessages(), 2);
-		ensure_does_not_contain("alt recorder message 1", boost::dynamic_pointer_cast<TestRecorder>(altRecorder)->message(1), when);
-		ensure_equals("another recorder count", boost::dynamic_pointer_cast<TestRecorder>(anotherRecorder)->countMessages(), 1);
-		ensure_contains("another recorder message 0", boost::dynamic_pointer_cast<TestRecorder>(anotherRecorder)->message(0), when);
+		ensure_equals("alt recorder count", std::dynamic_pointer_cast<TestRecorder>(altRecorder)->countMessages(), 2);
+		ensure_does_not_contain("alt recorder message 1", std::dynamic_pointer_cast<TestRecorder>(altRecorder)->message(1), when);
+		ensure_equals("another recorder count", std::dynamic_pointer_cast<TestRecorder>(anotherRecorder)->countMessages(), 1);
+		ensure_contains("another recorder message 0", std::dynamic_pointer_cast<TestRecorder>(anotherRecorder)->message(0), when);
 
 		LLError::removeRecorder(altRecorder);
 		LLError::removeRecorder(anotherRecorder);
diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp
index 032923a108..01104545c6 100644
--- a/indra/llcommon/tests/lleventcoro_test.cpp
+++ b/indra/llcommon/tests/lleventcoro_test.cpp
@@ -101,7 +101,7 @@ namespace tut
         int which;
         LLTestApp testApp;
 
-        void explicit_wait(boost::shared_ptr<LLCoros::Promise<std::string>>& cbp);
+        void explicit_wait(std::shared_ptr<LLCoros::Promise<std::string>>& cbp);
         void waitForEventOn1();
         void coroPump();
         void postAndWait1();
@@ -111,7 +111,7 @@ namespace tut
     typedef coroutine_group::object object;
     coroutine_group coroutinegrp("coroutine");
 
-    void test_data::explicit_wait(boost::shared_ptr<LLCoros::Promise<std::string>>& cbp)
+    void test_data::explicit_wait(std::shared_ptr<LLCoros::Promise<std::string>>& cbp)
     {
         BEGIN
         {
@@ -127,7 +127,7 @@ namespace tut
             // For test purposes, instead of handing 'callback' (or an
             // adapter) off to some I/O subsystem, we'll just pass it back to
             // our caller.
-            cbp = boost::make_shared<LLCoros::Promise<std::string>>();
+            cbp = std::make_shared<LLCoros::Promise<std::string>>();
             LLCoros::Future<std::string> future = LLCoros::getFuture(*cbp);
 
             // calling get() on the future causes us to suspend
@@ -146,7 +146,7 @@ namespace tut
         DEBUG;
 
         // Construct the coroutine instance that will run explicit_wait.
-        boost::shared_ptr<LLCoros::Promise<std::string>> respond;
+        std::shared_ptr<LLCoros::Promise<std::string>> respond;
         LLCoros::instance().launch("test<1>",
                                    [this, &respond](){ explicit_wait(respond); });
         mSync.bump();
diff --git a/indra/llcommon/tests/llinstancetracker_test.cpp b/indra/llcommon/tests/llinstancetracker_test.cpp
index 5daa29adf4..95af9c2a50 100644
--- a/indra/llcommon/tests/llinstancetracker_test.cpp
+++ b/indra/llcommon/tests/llinstancetracker_test.cpp
@@ -94,7 +94,7 @@ namespace tut
             ensure("couldn't find stack Keyed", bool(found));
             ensure_equals("found wrong Keyed instance", found.get(), &one);
             {
-                boost::scoped_ptr<Keyed> two(new Keyed("two"));
+                std::unique_ptr<Keyed> two(new Keyed("two"));
                 ensure_equals(Keyed::instanceCount(), 2);
                 auto found = Keyed::getInstance("two");
                 ensure("couldn't find heap Keyed", bool(found));
@@ -118,7 +118,7 @@ namespace tut
             std::weak_ptr<Unkeyed> found = one.getWeak();
             ensure(! found.expired());
             {
-                boost::scoped_ptr<Unkeyed> two(new Unkeyed);
+                std::unique_ptr<Unkeyed> two(new Unkeyed);
                 ensure_equals(Unkeyed::instanceCount(), 2);
             }
             ensure_equals(Unkeyed::instanceCount(), 1);
diff --git a/indra/llcommon/tests/wrapllerrs.h b/indra/llcommon/tests/wrapllerrs.h
index d657b329bb..6978c296b3 100644
--- a/indra/llcommon/tests/wrapllerrs.h
+++ b/indra/llcommon/tests/wrapllerrs.h
@@ -218,12 +218,12 @@ public:
     /// for the sought string.
     std::string messageWith(const std::string& search, bool required=true)
     {
-        return boost::dynamic_pointer_cast<CaptureLogRecorder>(mRecorder)->messageWith(search, required);
+        return std::dynamic_pointer_cast<CaptureLogRecorder>(mRecorder)->messageWith(search, required);
     }
 
     std::ostream& streamto(std::ostream& out) const
     {
-        return boost::dynamic_pointer_cast<CaptureLogRecorder>(mRecorder)->streamto(out);
+        return std::dynamic_pointer_cast<CaptureLogRecorder>(mRecorder)->streamto(out);
     }
 
     friend inline std::ostream& operator<<(std::ostream& out, const CaptureLog& self)
diff --git a/indra/llcorehttp/_httplibcurl.h b/indra/llcorehttp/_httplibcurl.h
index a71eae59c0..61ecc492af 100644
--- a/indra/llcorehttp/_httplibcurl.h
+++ b/indra/llcorehttp/_httplibcurl.h
@@ -65,7 +65,7 @@ private:
 	void operator=(const HttpLibcurl &);		// Not defined
 
 public:
-    typedef boost::shared_ptr<HttpOpRequest> opReqPtr_t;
+    typedef std::shared_ptr<HttpOpRequest> opReqPtr_t;
 
 	/// Give cycles to libcurl to run active requests.  Completed
 	/// operations (successful or failed) will be retried or handed
diff --git a/indra/llcorehttp/_httpoperation.cpp b/indra/llcorehttp/_httpoperation.cpp
index 3b64018132..c3a9bcaf54 100644
--- a/indra/llcorehttp/_httpoperation.cpp
+++ b/indra/llcorehttp/_httpoperation.cpp
@@ -58,7 +58,7 @@ HttpOperation::handleMap_t  HttpOperation::mHandleMap;
 LLCoreInt::HttpMutex	    HttpOperation::mOpMutex;
 
 HttpOperation::HttpOperation():
-    boost::enable_shared_from_this<HttpOperation>(),
+    std::enable_shared_from_this<HttpOperation>(),
     mReplyQueue(),
     mUserHandler(),
     mReqPolicy(HttpRequest::DEFAULT_POLICY_ID),
diff --git a/indra/llcorehttp/_httpoperation.h b/indra/llcorehttp/_httpoperation.h
index 8c1364bab4..b07ef76d49 100644
--- a/indra/llcorehttp/_httpoperation.h
+++ b/indra/llcorehttp/_httpoperation.h
@@ -69,12 +69,12 @@ class HttpService;
 /// and those interfaces establish the access rules.
 
 class HttpOperation : private boost::noncopyable,
-    public boost::enable_shared_from_this<HttpOperation>
+    public std::enable_shared_from_this<HttpOperation>
 {
 public:
-    typedef boost::shared_ptr<HttpOperation> ptr_t;
-    typedef boost::weak_ptr<HttpOperation> wptr_t;
-    typedef boost::shared_ptr<HttpReplyQueue> HttpReplyQueuePtr_t;
+    typedef std::shared_ptr<HttpOperation> ptr_t;
+    typedef std::weak_ptr<HttpOperation> wptr_t;
+    typedef std::shared_ptr<HttpReplyQueue> HttpReplyQueuePtr_t;
 
 	/// Threading:  called by consumer thread.
 	HttpOperation();
@@ -157,12 +157,12 @@ public:
     HttpHandle getHandle();
 
     template< class OPT >
-    static boost::shared_ptr< OPT > fromHandle(HttpHandle handle)
+    static std::shared_ptr< OPT > fromHandle(HttpHandle handle)
     {
         ptr_t ptr = findByHandle(handle);
         if (!ptr)
-            return boost::shared_ptr< OPT >();
-        return boost::dynamic_pointer_cast< OPT >(ptr);
+            return std::shared_ptr< OPT >();
+        return std::dynamic_pointer_cast< OPT >(ptr);
     }
 	
 protected:
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index d60eb6c95f..3247146212 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -201,7 +201,7 @@ HttpOpRequest::~HttpOpRequest()
 void HttpOpRequest::stageFromRequest(HttpService * service)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
-    HttpOpRequest::ptr_t self(boost::dynamic_pointer_cast<HttpOpRequest>(shared_from_this()));
+    HttpOpRequest::ptr_t self(std::dynamic_pointer_cast<HttpOpRequest>(shared_from_this()));
     service->getPolicy().addOp(self);			// transfers refcount
 }
 
@@ -209,7 +209,7 @@ void HttpOpRequest::stageFromRequest(HttpService * service)
 void HttpOpRequest::stageFromReady(HttpService * service)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
-    HttpOpRequest::ptr_t self(boost::dynamic_pointer_cast<HttpOpRequest>(shared_from_this()));
+    HttpOpRequest::ptr_t self(std::dynamic_pointer_cast<HttpOpRequest>(shared_from_this()));
     service->getTransport().addOp(self);		// transfers refcount
 }
 
@@ -290,7 +290,7 @@ void HttpOpRequest::visitNotifier(HttpRequest * request)
 // HttpOpRequest::ptr_t HttpOpRequest::fromHandle(HttpHandle handle)
 // {
 // 
-//     return boost::dynamic_pointer_cast<HttpOpRequest>((static_cast<HttpOpRequest *>(handle))->shared_from_this());
+//     return std::dynamic_pointer_cast<HttpOpRequest>((static_cast<HttpOpRequest *>(handle))->shared_from_this());
 // }
 
 
diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h
index ec84822cf4..626064329d 100644
--- a/indra/llcorehttp/_httpoprequest.h
+++ b/indra/llcorehttp/_httpoprequest.h
@@ -66,7 +66,7 @@ class BufferArray;
 class HttpOpRequest : public HttpOperation
 {
 public:
-    typedef boost::shared_ptr<HttpOpRequest> ptr_t;
+    typedef std::shared_ptr<HttpOpRequest> ptr_t;
 
 	HttpOpRequest();
 
diff --git a/indra/llcorehttp/_httpopsetget.h b/indra/llcorehttp/_httpopsetget.h
index eabd41e79f..04ab2446ef 100644
--- a/indra/llcorehttp/_httpopsetget.h
+++ b/indra/llcorehttp/_httpopsetget.h
@@ -53,7 +53,7 @@ namespace LLCore
 class HttpOpSetGet : public HttpOperation
 {
 public:
-    typedef boost::shared_ptr<HttpOpSetGet> ptr_t;
+    typedef std::shared_ptr<HttpOpSetGet> ptr_t;
 
 	HttpOpSetGet();
 
diff --git a/indra/llcorehttp/_httppolicy.h b/indra/llcorehttp/_httppolicy.h
index 0b8806a3e2..955f757c93 100644
--- a/indra/llcorehttp/_httppolicy.h
+++ b/indra/llcorehttp/_httppolicy.h
@@ -60,7 +60,7 @@ private:
 	void operator=(const HttpPolicy &);			// Not defined
 
 public:
-    typedef boost::shared_ptr<HttpOpRequest> opReqPtr_t;
+    typedef std::shared_ptr<HttpOpRequest> opReqPtr_t;
 
 	/// Threading:  called by init thread.
 	HttpRequest::policy_t createPolicyClass();
diff --git a/indra/llcorehttp/_httpreplyqueue.h b/indra/llcorehttp/_httpreplyqueue.h
index 33e205c1c9..2de26249ef 100644
--- a/indra/llcorehttp/_httpreplyqueue.h
+++ b/indra/llcorehttp/_httpreplyqueue.h
@@ -63,8 +63,8 @@ class HttpReplyQueue : private boost::noncopyable
 {
 
 public:
-    typedef boost::shared_ptr<HttpOperation>    opPtr_t;
-    typedef boost::shared_ptr<HttpReplyQueue>   ptr_t;
+    typedef std::shared_ptr<HttpOperation>    opPtr_t;
+    typedef std::shared_ptr<HttpReplyQueue>   ptr_t;
 
 	HttpReplyQueue();
     virtual ~HttpReplyQueue();		
diff --git a/indra/llcorehttp/_httprequestqueue.h b/indra/llcorehttp/_httprequestqueue.h
index f0296f30e3..52369df174 100644
--- a/indra/llcorehttp/_httprequestqueue.h
+++ b/indra/llcorehttp/_httprequestqueue.h
@@ -61,7 +61,7 @@ private:
 	void operator=(const HttpRequestQueue &);			// Not defined
 
 public:
-    typedef boost::shared_ptr<HttpOperation> opPtr_t;
+    typedef std::shared_ptr<HttpOperation> opPtr_t;
 
 	static void init();
 	static void term();
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index 18505e0aad..7fe5c48edf 100644
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -301,24 +301,24 @@ struct HttpStatus
 	
 	HttpStatus()
 	{
-		mDetails = boost::shared_ptr<Details>(new Details(LLCORE, HE_SUCCESS));
+		mDetails = std::shared_ptr<Details>(new Details(LLCORE, HE_SUCCESS));
     }
 
 	HttpStatus(type_enum_t type, short status)
 	{
-        mDetails = boost::shared_ptr<Details>(new Details(type, status));
+        mDetails = std::shared_ptr<Details>(new Details(type, status));
 	}
 	
 	HttpStatus(int http_status)
 	{
-        mDetails = boost::shared_ptr<Details>(new Details(http_status, 
+        mDetails = std::shared_ptr<Details>(new Details(http_status, 
 			(http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR));
 		llassert(http_status >= 100 && http_status <= 999);
 	}
 
 	HttpStatus(int http_status, const std::string &message)
 	{
-        mDetails = boost::shared_ptr<Details>(new Details(http_status,
+        mDetails = std::shared_ptr<Details>(new Details(http_status,
 			(http_status >= 200 && http_status <= 299) ? HE_SUCCESS : HE_REPLY_ERROR));
 		llassert(http_status >= 100 && http_status <= 999);
 		mDetails->mMessage = message;
@@ -341,7 +341,7 @@ struct HttpStatus
 
     HttpStatus & clone(const HttpStatus &rhs)
     {
-        mDetails = boost::shared_ptr<Details>(new Details(*rhs.mDetails));
+        mDetails = std::shared_ptr<Details>(new Details(*rhs.mDetails));
         return *this;
     }
 	
@@ -490,14 +490,14 @@ private:
 		LLSD		mErrorData;
 	};
 
-    boost::shared_ptr<Details> mDetails;
+    std::shared_ptr<Details> mDetails;
 
 }; // end struct HttpStatus
 
 ///  A namespace for several free methods and low level utilities. 
 namespace LLHttp
 {
-    typedef boost::shared_ptr<CURL> CURL_ptr;
+    typedef std::shared_ptr<CURL> CURL_ptr;
 
     void initialize();
     void cleanup();
diff --git a/indra/llcorehttp/httphandler.h b/indra/llcorehttp/httphandler.h
index 65e043f5d3..4cfb2598c7 100644
--- a/indra/llcorehttp/httphandler.h
+++ b/indra/llcorehttp/httphandler.h
@@ -58,8 +58,8 @@ class HttpResponse;
 class HttpHandler 
 {
 public:
-    typedef boost::shared_ptr<HttpHandler>  ptr_t;
-    typedef boost::weak_ptr<HttpHandler>    wptr_t;
+    typedef std::shared_ptr<HttpHandler>  ptr_t;
+    typedef std::weak_ptr<HttpHandler>    wptr_t;
 
 	virtual ~HttpHandler()
 	{ }
diff --git a/indra/llcorehttp/httpheaders.h b/indra/llcorehttp/httpheaders.h
index b9168cb6ec..e7cf4037bf 100644
--- a/indra/llcorehttp/httpheaders.h
+++ b/indra/llcorehttp/httpheaders.h
@@ -85,7 +85,7 @@ public:
 	typedef container_t::const_reverse_iterator const_reverse_iterator;
 	typedef container_t::value_type value_type;
 	typedef container_t::size_type size_type;
-    typedef boost::shared_ptr<HttpHeaders> ptr_t;
+    typedef std::shared_ptr<HttpHeaders> ptr_t;
 
 public:
 	/// @post In addition to the instance, caller has a refcount
diff --git a/indra/llcorehttp/httpoptions.h b/indra/llcorehttp/httpoptions.h
index 41f71896b0..fa993c857b 100644
--- a/indra/llcorehttp/httpoptions.h
+++ b/indra/llcorehttp/httpoptions.h
@@ -60,7 +60,7 @@ class HttpOptions : private boost::noncopyable
 public:
 	HttpOptions();
 
-	typedef boost::shared_ptr<HttpOptions> ptr_t;
+	typedef std::shared_ptr<HttpOptions> ptr_t;
 
     virtual ~HttpOptions();						// Use release()
 
diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h
index ca4b9e92bc..857a034a7b 100644
--- a/indra/llcorehttp/httprequest.h
+++ b/indra/llcorehttp/httprequest.h
@@ -96,8 +96,8 @@ private:
 public:
 	typedef unsigned int policy_t;
 	
-	typedef boost::shared_ptr<HttpRequest> ptr_t;
-    typedef boost::weak_ptr<HttpRequest>   wptr_t;
+	typedef std::shared_ptr<HttpRequest> ptr_t;
+    typedef std::weak_ptr<HttpRequest>   wptr_t;
 public:
 	/// @name PolicyMethods
 	/// @{
@@ -627,7 +627,7 @@ public:
 protected:
 
 private:
-    typedef boost::shared_ptr<HttpReplyQueue> HttpReplyQueuePtr_t;
+    typedef std::shared_ptr<HttpReplyQueue> HttpReplyQueuePtr_t;
 
 	/// @name InstanceData
 	///
diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h
index b834085e5c..ef98fbef2b 100644
--- a/indra/llcorehttp/httpresponse.h
+++ b/indra/llcorehttp/httpresponse.h
@@ -72,7 +72,7 @@ public:
 	/// Statistics for the HTTP 
 	struct TransferStats
 	{
-		typedef boost::shared_ptr<TransferStats> ptr_t;
+		typedef std::shared_ptr<TransferStats> ptr_t;
 
 		TransferStats() : mSizeDownload(0.0), mTotalTime(0.0), mSpeedDownload(0.0) {}
 		F64 mSizeDownload;
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 8dba1641a6..68598589b8 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -48,7 +48,7 @@ std::string LLImageJ2C::getEngineInfo()
 {
 	// All known LLImageJ2CImpl implementation subclasses are cheap to
 	// construct.
-	boost::scoped_ptr<LLImageJ2CImpl> impl(fallbackCreateLLImageJ2CImpl());
+	std::unique_ptr<LLImageJ2CImpl> impl(fallbackCreateLLImageJ2CImpl());
 	return impl->getEngineInfo();
 }
 
diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h
index e196f7479e..b30df6f776 100644
--- a/indra/llimage/llimagej2c.h
+++ b/indra/llimage/llimagej2c.h
@@ -95,7 +95,7 @@ protected:
 	S8  mRawDiscardLevel;
 	F32 mRate;
 	bool mReversible;
-	boost::scoped_ptr<LLImageJ2CImpl> mImpl;
+	std::unique_ptr<LLImageJ2CImpl> mImpl;
 	std::string mLastError;
 
     // Image compression/decompression tester
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index b57e4cc40e..fe3902380c 100644
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -113,10 +113,10 @@ private:
 	};
 
 	// Encode variable
-	boost::scoped_ptr<LLKDUMemSource> mInputp;
+	std::unique_ptr<LLKDUMemSource> mInputp;
 	CodeStreamHolder mCodeStreamp;
-	boost::scoped_ptr<kdu_core::kdu_coords> mTPosp; // tile position
-	boost::scoped_ptr<kdu_core::kdu_dims> mTileIndicesp;
+	std::unique_ptr<kdu_core::kdu_coords> mTPosp; // tile position
+	std::unique_ptr<kdu_core::kdu_dims> mTileIndicesp;
 	int mBlocksSize;
 	int mPrecinctsSize;
 	int mLevels;
@@ -125,7 +125,7 @@ private:
 	// We don't own this LLImageRaw. We're simply pointing to an instance
 	// passed into initDecode().
 	LLImageRaw *mRawImagep;
-	boost::scoped_ptr<LLKDUDecodeState> mDecodeState;
+	std::unique_ptr<LLKDUDecodeState> mDecodeState;
 };
 
 #endif
diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index ebbaea9b12..c0a5e361b1 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -95,7 +95,7 @@ public:
 private:
     struct QueuedCoproc
     {
-        typedef boost::shared_ptr<QueuedCoproc> ptr_t;
+        typedef std::shared_ptr<QueuedCoproc> ptr_t;
 
         QueuedCoproc(const std::string &name, const LLUUID &id, CoProcedure_t proc) :
             mName(name),
@@ -115,7 +115,7 @@ private:
     // Use shared_ptr to control the lifespan of our CoprocQueue_t instance
     // because the consuming coroutine might outlive this LLCoprocedurePool
     // instance.
-    typedef boost::shared_ptr<CoprocQueue_t> CoprocQueuePtr;
+    typedef std::shared_ptr<CoprocQueue_t> CoprocQueuePtr;
 
     std::string     mPoolName;
     size_t          mPoolSize, mActiveCoprocsCount, mPending;
@@ -301,7 +301,7 @@ LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size):
     mPoolSize(size),
     mActiveCoprocsCount(0),
     mPending(0),
-    mPendingCoprocs(boost::make_shared<CoprocQueue_t>(LLCoprocedureManager::DEFAULT_QUEUE_SIZE)),
+    mPendingCoprocs(std::make_shared<CoprocQueue_t>(LLCoprocedureManager::DEFAULT_QUEUE_SIZE)),
     mHTTPPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID),
     mCoroMapping()
 {
@@ -384,7 +384,7 @@ LLUUID LLCoprocedurePool::enqueueCoprocedure(const std::string &name, LLCoproced
         LL_INFOS("CoProcMgr") << "Coprocedure(" << name << ") enqueuing with id=" << id.asString() << " in pool \"" << mPoolName << "\" at "
                               << mPending << LL_ENDL;
     }
-    auto pushed = mPendingCoprocs->try_push(boost::make_shared<QueuedCoproc>(name, id, proc));
+    auto pushed = mPendingCoprocs->try_push(std::make_shared<QueuedCoproc>(name, id, proc));
     if (pushed == boost::fibers::channel_op_status::success)
     {
         ++mPending;
diff --git a/indra/llmessage/llcorehttputil.h b/indra/llmessage/llcorehttputil.h
index 6d0d68cf24..fc561c6b0f 100644
--- a/indra/llmessage/llcorehttputil.h
+++ b/indra/llmessage/llcorehttputil.h
@@ -263,8 +263,8 @@ class HttpCoroHandler : public LLCore::HttpHandler
 {
 public:
 
-    typedef boost::shared_ptr<HttpCoroHandler>  ptr_t;
-    typedef boost::weak_ptr<HttpCoroHandler>    wptr_t;
+    typedef std::shared_ptr<HttpCoroHandler>  ptr_t;
+    typedef std::weak_ptr<HttpCoroHandler>    wptr_t;
 
     HttpCoroHandler(LLEventStream &reply);
 
@@ -317,8 +317,8 @@ public:
     static const std::string HTTP_RESULTS_CONTENT;
     static const std::string HTTP_RESULTS_RAW;
 
-    typedef boost::shared_ptr<HttpCoroutineAdapter> ptr_t;
-    typedef boost::weak_ptr<HttpCoroutineAdapter>   wptr_t;
+    typedef std::shared_ptr<HttpCoroutineAdapter> ptr_t;
+    typedef std::weak_ptr<HttpCoroutineAdapter>   wptr_t;
 
     HttpCoroutineAdapter(const std::string &name, LLCore::HttpRequest::policy_t policyId);
     ~HttpCoroutineAdapter();
diff --git a/indra/llmessage/llexperiencecache.h b/indra/llmessage/llexperiencecache.h
index 1c97133723..f0dc4624ef 100644
--- a/indra/llmessage/llexperiencecache.h
+++ b/indra/llmessage/llexperiencecache.h
@@ -112,7 +112,7 @@ private:
 
     // Callback types for get() 
     typedef boost::signals2::signal < void(const LLSD &) > callback_signal_t;
-	typedef boost::shared_ptr<callback_signal_t> signal_ptr;
+	typedef std::shared_ptr<callback_signal_t> signal_ptr;
 	// May have multiple callbacks for a single ID, which are
 	// represented as multiple slots bound to the signal.
 	// Avoid copying signals via pointers.
diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp
index c707c7ad09..e302dd2b5e 100644
--- a/indra/llmessage/lliohttpserver.cpp
+++ b/indra/llmessage/lliohttpserver.cpp
@@ -982,7 +982,7 @@ LLHTTPNode& LLIOHTTPServer::create(
     }
 
     LLHTTPResponseFactory* factory = new LLHTTPResponseFactory;
-	boost::shared_ptr<LLChainIOFactory> factory_ptr(factory);
+	std::shared_ptr<LLChainIOFactory> factory_ptr(factory);
 
     LLIOServerSocket* server = new LLIOServerSocket(pool, socket, factory_ptr);
 
diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h
index 7fd4cee8ba..e6ac8ebfc2 100644
--- a/indra/llmessage/lliopipe.h
+++ b/indra/llmessage/lliopipe.h
@@ -89,7 +89,7 @@ public:
 	/** 
 	 * @brief Scattered memory container.
 	 */
-	typedef boost::shared_ptr<LLBufferArray> buffer_ptr_t;
+	typedef std::shared_ptr<LLBufferArray> buffer_ptr_t;
 
 	/** 
 	 * @brief Enumeration for IO return codes
diff --git a/indra/llmessage/lliosocket.h b/indra/llmessage/lliosocket.h
index 303d80eb14..a62b3c0204 100644
--- a/indra/llmessage/lliosocket.h
+++ b/indra/llmessage/lliosocket.h
@@ -65,7 +65,7 @@ public:
 	/** 
 	 * @brief Reference counted shared pointers to sockets.
 	 */
-	typedef boost::shared_ptr<LLSocket> ptr_t;
+	typedef std::shared_ptr<LLSocket> ptr_t;
 
 	/** 
 	 * @brief Type of socket to create.
@@ -305,7 +305,7 @@ class LLIOServerSocket : public LLIOPipe
 {
 public:
 	typedef LLSocket::ptr_t socket_t;
-	typedef boost::shared_ptr<LLChainIOFactory> factory_t;
+	typedef std::shared_ptr<LLChainIOFactory> factory_t;
 	LLIOServerSocket(apr_pool_t* pool, socket_t listener, factory_t reactor);
 	virtual ~LLIOServerSocket();
 
diff --git a/indra/llmessage/llservice.h b/indra/llmessage/llservice.h
index 9c09aeb44c..f215acab56 100644
--- a/indra/llmessage/llservice.h
+++ b/indra/llmessage/llservice.h
@@ -116,7 +116,7 @@ class LLService : public LLIOPipe
 public:
 	//typedef boost::intrusive_ptr<LLServiceCreator> creator_t;
 	//typedef boost::intrusive_ptr<LLService> service_t;
-	typedef boost::shared_ptr<LLChainIOFactory> creator_t;
+	typedef std::shared_ptr<LLChainIOFactory> creator_t;
 
 	/** 
 	 * @brief This method is used to register a protocol name with a
diff --git a/indra/llmessage/llstoredmessage.h b/indra/llmessage/llstoredmessage.h
index 9c98e2c558..6ea150fda3 100644
--- a/indra/llmessage/llstoredmessage.h
+++ b/indra/llmessage/llstoredmessage.h
@@ -46,7 +46,7 @@ private:
 	std::string mName;
 };
 
-typedef boost::shared_ptr<LLStoredMessage> LLStoredMessagePtr;
+typedef std::shared_ptr<LLStoredMessage> LLStoredMessagePtr;
 
 
 #endif // LL_STOREDMESSAGE_H
diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp
index b7fdf4f437..1c571a74da 100644
--- a/indra/llmessage/tests/llcurl_stub.cpp
+++ b/indra/llmessage/tests/llcurl_stub.cpp
@@ -49,7 +49,7 @@ void LLCurl::Responder::httpCompleted()
 }
 
 void LLCurl::Responder::completedRaw(LLChannelDescriptors const&,
-									 boost::shared_ptr<LLBufferArray> const&)
+									 std::shared_ptr<LLBufferArray> const&)
 {
 }
 
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index ba76ae4e37..d56712257b 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -335,7 +335,7 @@ public:
 	// "init_history" message 
 	void initializeUrlHistory(const LLSD& url_history);
 
-	boost::shared_ptr<LLPluginClassMedia> getSharedPtr() { return boost::dynamic_pointer_cast<LLPluginClassMedia>(shared_from_this()); } // due to enable_shared_from_this
+	std::shared_ptr<LLPluginClassMedia> getSharedPtr() { return std::dynamic_pointer_cast<LLPluginClassMedia>(shared_from_this()); } // due to enable_shared_from_this
 
 protected:
 
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 1893c9e657..01627925d7 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -43,7 +43,7 @@
 #include "llsd.h"
 #include "llevents.h"
 
-class LLPluginProcessParentOwner : public boost::enable_shared_from_this < LLPluginProcessParentOwner > 
+class LLPluginProcessParentOwner : public std::enable_shared_from_this < LLPluginProcessParentOwner > 
 {
 public:
 	virtual ~LLPluginProcessParentOwner();
@@ -60,7 +60,7 @@ class LLPluginProcessParent : public LLPluginMessagePipeOwner
 
     LLPluginProcessParent(LLPluginProcessParentOwner *owner);
 public:
-    typedef boost::shared_ptr<LLPluginProcessParent> ptr_t;
+    typedef std::shared_ptr<LLPluginProcessParent> ptr_t;
 
 	~LLPluginProcessParent();
 		
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
index b072ce3964..c3e17d1267 100644
--- a/indra/llprimitive/tests/llmediaentry_test.cpp
+++ b/indra/llprimitive/tests/llmediaentry_test.cpp
@@ -211,7 +211,7 @@ namespace tut
 
     void whitelist_test(int num, bool enable, const char *whitelist, const char *candidate_url, bool expected_pass)
     {
-        std::string message = "Whitelist test " + boost::lexical_cast<std::string>(num);
+        std::string message = "Whitelist test " + std::to_string(num);
         LLMediaEntry entry;
         entry.setWhiteListEnable(enable);
         set_whitelist(entry, whitelist);
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 921398a693..4d010ae9d9 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -990,7 +990,7 @@ private:
 
 	bool mIgnoreAllNotifications;
 
-	boost::scoped_ptr<LLNotificationsListener> mListener;
+	std::unique_ptr<LLNotificationsListener> mListener;
 
 	std::vector<LLNotificationChannelPtr> mDefaultChannels;
 };
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index fd3a9b1d7b..43b4457bf5 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -61,7 +61,7 @@ class LLTeleportRequest;
 
 
 
-typedef boost::shared_ptr<LLTeleportRequest> LLTeleportRequestPtr;
+typedef std::shared_ptr<LLTeleportRequest> LLTeleportRequestPtr;
 
 //--------------------------------------------------------------------
 // Types
@@ -131,7 +131,7 @@ public:
 private:
 	bool			mInitialized;
 	bool			mFirstLogin;
-	boost::shared_ptr<LLAgentListener> mListener;
+	std::shared_ptr<LLAgentListener> mListener;
 
 	//--------------------------------------------------------------------
 	// Session
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4c3a9229d2..ebf08eacd9 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -3742,7 +3742,7 @@ LLSD LLAppearanceMgr::dumpCOF() const
 			LLUUID linked_asset_id(linked_item->getAssetUUID());
 			md5.update((unsigned char*)linked_asset_id.mData, 16);
 			U32 flags = linked_item->getFlags();
-			md5.update(boost::lexical_cast<std::string>(flags));
+			md5.update(std::to_string(flags));
 		}
 		else if (LLAssetType::AT_LINK_FOLDER != inv_item->getActualType())
 		{
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 58a797218f..5705cbb3f5 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -552,7 +552,7 @@ protected:
 		LLNotificationChiclet* const mChiclet;
 	};
 				
-	boost::scoped_ptr<ChicletNotificationChannel> mNotificationChannel;
+	std::unique_ptr<ChicletNotificationChannel> mNotificationChannel;
 				
 	LLNotificationChiclet(const Params& p);
 				
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index eb2c156ca5..b11786a451 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -73,7 +73,7 @@ namespace
     class ObjectInventoryFetcher: public LLVOInventoryListener
     {
     public:
-        typedef boost::shared_ptr<ObjectInventoryFetcher> ptr_t;
+        typedef std::shared_ptr<ObjectInventoryFetcher> ptr_t;
 
         ObjectInventoryFetcher(LLEventPump &pump, LLViewerObject* object, void* user_data) :
             mPump(pump),
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index a696c99a82..e7ead90840 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -434,7 +434,7 @@ bool LLConversationLog::moveLog(const std::string &originDirectory, const std::s
 			while(LLFile::isfile(backupFileName))
 			{
 				++backupFileCount;
-				backupFileName = targetDirectory + ".backup" + boost::lexical_cast<std::string>(backupFileCount);
+				backupFileName = targetDirectory + ".backup" + std::to_string(backupFileCount);
 			}
 
 			//Rename the file to its backup name so it is not overwritten
diff --git a/indra/newview/llfloatereditsky.cpp b/indra/newview/llfloatereditsky.cpp
index 2d5e86869d..fa51143f3a 100644
--- a/indra/newview/llfloatereditsky.cpp
+++ b/indra/newview/llfloatereditsky.cpp
@@ -84,7 +84,7 @@ BOOL LLFloaterEditSky::postBuild()
 	mSkyPresetCombo = getChild<LLComboBox>("sky_preset_combo");
 	mMakeDefaultCheckBox = getChild<LLCheckBoxCtrl>("make_default_cb");
 	mSaveButton = getChild<LLButton>("save");
-    mSkyAdapter = boost::make_shared<LLSkySettingsAdapter>();
+    mSkyAdapter = std::make_shared<LLSkySettingsAdapter>();
 
     LLEnvironment::instance().setSkyListChange(boost::bind(&LLFloaterEditSky::onSkyPresetListChange, this));
 
diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp
index c44ae7faca..4a6268435b 100644
--- a/indra/newview/llfloatereditwater.cpp
+++ b/indra/newview/llfloatereditwater.cpp
@@ -71,7 +71,7 @@ BOOL LLFloaterEditWater::postBuild()
 	mMakeDefaultCheckBox = getChild<LLCheckBoxCtrl>("make_default_cb");
 	mSaveButton = getChild<LLButton>("save");
 
-    mWaterAdapter = boost::make_shared<LLWatterSettingsAdapter>();
+    mWaterAdapter = std::make_shared<LLWatterSettingsAdapter>();
 
     LLEnvironment::instance().setWaterListChange(boost::bind(&LLFloaterEditWater::onWaterPresetListChange, this));
 
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index 4cd91c53d8..ef4b71b3af 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -453,7 +453,7 @@ void LLFloaterIMNearbyChatScreenChannel::arrangeToasts()
 //-----------------------------------------------------------------------------------------------
 //LLFloaterIMNearbyChatHandler
 //-----------------------------------------------------------------------------------------------
-boost::scoped_ptr<LLEventPump> LLFloaterIMNearbyChatHandler::sChatWatcher(new LLEventStream("LLChat"));
+std::unique_ptr<LLEventPump> LLFloaterIMNearbyChatHandler::sChatWatcher(new LLEventStream("LLChat"));
 
 LLFloaterIMNearbyChatHandler::LLFloaterIMNearbyChatHandler()
 {
diff --git a/indra/newview/llfloaterimnearbychathandler.h b/indra/newview/llfloaterimnearbychathandler.h
index 5e6f8cde30..1849604470 100644
--- a/indra/newview/llfloaterimnearbychathandler.h
+++ b/indra/newview/llfloaterimnearbychathandler.h
@@ -46,7 +46,7 @@ public:
 protected:
 	virtual void initChannel();
 
-	static boost::scoped_ptr<LLEventPump> sChatWatcher;
+	static std::unique_ptr<LLEventPump> sChatWatcher;
 };
 
 }
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 67a205417e..b0183f072e 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -158,7 +158,7 @@ public:
 
 	// typedef std::map<std::string,std::pair<std::list<std::string>,std::list<std::string> > > DiffMap; // this version copies the lists etc., and thus is bad memory-wise
 	typedef std::list<std::string> StringList;
-	typedef boost::shared_ptr<StringList> StringListPtr;
+	typedef std::shared_ptr<StringList> StringListPtr;
 	typedef std::map<std::string, std::pair<StringListPtr,StringListPtr> > DiffMap;
 	DiffMap mDiffsMap;							// map, of filename to pair of list of changed element paths and list of errors
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 932a0316dd..eee60de033 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3027,7 +3027,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 	return accept;
 }
 
-void warn_move_inventory(LLViewerObject* object, boost::shared_ptr<LLMoveInv> move_inv)
+void warn_move_inventory(LLViewerObject* object, std::shared_ptr<LLMoveInv> move_inv)
 {
 	const char* dialog = NULL;
 	if (object->flagScripted())
@@ -3040,7 +3040,7 @@ void warn_move_inventory(LLViewerObject* object, boost::shared_ptr<LLMoveInv> mo
 	}
 
     static LLNotificationPtr notification_ptr;
-    static boost::shared_ptr<LLMoveInv> inv_ptr;
+    static std::shared_ptr<LLMoveInv> inv_ptr;
 
     // Notification blocks user from interacting with inventories so everything that comes after first message
     // is part of this message - don'r show it again
@@ -3153,7 +3153,7 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
 	if(drop && accept)
 	{
 		it = inventory_objects.begin();
-        boost::shared_ptr<LLMoveInv> move_inv(new LLMoveInv);
+        std::shared_ptr<LLMoveInv> move_inv(new LLMoveInv);
 		move_inv->mObjectID = object_id;
 		move_inv->mCategoryID = category_id;
 		move_inv->mCallback = callback;
@@ -5012,7 +5012,7 @@ LLFontGL::StyleFlags LLMarketplaceFolderBridge::getLabelStyle() const
 
 
 // helper stuff
-bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr<LLMoveInv> move_inv)
+bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, std::shared_ptr<LLMoveInv> move_inv)
 {
 	LLFloaterOpenObject::LLCatAndWear* cat_and_wear = (LLFloaterOpenObject::LLCatAndWear* )move_inv->mUserData;
 	LLViewerObject* object = gObjectList.findObject(move_inv->mObjectID);
@@ -5486,7 +5486,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 		if (accept && drop)
 		{
             LLUUID item_id = inv_item->getUUID();
-            boost::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
+            std::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
 			move_inv->mObjectID = inv_item->getParentUUID();
 			two_uuids_t item_pair(mUUID, item_id);
 			move_inv->mMoveList.push_back(item_pair);
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 3cbbd68e51..6f06f3b36d 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -794,7 +794,7 @@ struct LLMoveInv
     void* mUserData;
 };
 
-void warn_move_inventory(LLViewerObject* object, boost::shared_ptr<LLMoveInv> move_inv);
-bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, boost::shared_ptr<LLMoveInv>);
+void warn_move_inventory(LLViewerObject* object, std::shared_ptr<LLMoveInv> move_inv);
+bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, std::shared_ptr<LLMoveInv>);
 
 #endif // LL_LLINVENTORYBRIDGE_H
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 68581d04eb..651790dd68 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -3323,7 +3323,7 @@ BOOL dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, BOOL drop,
 
         if (accept && drop)
         {
-            boost::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
+            std::shared_ptr<LLMoveInv> move_inv (new LLMoveInv());
             move_inv->mObjectID = inv_item->getParentUUID();
             std::pair<LLUUID, LLUUID> item_pair(folder_id, inv_item->getUUID());
             move_inv->mMoveList.push_back(item_pair);
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 052ac50185..ca88f90ea9 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -723,7 +723,7 @@ bool LLLogChat::moveTranscripts(const std::string originDirectory,
 			while(LLFile::isfile(backupFileName))
 			{
 				++backupFileCount;
-				backupFileName = newFullPath + ".backup" + boost::lexical_cast<std::string>(backupFileCount);
+				backupFileName = newFullPath + ".backup" + std::to_string(backupFileCount);
 			}
 
 			//Rename the file to its backup name so it is not overwritten
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index 2e9aab7c00..74d6890d1d 100644
--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@@ -90,7 +90,7 @@ private:
 
 	void attemptComplete() { mAttemptComplete = true; } // In the future an event?
 
-	boost::scoped_ptr<LLLogin> mLoginModule;
+	std::unique_ptr<LLLogin> mLoginModule;
 	LLNotificationsInterface* mNotifications;
 
 	std::string mLoginState;
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp
index 3b59b2f05e..577ab0048f 100644
--- a/indra/newview/llmaterialmgr.cpp
+++ b/indra/newview/llmaterialmgr.cpp
@@ -68,7 +68,7 @@ class LLMaterialHttpHandler : public LLHttpSDHandler
 {
 public: 
 	typedef boost::function<void(bool, const LLSD&)> CallbackFunction;
-	typedef boost::shared_ptr<LLMaterialHttpHandler> ptr_t;
+	typedef std::shared_ptr<LLMaterialHttpHandler> ptr_t;
 
 	LLMaterialHttpHandler(const std::string& method, CallbackFunction cback);
 
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h
index 58f8bad3e4..8cd4793106 100644
--- a/indra/newview/llmediadataclient.h
+++ b/indra/newview/llmediadataclient.h
@@ -116,10 +116,10 @@ protected:
     
 	// Request (pure virtual base class for requests in the queue)
     class Request: 
-        public boost::enable_shared_from_this<Request>
+        public std::enable_shared_from_this<Request>
     {
     public:
-        typedef boost::shared_ptr<Request> ptr_t;
+        typedef std::shared_ptr<Request> ptr_t;
 
         // Subclasses must implement this to build a payload for their request type.
         virtual LLSD getPayload() const = 0;
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 01d6469010..1f909b98dc 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -411,7 +411,7 @@ namespace {
 static S32 dump_num = 0;
 std::string make_dump_name(std::string prefix, S32 num)
 {
-	return prefix + boost::lexical_cast<std::string>(num) + std::string(".xml");
+	return prefix + std::to_string(num) + std::string(".xml");
 }
 void dump_llsd_to_file(const LLSD& content, std::string filename);
 LLSD llsd_from_file(std::string filename);
@@ -572,10 +572,10 @@ S32 LLMeshRepoThread::sRequestWaterLevel = 0;
 //   LLMeshUploadThread
 
 class LLMeshHandlerBase : public LLCore::HttpHandler,
-    public boost::enable_shared_from_this<LLMeshHandlerBase>
+    public std::enable_shared_from_this<LLMeshHandlerBase>
 {
 public:
-    typedef boost::shared_ptr<LLMeshHandlerBase> ptr_t;
+    typedef std::shared_ptr<LLMeshHandlerBase> ptr_t;
 
 	LOG_CLASS(LLMeshHandlerBase);
 	LLMeshHandlerBase(U32 offset, U32 requested_bytes)
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index c6254f72cf..5c4f8e9135 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -112,7 +112,7 @@ private:
 	static void updateServerCombo();
 
 private:
-	boost::scoped_ptr<LLPanelLoginListener> mListener;
+	std::unique_ptr<LLPanelLoginListener> mListener;
 
 	void updateLoginButtons();
 	void populateUserList(LLPointer<LLCredential> credential);
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 17b8ec0683..664e240484 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -114,7 +114,7 @@ public:
 	void handleTerrainLinksetsResult(const LLSD &pContent);
 	void handleTerrainLinksetsError();
 
-    typedef boost::shared_ptr<LinksetsResponder> ptr_t;
+    typedef std::shared_ptr<LinksetsResponder> ptr_t;
 
 protected:
 
@@ -139,7 +139,7 @@ private:
 	LLPathfindingObjectPtr                          mTerrainLinksetPtr;
 };
 
-typedef boost::shared_ptr<LinksetsResponder> LinksetsResponderPtr;
+typedef std::shared_ptr<LinksetsResponder> LinksetsResponderPtr;
 
 //---------------------------------------------------------------------------
 // LLPathfindingManager
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index bb44f780c8..258d0fdef7 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -107,8 +107,8 @@ private:
     void navMeshStatusRequestCoro(std::string url, U64 regionHandle, bool isGetStatusOnly);
     void navAgentStateRequestCoro(std::string url);
     void navMeshRebakeCoro(std::string url, rebake_navmesh_callback_t rebakeNavMeshCallback);
-    void linksetObjectsCoro(std::string url, boost::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;
-    void linksetTerrainCoro(std::string url, boost::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;
+    void linksetObjectsCoro(std::string url, std::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;
+    void linksetTerrainCoro(std::string url, std::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;
     void charactersCoro(std::string url, request_id_t requestId, object_request_callback_t callback) const;
 
 	//void handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion, bool pIsGetStatusOnly);
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
index 87f32b8d56..ddc886f01c 100644
--- a/indra/newview/llpathfindingnavmesh.h
+++ b/indra/newview/llpathfindingnavmesh.h
@@ -39,7 +39,7 @@
 class LLPathfindingNavMesh;
 class LLUUID;
 
-typedef boost::shared_ptr<LLPathfindingNavMesh> LLPathfindingNavMeshPtr;
+typedef std::shared_ptr<LLPathfindingNavMesh> LLPathfindingNavMeshPtr;
 
 class LLPathfindingNavMesh
 {
diff --git a/indra/newview/llpathfindingnavmeshzone.h b/indra/newview/llpathfindingnavmeshzone.h
index baa1cc5979..b76f4421a6 100644
--- a/indra/newview/llpathfindingnavmeshzone.h
+++ b/indra/newview/llpathfindingnavmeshzone.h
@@ -114,7 +114,7 @@ private:
 		LLPathfindingNavMesh::navmesh_slot_t        mNavMeshSlot;
 	};
 
-	typedef boost::shared_ptr<NavMeshLocation> NavMeshLocationPtr;
+	typedef std::shared_ptr<NavMeshLocation> NavMeshLocationPtr;
 	typedef std::vector<NavMeshLocationPtr> NavMeshLocationPtrs;
 
 	void handleNavMeshLocation();
diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
index b8d3ca2364..0114cce3f1 100644
--- a/indra/newview/llpathfindingobject.h
+++ b/indra/newview/llpathfindingobject.h
@@ -41,7 +41,7 @@
 class LLPathfindingObject;
 class LLSD;
 
-typedef boost::shared_ptr<LLPathfindingObject> LLPathfindingObjectPtr;
+typedef std::shared_ptr<LLPathfindingObject> LLPathfindingObjectPtr;
 
 class LLPathfindingObject
 {
diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h
index 61580582d3..e2e0dce4da 100644
--- a/indra/newview/llpathfindingobjectlist.h
+++ b/indra/newview/llpathfindingobjectlist.h
@@ -36,7 +36,7 @@
 
 class LLPathfindingObjectList;
 
-typedef boost::shared_ptr<LLPathfindingObjectList> LLPathfindingObjectListPtr;
+typedef std::shared_ptr<LLPathfindingObjectList> LLPathfindingObjectListPtr;
 typedef std::map<std::string, LLPathfindingObjectPtr> LLPathfindingObjectMap;
 
 class LLPathfindingObjectList
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 975e2bb910..ea7d4800e0 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -653,7 +653,7 @@ void LLPreviewTexture::adjustAspectRatio()
 			{
 				// No existing ratio found, create an element that will show image at original ratio
 				populateRatioList(); // makes sure previous custom ratio is cleared
-				std::string ratio = boost::lexical_cast<std::string>(num)+":" + boost::lexical_cast<std::string>(denom);
+				std::string ratio = std::to_string(num)+":" + std::to_string(denom);
 				mRatiosList.push_back(ratio);
 				combo->add(ratio);
 				combo->setCurrentByIndex(mRatiosList.size()- 1);
diff --git a/indra/newview/llsculptidsize.cpp b/indra/newview/llsculptidsize.cpp
index 5d051d0ebf..bedee32213 100644
--- a/indra/newview/llsculptidsize.cpp
+++ b/indra/newview/llsculptidsize.cpp
@@ -66,7 +66,7 @@ void LLSculptIDSize::inc(const LLDrawable *pdrawable, int sz)
 	if (itLU.first == itLU.second)
 	{ //register
 		//llassert(mSizeInfo.get<tag_BY_DRAWABLE>().end() == mSizeInfo.get<tag_BY_DRAWABLE>().find(pdrawable));
-		mSizeInfo.get<tag_BY_DRAWABLE>().insert(Info(pdrawable, sz, boost::make_shared<SizeSum>(sz), sculptId));
+		mSizeInfo.get<tag_BY_DRAWABLE>().insert(Info(pdrawable, sz, std::make_shared<SizeSum>(sz), sculptId));
 		total_size = sz;
 	}
 	else
diff --git a/indra/newview/llsculptidsize.h b/indra/newview/llsculptidsize.h
index 87ee417b86..679fcbd44c 100644
--- a/indra/newview/llsculptidsize.h
+++ b/indra/newview/llsculptidsize.h
@@ -52,7 +52,7 @@ public:
 
 	struct Info
 	{
-		typedef boost::shared_ptr<SizeSum> PtrSizeSum;
+		typedef std::shared_ptr<SizeSum> PtrSizeSum;
 
 		Info(const LLDrawable *drawable, int size, PtrSizeSum sizeInfo, LLUUID sculptId)
 			: mDrawable(drawable)
diff --git a/indra/newview/llsearchableui.h b/indra/newview/llsearchableui.h
index 31f11eb8ef..84fcefb835 100644
--- a/indra/newview/llsearchableui.h
+++ b/indra/newview/llsearchableui.h
@@ -93,7 +93,7 @@ namespace ll
 	{
 		struct SearchableItem;
 
-		typedef boost::shared_ptr< SearchableItem > SearchableItemPtr;
+		typedef std::shared_ptr< SearchableItem > SearchableItemPtr;
 
 		typedef std::vector< SearchableItemPtr > tSearchableItemList;
 
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index f1f42afd81..5041c9f76f 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -431,7 +431,7 @@ private:
 	
 private:
 	// a single media url with some data and an impl.
-	boost::shared_ptr<LLPluginClassMedia> mMediaSource;
+	std::shared_ptr<LLPluginClassMedia> mMediaSource;
     LLMutex mLock;
 	F64		mZoomFactor;
 	LLUUID mTextureId;
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index ff2ee693fd..6b9df6df28 100644
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -145,7 +145,7 @@ public:
     virtual void notify(const std::vector<std::string>& filenames);
 
 private:
-    boost::shared_ptr<LLPluginClassMedia> mPlugin;
+    std::shared_ptr<LLPluginClassMedia> mPlugin;
 };
 
 
diff --git a/indra/newview/llviewerparcelaskplay.cpp b/indra/newview/llviewerparcelaskplay.cpp
index afbe2c94de..aea06834b2 100644
--- a/indra/newview/llviewerparcelaskplay.cpp
+++ b/indra/newview/llviewerparcelaskplay.cpp
@@ -287,7 +287,7 @@ void LLViewerParcelAskPlay::saveSettings()
             if ((iter_parcel->second.mDate.secondsSinceEpoch() + (F64SecondsImplicit)U32Days(30)) > LLTimer::getTotalSeconds())
             {
                 // write unexpired parcels
-                std::string parcel_id = boost::lexical_cast<std::string>(iter_parcel->first);
+                std::string parcel_id = std::to_string(iter_parcel->first);
                 write_llsd[key][parcel_id] = LLSD();
                 write_llsd[key][parcel_id]["mode"] = (LLSD::Integer)iter_parcel->second.mMode;
                 write_llsd[key][parcel_id]["date"] = iter_parcel->second.mDate;
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 3225299493..2bab50300b 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -592,7 +592,7 @@ std::string LLViewerShaderMgr::loadBasicShaders()
 
 	std::map<std::string, std::string> attribs;
 	attribs["MAX_JOINTS_PER_MESH_OBJECT"] = 
-		boost::lexical_cast<std::string>(LLSkinningUtil::getMaxJointCount());
+		std::to_string(LLSkinningUtil::getMaxJointCount());
 
     BOOL ssr = gSavedSettings.getBOOL("RenderScreenSpaceReflections");
 
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index ccef006a07..346073b8a1 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -538,8 +538,8 @@ private:
 	bool			mStatesDirty;
 	U32			mCurrResolutionIndex;
 
-	boost::scoped_ptr<LLWindowListener> mWindowListener;
-	boost::scoped_ptr<LLViewerWindowListener> mViewerWindowListener;
+	std::unique_ptr<LLWindowListener> mWindowListener;
+	std::unique_ptr<LLViewerWindowListener> mViewerWindowListener;
 
 	// Object temporarily hovered over while dragging
 	LLPointer<LLViewerObject>	mDragHoveredObject;
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 3725510b6a..c8d77a6e0b 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -5952,7 +5952,7 @@ void LLVivoxVoiceClient::filePlaybackSetMode(bool vox, float speed)
 }
 
 //------------------------------------------------------------------------
-std::set<LLVivoxVoiceClient::sessionState::wptr_t> LLVivoxVoiceClient::sessionState::mSession;
+std::set<LLVivoxVoiceClient::sessionState::wptr_t, std::owner_less<LLVivoxVoiceClient::sessionState::wptr_t>> LLVivoxVoiceClient::sessionState::mSession;
 
 
 LLVivoxVoiceClient::sessionState::sessionState() :
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index e3ab99c675..d75d1b4b5d 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -294,8 +294,8 @@ protected:
 		bool mAvatarIDValid;
 		bool mIsSelf;
 	};
-    typedef boost::shared_ptr<participantState> participantStatePtr_t;
-    typedef boost::weak_ptr<participantState> participantStateWptr_t;
+    typedef std::shared_ptr<participantState> participantStatePtr_t;
+    typedef std::weak_ptr<participantState> participantStateWptr_t;
 
     typedef std::map<const std::string, participantStatePtr_t> participantMap;
     typedef std::map<const LLUUID, participantStatePtr_t> participantUUIDMap;
@@ -303,10 +303,10 @@ protected:
 	struct sessionState
 	{
     public:
-        typedef boost::shared_ptr<sessionState> ptr_t;
-        typedef boost::weak_ptr<sessionState> wptr_t;
+        typedef std::shared_ptr<sessionState> ptr_t;
+        typedef std::weak_ptr<sessionState> wptr_t;
 
-        typedef boost::function<void(const ptr_t &)> sessionFunc_t;
+        typedef std::function<void(const ptr_t &)> sessionFunc_t;
 
         static ptr_t createSession();
 		~sessionState();
@@ -370,7 +370,7 @@ protected:
     private:
         sessionState();
 
-        static std::set<wptr_t> mSession;   // canonical list of outstanding sessions.
+        static std::set<wptr_t, std::owner_less<wptr_t>> mSession;   // canonical list of outstanding sessions.
         std::set<wptr_t>::iterator  mMyIterator;    // used for delete
 
         static void for_eachPredicate(const wptr_t &a, sessionFunc_t func);
@@ -381,7 +381,7 @@ protected:
         static bool testByCallerId(const LLVivoxVoiceClient::sessionState::wptr_t &a, LLUUID participantId);
 
 	};
-    typedef boost::shared_ptr<sessionState> sessionStatePtr_t;
+    typedef std::shared_ptr<sessionState> sessionStatePtr_t;
 
     typedef std::map<std::string, sessionStatePtr_t> sessionMap;
 	
diff --git a/indra/newview/llwindowlistener.cpp b/indra/newview/llwindowlistener.cpp
index aa8c79b0d2..0edabf358f 100644
--- a/indra/newview/llwindowlistener.cpp
+++ b/indra/newview/llwindowlistener.cpp
@@ -388,7 +388,7 @@ static void mouseEvent(const MouseFunc& func, const LLSD& request)
 	LLCoordGL pos(request["x"].asInteger(), request["y"].asInteger());
 	bool has_pos(request.has("x") && request.has("y"));
 
-	boost::scoped_ptr<LLView::TemporaryDrilldownFunc> tempfunc;
+	std::unique_ptr<LLView::TemporaryDrilldownFunc> tempfunc;
 
 	// Documentation for mouseDown(), mouseUp() and mouseMove() claims you
 	// must either specify ["path"], or both of ["x"] and ["y"]. You MAY
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp
index b816f9a3b5..3c2c6d15c4 100644
--- a/indra/newview/llxmlrpclistener.cpp
+++ b/indra/newview/llxmlrpclistener.cpp
@@ -544,7 +544,7 @@ private:
     const std::string mMethod;
     const std::string mReplyPump;
     LLTempBoundListener mBoundListener;
-    boost::scoped_ptr<LLXMLRPCTransaction> mTransaction;
+    std::unique_ptr<LLXMLRPCTransaction> mTransaction;
 	LLXMLRPCTransaction::EStatus mPreviousStatus; // To detect state changes.
 };
 
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index ba7e8d7298..a77c31eee3 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -188,7 +188,7 @@ public:
 
 	virtual void onCompleted(LLCore::HttpHandle handle, LLCore::HttpResponse * response);
 
-	typedef boost::shared_ptr<LLXMLRPCTransaction::Handler> ptr_t;
+	typedef std::shared_ptr<LLXMLRPCTransaction::Handler> ptr_t;
 
 private:
 
diff --git a/indra/newview/tests/llremoteparcelrequest_test.cpp b/indra/newview/tests/llremoteparcelrequest_test.cpp
index 4f7f87b6b0..4eddfb46e1 100644
--- a/indra/newview/tests/llremoteparcelrequest_test.cpp
+++ b/indra/newview/tests/llremoteparcelrequest_test.cpp
@@ -49,7 +49,7 @@ void LLCurl::Responder::failureResult(S32 status, const std::string& reason, con
 void LLCurl::Responder::successResult(const LLSD& content) { }
 void LLCurl::Responder::completeResult(S32 status, const std::string& reason, const LLSD& content) { }
 std::string LLCurl::Responder::dumpResponse() const { return "(failure)"; }
-void LLCurl::Responder::completedRaw(LLChannelDescriptors const &,boost::shared_ptr<LLBufferArray> const &) { }
+void LLCurl::Responder::completedRaw(LLChannelDescriptors const &,std::shared_ptr<LLBufferArray> const &) { }
 void LLMessageSystem::getF32(char const *,char const *,F32 &,S32) { }
 void LLMessageSystem::getU8(char const *,char const *,U8 &,S32) { }
 void LLMessageSystem::getS32(char const *,char const *,S32 &,S32) { }
@@ -110,7 +110,7 @@ namespace tut
 	{
 		set_test_name("observer pointer");
 
-		boost::scoped_ptr<TestObserver> observer(new TestObserver());
+		std::unique_ptr<TestObserver> observer(new TestObserver());
 
 		LLRemoteParcelInfoProcessor & processor = LLRemoteParcelInfoProcessor::instance();
 		processor.addObserver(LLUUID(TEST_PARCEL_ID), observer.get());
diff --git a/indra/test/io.cpp b/indra/test/io.cpp
index 40243a8ad6..99b49c8b29 100644
--- a/indra/test/io.cpp
+++ b/indra/test/io.cpp
@@ -946,7 +946,7 @@ namespace tut
 		typedef LLCloneIOFactory<LLPipeStringInjector> emitter_t;
 		emitter_t* emitter = new emitter_t(
 			new LLPipeStringInjector("suckers never play me"));
-		boost::shared_ptr<LLChainIOFactory> factory(emitter);
+		std::shared_ptr<LLChainIOFactory> factory(emitter);
 		LLIOServerSocket* server = new LLIOServerSocket(
 			mPool,
 			mSocket,
@@ -993,7 +993,7 @@ namespace tut
 		LLPumpIO::chain_t chain;
 		typedef LLCloneIOFactory<LLIOFuzz> emitter_t;
 		emitter_t* emitter = new emitter_t(new LLIOFuzz(1000000));
-		boost::shared_ptr<LLChainIOFactory> factory(emitter);
+		std::shared_ptr<LLChainIOFactory> factory(emitter);
 		LLIOServerSocket* server = new LLIOServerSocket(
 			mPool,
 			mSocket,
@@ -1036,7 +1036,7 @@ namespace tut
 		LLPumpIO::chain_t chain;
 		typedef LLCloneIOFactory<LLIOFuzz> emitter_t;
 		emitter_t* emitter = new emitter_t(new LLIOFuzz(1000000));
-		boost::shared_ptr<LLChainIOFactory> factory(emitter);
+		std::shared_ptr<LLChainIOFactory> factory(emitter);
 		LLIOServerSocket* server = new LLIOServerSocket(
 			mPool,
 			mSocket,
@@ -1079,7 +1079,7 @@ namespace tut
 		LLPumpIO::chain_t chain;
 		typedef LLCloneIOFactory<LLIOFuzz> emitter_t;
 		emitter_t* emitter = new emitter_t(new LLIOFuzz(1000000));
-		boost::shared_ptr<LLChainIOFactory> factory(emitter);
+		std::shared_ptr<LLChainIOFactory> factory(emitter);
 		LLIOServerSocket* server = new LLIOServerSocket(
 			mPool,
 			mSocket,
@@ -1120,7 +1120,7 @@ namespace tut
 		LLPumpIO::chain_t chain;
 		typedef LLCloneIOFactory<LLIOSleeper> sleeper_t;
 		sleeper_t* sleeper = new sleeper_t(new LLIOSleeper);
-		boost::shared_ptr<LLChainIOFactory> factory(sleeper);
+		std::shared_ptr<LLChainIOFactory> factory(sleeper);
 		LLIOServerSocket* server = new LLIOServerSocket(
 			mPool,
 			mSocket,
diff --git a/indra/test/llevents_tut.cpp b/indra/test/llevents_tut.cpp
index 17f64a4953..a38de71e48 100644
--- a/indra/test/llevents_tut.cpp
+++ b/indra/test/llevents_tut.cpp
@@ -368,10 +368,10 @@ void events_object::test<7>()
 	LLEventStream bob("bob"); 		// should work, previous one unregistered
 	LLEventStream bob1("bob", true);// allowed to tweak name
 	ensure_equals("tweaked LLEventStream name", bob1.getName(), "bob1");
-	std::vector<boost::shared_ptr<LLEventStream> > streams;
+	std::vector<std::shared_ptr<LLEventStream> > streams;
 	for (int i = 2; i <= 10; ++i)
 	{
-		streams.push_back(boost::shared_ptr<LLEventStream>(new LLEventStream("bob", true)));
+		streams.push_back(std::shared_ptr<LLEventStream>(new LLEventStream("bob", true)));
 	}
 	ensure_equals("last tweaked LLEventStream name", streams.back()->getName(), "bob10");
 }
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index a265e1273b..fba7a48bb4 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -160,12 +160,12 @@ public:
 
 	virtual void reset()
 	{
-		boost::dynamic_pointer_cast<RecordToTempFile>(mRecorder)->reset();
+		std::dynamic_pointer_cast<RecordToTempFile>(mRecorder)->reset();
 	}
 
 	virtual void replay(std::ostream& out)
 	{
-		boost::dynamic_pointer_cast<RecordToTempFile>(mRecorder)->replay(out);
+		std::dynamic_pointer_cast<RecordToTempFile>(mRecorder)->replay(out);
 	}
 
 private:
@@ -179,7 +179,7 @@ class LLTestCallback : public chained_callback
 
 public:
 	LLTestCallback(bool verbose_mode, std::ostream *stream,
-				   boost::shared_ptr<LLReplayLog> replayer) :
+				   std::shared_ptr<LLReplayLog> replayer) :
 		mVerboseMode(verbose_mode),
 		mTotalTests(0),
 		mPassedTests(0),
@@ -187,7 +187,7 @@ public:
 		mSkippedTests(0),
 		// By default, capture a shared_ptr to std::cout, with a no-op "deleter"
 		// so that destroying the shared_ptr makes no attempt to delete std::cout.
-		mStream(boost::shared_ptr<std::ostream>(&std::cout, [](std::ostream*){})),
+		mStream(std::shared_ptr<std::ostream>(&std::cout, [](std::ostream*){})),
 		mReplayer(replayer)
 	{
 		if (stream)
@@ -201,7 +201,7 @@ public:
 			// Allocate and assign in two separate steps, per Herb Sutter.
 			// (Until we turn on C++11 support, have to wrap *stream with
 			// boost::ref() due to lack of perfect forwarding.)
-			boost::shared_ptr<std::ostream> pstream(new TeeStream(std::cout, boost::ref(*stream)));
+			std::shared_ptr<std::ostream> pstream(new TeeStream(std::cout, boost::ref(*stream)));
 			mStream = pstream;
 		}
 	}
@@ -325,8 +325,8 @@ protected:
 	int mPassedTests;
 	int mFailedTests;
 	int mSkippedTests;
-	boost::shared_ptr<std::ostream> mStream;
-	boost::shared_ptr<LLReplayLog> mReplayer;
+	std::shared_ptr<std::ostream> mStream;
+	std::shared_ptr<LLReplayLog> mReplayer;
 };
 
 // TeamCity specific class which emits service messages
@@ -336,7 +336,7 @@ class LLTCTestCallback : public LLTestCallback
 {
 public:
 	LLTCTestCallback(bool verbose_mode, std::ostream *stream,
-					 boost::shared_ptr<LLReplayLog> replayer) :
+					 std::shared_ptr<LLReplayLog> replayer) :
 		LLTestCallback(verbose_mode, stream, replayer)
 	{
 	}
@@ -549,7 +549,7 @@ int main(int argc, char **argv)
 	apr_status_t apr_err;
 	const char* opt_arg = NULL;
 	int opt_id = 0;
-	boost::scoped_ptr<llofstream> output;
+	std::unique_ptr<llofstream> output;
 	const char *touch = NULL;
 
 	while(true)
@@ -608,7 +608,7 @@ int main(int argc, char **argv)
 
 	// set up logging
 	const char* LOGFAIL = getenv("LOGFAIL");
-	boost::shared_ptr<LLReplayLog> replayer{boost::make_shared<LLReplayLog>()};
+	std::shared_ptr<LLReplayLog> replayer{std::make_shared<LLReplayLog>()};
 
 	// Testing environment variables for both 'set' and 'not empty' allows a
 	// user to suppress a pre-existing environment variable by forcing empty.
diff --git a/indra/viewer_components/login/lllogin.h b/indra/viewer_components/login/lllogin.h
index 051641ff59..de58ca0c29 100644
--- a/indra/viewer_components/login/lllogin.h
+++ b/indra/viewer_components/login/lllogin.h
@@ -121,7 +121,7 @@ public:
 
 private:
 	class Impl;
-	boost::scoped_ptr<Impl> mImpl;
+	std::unique_ptr<Impl> mImpl;
 };
 
 #endif // LL_LLLOGIN_H
-- 
cgit v1.2.3


From e5ef481cd3e3f07fbb39ccf07ae71718d54ffaa6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 9 Jan 2024 00:19:39 +0200
Subject: SL-20781 Follow up on boost to std replacement

---
 doc/contributions.txt                     |  2 ++
 indra/llappearance/llavatarappearance.cpp | 14 --------------
 indra/llprimitive/lldaeloader.cpp         |  4 +---
 indra/llprimitive/llgltfloader.cpp        |  2 --
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index a097aad7f6..fa47afe579 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -64,6 +64,8 @@ Aimee Trescothick
 	VWR-14711
 	VWR-14712
 	VWR-15454
+AiraYumi
+	SL-20781 (github PR #613)
 Alejandro Rosenthal
 	VWR-1184
 Aleric Inglewood
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index b9c3aee839..b430c4c6aa 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -24,12 +24,6 @@
  * $/LicenseInfo$
  */
 
-#if LL_MSVC
-// disable warning about boost::lexical_cast returning uninitialized data
-// when it fails to parse the string
-#pragma warning (disable:4701)
-#endif
-
 #include "linden_common.h"
 
 #include "llavatarappearance.h"
@@ -46,14 +40,6 @@
 #include "boost/bind.hpp"
 #include "boost/tokenizer.hpp"
 
-
-#if LL_MSVC
-// disable boost::lexical_cast warning
-#pragma warning (disable:4702)
-#endif
-
-#include <boost/lexical_cast.hpp>
-
 using namespace LLAvatarAppearanceDefines;
 
 //-----------------------------------------------------------------------------
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 2e4b013b77..2c357e1ac5 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -53,8 +53,6 @@
 #pragma warning (default : 4264)
 #endif
 
-#include <boost/lexical_cast.hpp>
-
 #include "lldaeloader.h"
 #include "llsdserialize.h"
 #include "lljoint.h"
@@ -2385,7 +2383,7 @@ std::string LLDAELoader::getElementLabel(daeElement *element)
 
 		if (ind > 0)
 		{
-			index_string = "_" + boost::lexical_cast<std::string>(ind);
+			index_string = "_" + std::to_string(ind);
 		}
 
 		// if parent has a name or ID, use it
diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp
index 7394f99794..8e498158d6 100644
--- a/indra/llprimitive/llgltfloader.cpp
+++ b/indra/llprimitive/llgltfloader.cpp
@@ -48,8 +48,6 @@
 
 // TODO: includes inherited from dae loader.  Validate / prune
 
-#include <boost/lexical_cast.hpp>
-
 #include "llsdserialize.h"
 #include "lljoint.h"
 
-- 
cgit v1.2.3


From 8e3fb2da0f91729f4a7a663002c68abd80d4a3e7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 9 Jan 2024 00:43:56 +0100
Subject: Fix project structure generated by CMake

---
 indra/newview/CMakeLists.txt | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7a70d0b6e6..e4f8d9b65e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1573,34 +1573,15 @@ endif (WINDOWS)
 
 # Add the xui files. This is handy for searching for xui elements
 # from within the IDE.
-set(viewer_XUI_FILES
-    skins/default/colors.xml
-    skins/default/default_languages.xml
-    skins/default/textures/textures.xml
-    )
-file(GLOB DEFAULT_XUI_FILE_GLOB_LIST
-     ${CMAKE_CURRENT_SOURCE_DIR}/skins/*/xui/en/*.xml)
-list(APPEND viewer_XUI_FILES ${DEFAULT_XUI_FILE_GLOB_LIST})
-
-file(GLOB DEFAULT_WIDGET_FILE_GLOB_LIST
-     ${CMAKE_CURRENT_SOURCE_DIR}/skins/*/xui/en/widgets/*.xml)
-list(APPEND viewer_XUI_FILES ${DEFAULT_WIDGET_FILE_GLOB_LIST})
-
-# Cannot append empty lists in CMake, wait until we have files here.
-#file(GLOB SILVER_WIDGET_FILE_GLOB_LIST
-#     ${CMAKE_CURRENT_SOURCE_DIR}/skins/silver/xui/en-us/widgets/*.xml)
-#list(APPEND viewer_XUI_FILES ${SILVER_WIDGET_FILE_GLOB_LIST})
-
-list(SORT viewer_XUI_FILES)
-
-source_group("XUI Files" FILES ${viewer_XUI_FILES})
-
-set_source_files_properties(${viewer_XUI_FILES}
+file(GLOB_RECURSE viewer_XUI_FILES LIST_DIRECTORIES FALSE
+    ${CMAKE_CURRENT_SOURCE_DIR}/skins/*.xml)
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/skins PREFIX "XUI Files" FILES ${viewer_XUI_FILES})
+set_source_files_properties(${viewer_XUI_FILES} 
                             PROPERTIES HEADER_FILE_ONLY TRUE)
-
 list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 
-file(GLOB_RECURSE viewer_SHADER_FILES LIST_DIRECTORIES TRUE
+# Add the shader sources
+file(GLOB_RECURSE viewer_SHADER_FILES LIST_DIRECTORIES FALSE
     ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders/*.glsl)
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/shaders PREFIX "Shaders" FILES ${viewer_SHADER_FILES})
 set_source_files_properties(${viewer_SHADER_FILES} 
@@ -1610,6 +1591,7 @@ list(APPEND viewer_SOURCE_FILES ${viewer_SHADER_FILES})
 
 set(viewer_APPSETTINGS_FILES
     app_settings/anim.ini
+    app_settings/autoreplace.xml
     app_settings/cmd_line.xml
     app_settings/commands.xml
     app_settings/grass.xml
-- 
cgit v1.2.3


From ba74152c823563a66729ea0a7fb7cab5bf58980d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 9 Jan 2024 00:16:52 +0100
Subject: Replace BOOST_FOREACH with standard C++ range-based for-loops

---
 indra/llcommon/llprocess.cpp                  |  9 +++---
 indra/llcommon/llsdutil.h                     |  6 ++--
 indra/llcommon/llsingleton.cpp                |  3 +-
 indra/llcommon/llsys.cpp                      | 10 +++----
 indra/llcommon/tests/llprocess_test.cpp       |  5 ++--
 indra/llcommon/tests/llstreamqueue_test.cpp   |  9 ++----
 indra/llcommon/tests/lltreeiterators_test.cpp | 23 +++++++--------
 indra/llfilesystem/lldir.cpp                  |  9 +++---
 indra/llfilesystem/tests/lldir_test.cpp       |  5 ++--
 indra/llui/llcommandmanager.cpp               |  4 +--
 indra/llui/llfloater.cpp                      |  8 ++----
 indra/llui/lllayoutstack.cpp                  | 41 ++++++++++++++-------------
 indra/llui/llloadingindicator.cpp             |  3 +-
 indra/llui/llmenugl.cpp                       |  3 +-
 indra/llui/llnotifications.cpp                | 17 ++++++-----
 indra/llui/llnotificationslistener.cpp        |  1 -
 indra/llui/lltoolbar.cpp                      | 13 ++++-----
 indra/llui/lluicolortable.cpp                 |  3 +-
 indra/llui/llview.cpp                         | 27 +++++++++---------
 indra/newview/llagent.cpp                     |  3 +-
 indra/newview/llappearancemgr.cpp             |  5 ++--
 indra/newview/llappviewer.cpp                 | 13 ++++-----
 indra/newview/llconversationlog.cpp           |  3 +-
 indra/newview/llconversationmodel.cpp         |  5 +---
 indra/newview/llexternaleditor.cpp            |  3 +-
 indra/newview/llfloaterimcontainer.cpp        |  5 ++--
 indra/newview/llinventoryfunctions.cpp        |  2 --
 indra/newview/lllogchat.cpp                   |  5 ++--
 indra/newview/llmarketplacenotifications.cpp  |  3 +-
 indra/newview/llnotificationmanager.cpp       | 21 ++++++--------
 indra/newview/lloutfitgallery.cpp             |  4 +--
 indra/newview/llpanelexperiencelisteditor.cpp |  3 +-
 indra/newview/llpanelgroupbulkban.cpp         | 13 ++++-----
 indra/newview/lltoolbarview.cpp               |  8 ++----
 indra/newview/llviewermessage.cpp             |  6 ++--
 35 files changed, 128 insertions(+), 173 deletions(-)

diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 0d65762284..0d6a147da3 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -36,7 +36,6 @@
 #include "llevents.h"
 #include "llexception.h"
 
-#include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 #include <boost/asio/streambuf.hpp>
 #include <boost/asio/buffers_iterator.hpp>
@@ -587,7 +586,7 @@ LLProcess::LLProcess(const LLSDOrParams& params):
 	// apr_procattr_child_err_set()), or accepting a filename, opening it and
 	// passing that apr_file_t (simple <, >, 2> redirect emulation).
 	std::vector<apr_int32_t> select;
-	BOOST_FOREACH(const FileParam& fparam, params.files)
+	for (const FileParam& fparam : params.files)
 	{
 		// Every iteration, we're going to append an item to 'select'. At the
 		// top of the loop, its size() is, in effect, an index. Use that to
@@ -684,7 +683,7 @@ LLProcess::LLProcess(const LLSDOrParams& params):
 	argv.push_back(params.executable().c_str());
 
 	// Add arguments. See above remarks about c_str().
-	BOOST_FOREACH(const std::string& arg, params.args)
+	for (const std::string& arg : params.args)
 	{
 		argv.push_back(arg.c_str());
 	}
@@ -961,7 +960,7 @@ void LLProcess::handle_status(int reason, int status)
 		// only be performed if in fact we're going to produce the log message.
 		LL_DEBUGS("LLProcess") << empty;
 		std::string reason_str;
-		BOOST_FOREACH(const ReasonCode& rcp, reasons)
+		for (const ReasonCode& rcp : reasons)
 		{
 			if (reason == rcp.code)
 			{
@@ -1151,7 +1150,7 @@ std::ostream& operator<<(std::ostream& out, const LLProcess::Params& params)
 		out << "cd " << LLStringUtil::quote(params.cwd) << ": ";
 	}
 	out << LLStringUtil::quote(params.executable);
-	BOOST_FOREACH(const std::string& arg, params.args)
+	for (const std::string& arg : params.args)
 	{
 		out << ' ' << LLStringUtil::quote(arg);
 	}
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h
index ad54d1b0be..fdcc052bd0 100644
--- a/indra/llcommon/llsdutil.h
+++ b/indra/llcommon/llsdutil.h
@@ -478,9 +478,9 @@ namespace llsd
 {
 
 /*****************************************************************************
-*   BOOST_FOREACH() helpers for LLSD
+*   range-based for-loop helpers for LLSD
 *****************************************************************************/
-/// Usage: BOOST_FOREACH(LLSD item, inArray(someLLSDarray)) { ... }
+/// Usage: for (LLSD item : inArray(someLLSDarray)) { ... }
 class inArray
 {
 public:
@@ -503,7 +503,7 @@ private:
 /// MapEntry is what you get from dereferencing an LLSD::map_[const_]iterator.
 typedef std::map<LLSD::String, LLSD>::value_type MapEntry;
 
-/// Usage: BOOST_FOREACH([const] MapEntry& e, inMap(someLLSDmap)) { ... }
+/// Usage: for([const] MapEntry& e : inMap(someLLSDmap)) { ... }
 class inMap
 {
 public:
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp
index 6b1986d0e9..5f1a89670e 100644
--- a/indra/llcommon/llsingleton.cpp
+++ b/indra/llcommon/llsingleton.cpp
@@ -32,7 +32,6 @@
 #include "lldependencies.h"
 #include "llexception.h"
 #include "llcoros.h"
-#include <boost/foreach.hpp>
 #include <algorithm>
 #include <iostream>                 // std::cerr in dire emergency
 #include <sstream>
@@ -411,7 +410,7 @@ void LLSingletonBase::cleanup_()
 void LLSingletonBase::deleteAll()
 {
     // It's essential to traverse these in dependency order.
-    BOOST_FOREACH(LLSingletonBase* sp, dep_sort())
+    for (LLSingletonBase* sp : dep_sort())
     {
         // Capture the class name first: in case of exception, don't count on
         // being able to extract it later.
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 938685bae6..f6b99b7d85 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -49,7 +49,6 @@
 #include "llsdutil.h"
 #include <boost/bind.hpp>
 #include <boost/circular_buffer.hpp>
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/range.hpp>
 #include <boost/utility/enable_if.hpp>
@@ -905,9 +904,9 @@ void LLMemoryInfo::stream(std::ostream& s) const
 
 	// Max key length
 	size_t key_width(0);
-	BOOST_FOREACH(const MapEntry& pair, inMap(mStatsMap))
+	for (const auto& [key, value] : inMap(mStatsMap))
 	{
-		size_t len(pair.first.length());
+		size_t len(key.length());
 		if (len > key_width)
 		{
 			key_width = len;
@@ -915,10 +914,9 @@ void LLMemoryInfo::stream(std::ostream& s) const
 	}
 
 	// Now stream stats
-	BOOST_FOREACH(const MapEntry& pair, inMap(mStatsMap))
+	for (const auto& [key, value] : inMap(mStatsMap))
 	{
-		s << pfx << std::setw(narrow(key_width+1)) << (pair.first + ':') << ' ';
-		LLSD value(pair.second);
+		s << pfx << std::setw(narrow(key_width+1)) << (key + ':') << ' ';
 		if (value.isInteger())
 			s << std::setw(12) << value.asInteger();
 		else if (value.isReal())
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index b6b297b8d7..628f046f55 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -21,7 +21,6 @@
 // external library headers
 #include "llapr.h"
 #include "apr_thread_proc.h"
-#include <boost/foreach.hpp>
 #include <boost/function.hpp>
 #include <boost/algorithm/string/find_iterator.hpp>
 #include <boost/algorithm/string/finder.hpp>
@@ -323,7 +322,7 @@ namespace tut
     {
 /*==========================================================================*|
         std::string reason_str;
-        BOOST_FOREACH(const ReasonCode& rcp, reasons)
+        for (const ReasonCode& rcp : reasons)
         {
             if (reason == rcp.code)
             {
@@ -554,7 +553,7 @@ namespace tut
         catch (const failure&)
         {
             std::cout << "History:\n";
-            BOOST_FOREACH(const Item& item, history)
+            for (const Item& item : history)
             {
                 std::string what(item.what);
                 if ((! what.empty()) && what[what.length() - 1] == '\n')
diff --git a/indra/llcommon/tests/llstreamqueue_test.cpp b/indra/llcommon/tests/llstreamqueue_test.cpp
index 050ad5c5bf..8af057328b 100644
--- a/indra/llcommon/tests/llstreamqueue_test.cpp
+++ b/indra/llcommon/tests/llstreamqueue_test.cpp
@@ -15,9 +15,6 @@
 #include "llstreamqueue.h"
 // STL headers
 #include <vector>
-// std headers
-// external library headers
-#include <boost/foreach.hpp>
 // other Linden headers
 #include "../test/lltut.h"
 #include "stringize.h"
@@ -133,7 +130,7 @@ namespace tut
         std::streamsize leave(5);   // len("craft") above
         std::streamsize skip(total - leave);
         std::streamsize written(0);
-        BOOST_FOREACH(const std::string& block, blocks)
+        for (const std::string& block : blocks)
         {
             written += strq.write(&block[0], block.length());
             ensure_equals("size() after write()", strq.size(), written);
@@ -152,7 +149,7 @@ namespace tut
     {
         set_test_name("concatenate blocks");
         std::string blocks[] = { "abcd", "efghij", "klmnopqrs" };
-        BOOST_FOREACH(const std::string& block, blocks)
+        for (const std::string& block : blocks)
         {
             strq.write(&block[0], block.length());
         }
@@ -170,7 +167,7 @@ namespace tut
     {
         set_test_name("split blocks");
         std::string blocks[] = { "abcdefghijklm", "nopqrstuvwxyz" };
-        BOOST_FOREACH(const std::string& block, blocks)
+        for (const std::string& block : blocks)
         {
             strq.write(&block[0], block.length());
         }
diff --git a/indra/llcommon/tests/lltreeiterators_test.cpp b/indra/llcommon/tests/lltreeiterators_test.cpp
index 1d619867d4..b9c7a70c07 100644
--- a/indra/llcommon/tests/lltreeiterators_test.cpp
+++ b/indra/llcommon/tests/lltreeiterators_test.cpp
@@ -38,7 +38,6 @@
 // external library headers
 #include <boost/bind.hpp>
 #include <boost/range/iterator_range.hpp>
-#include <boost/foreach.hpp>
 
 // associated header
 #include "../lltreeiterators.h"
@@ -402,7 +401,7 @@ private:
  *
  * Example:
  * @code
- * BOOST_FOREACH(TreeNodePtr node, getRootRange<LLTreeIter::UP>(somenode))
+ * for (TreeNodePtr node : getRootRange<LLTreeIter::UP>(somenode))
  * {
  *     std::cout << node->name() << '\n';
  * }
@@ -424,7 +423,7 @@ getRootRange(const TreeNodePtr& node)
  *
  * Example:
  * @code
- * BOOST_FOREACH(TreeNodePtr node, getWalkRange<LLTreeIter::DFS_PRE>(root))
+ * for (TreeNodePtr node : getWalkRange<LLTreeIter::DFS_PRE>(root))
  * {
  *     std::cout << node->name() << '\n';
  * }
@@ -520,7 +519,7 @@ public:
      *
      * Example usage:
      * @code
-     * BOOST_FOREACH(EnhancedTreeNodePtr node, somenode->getRootRange<LLTreeIter::UP>())
+     * for (EnhancedTreeNodePtr node : somenode->getRootRange<LLTreeIter::UP>())
      * {
      *     std::cout << node->name() << '\n';
      * }
@@ -564,7 +563,7 @@ public:
      *
      * Example usage:
      * @code
-     * BOOST_FOREACH(EnhancedTreeNodePtr node, somenode->getWalkRange<LLTreeIter::DFS_PRE>())
+     * for (EnhancedTreeNodePtr node : somenode->getWalkRange<LLTreeIter::DFS_PRE>())
      * {
      *     std::cout << node->name() << '\n';
      * }
@@ -644,7 +643,7 @@ LLLinkedIter<PlainTree> PlainTree_child_end(PlainTree* node)
  *
  * Example:
  * @code
- * BOOST_FOREACH(PlainTree* node, getRootRange<LLTreeIter::UP>(somenode))
+ * for (PlainTree* node : getRootRange<LLTreeIter::UP>(somenode))
  * {
  *     std::cout << node->name() << '\n';
  * }
@@ -668,7 +667,7 @@ getRootRange(PlainTree* node)
  *
  * Example:
  * @code
- * BOOST_FOREACH(PlainTree* node, getWalkRange<LLTreeIter::DFS_PRE>(root))
+ * for (PlainTree* node : getWalkRange<LLTreeIter::DFS_PRE>(root))
  * {
  *     std::cout << node->name() << '\n';
  * }
@@ -1103,18 +1102,18 @@ namespace tut
         // This test function illustrates the looping techniques described in the
         // comments for the getRootRange() free function, the
         // EnhancedTreeNode::root_range template and the
-        // EnhancedTreeNode::getRootRange() method. Obviously the BOOST_FOREACH()
+        // EnhancedTreeNode::getRootRange() method. Obviously the for()
         // forms are more succinct.
         TreeNodePtr tnroot(example_tree<TreeNode>());
         TreeNodePtr tnB2b(get_B2b<TreeNode, TreeNode::child_iterator>
                           (tnroot, boost::bind(&TreeNode::child_begin, _1)));
     
-        std::string desc1("BOOST_FOREACH(TreeNodePr, getRootRange<LLTreeIter::UP>(tnB2b))");
+        std::string desc1("for (TreeNodePr : getRootRange<LLTreeIter::UP>(tnB2b))");
 //      std::cout << desc1 << "\n";
         // Although we've commented out the output statement, ensure that the
         // loop construct is still valid, as promised by the getRootRange()
         // documentation.
-        BOOST_FOREACH(TreeNodePtr node, getRootRange<LLTreeIter::UP>(tnB2b))
+        for (TreeNodePtr node : getRootRange<LLTreeIter::UP>(tnB2b))
         {
 //          std::cout << node->name() << '\n';
         }
@@ -1137,9 +1136,9 @@ namespace tut
 //          std::cout << (*ri)->name() << '\n';
         }
 
-        std::string desc2("BOOST_FOREACH(EnhancedTreeNodePtr node, etnB2b->getRootRange<LLTreeIter::UP>())");
+        std::string desc2("for (EnhancedTreeNodePtr node : etnB2b->getRootRange<LLTreeIter::UP>())");
 //      std::cout << desc2 << '\n';
-        BOOST_FOREACH(EnhancedTreeNodePtr node, etnB2b->getRootRange<LLTreeIter::UP>())
+        for (EnhancedTreeNodePtr node : etnB2b->getRootRange<LLTreeIter::UP>())
         {
 //          std::cout << node->name() << '\n';
         }
diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
index 69b23f9cf8..41fbb97175 100644
--- a/indra/llfilesystem/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
@@ -44,7 +44,6 @@
 #include "stringize.h"
 #include "llstring.h"
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/assign/list_of.hpp>
@@ -691,10 +690,10 @@ void LLDir::walkSearchSkinDirs(const std::string& subdir,
 							   const std::string& filename,
 							   const FUNCTION& function) const
 {
-	BOOST_FOREACH(std::string skindir, mSearchSkinDirs)
+	for (const std::string& skindir : mSearchSkinDirs)
 	{
 		std::string subdir_path(add(skindir, subdir));
-		BOOST_FOREACH(std::string subsubdir, subsubdirs)
+		for (const std::string& subsubdir : subsubdirs)
 		{
 			std::string full_path(add(subdir_path, subsubdir, filename));
 			if (fileExists(full_path))
@@ -843,7 +842,7 @@ std::vector<std::string> LLDir::findSkinnedFilenames(const std::string& subdir,
 		// current language, copy them -- in proper order -- into results.
 		// Don't drive this by walking the map itself: it matters that we
 		// generate results in the same order as subsubdirs.
-		BOOST_FOREACH(std::string subsubdir, subsubdirs)
+		for (const std::string& subsubdir : subsubdirs)
 		{
 			StringMap::const_iterator found(path_for.find(subsubdir));
 			if (found != path_for.end())
@@ -855,7 +854,7 @@ std::vector<std::string> LLDir::findSkinnedFilenames(const std::string& subdir,
 
 	LL_DEBUGS("LLDir") << empty;
 	const char* comma = "";
-	BOOST_FOREACH(std::string path, results)
+	for (const std::string& path : results)
 	{
 		LL_CONT << comma << "'" << path << "'";
 		comma = ", ";
diff --git a/indra/llfilesystem/tests/lldir_test.cpp b/indra/llfilesystem/tests/lldir_test.cpp
index 3cff622a4b..60265cade6 100644
--- a/indra/llfilesystem/tests/lldir_test.cpp
+++ b/indra/llfilesystem/tests/lldir_test.cpp
@@ -34,7 +34,6 @@
 
 #include "../test/lltut.h"
 #include "stringize.h"
-#include <boost/foreach.hpp>
 #include <boost/assign/list_of.hpp>
 
 using boost::assign::list_of;
@@ -109,7 +108,7 @@ struct LLDir_Dummy: public LLDir
 
             "install/skins/default/future/somefile.txt"
         };
-        BOOST_FOREACH(const char* path, preload)
+        for (const char* path : preload)
         {
             buildFilesystem(path);
         }
@@ -166,7 +165,7 @@ struct LLDir_Dummy: public LLDir
         LLStringUtil::getTokens(path, components, "/");
         // Ensure we have an entry representing every level of this path
         std::string partial;
-        BOOST_FOREACH(std::string component, components)
+        for (std::string component : components)
         {
             append(partial, component);
             mFilesystem.insert(partial);
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 3e159365e5..8ef7bd837f 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -34,8 +34,6 @@
 #include "llerror.h"
 #include "llxuiparser.h"
 
-#include <boost/foreach.hpp>
-
 
 //
 // LLCommandId class
@@ -182,7 +180,7 @@ bool LLCommandManager::load()
 		return false;
 	}
 
-	BOOST_FOREACH(LLCommand::Params& commandParams, commandsParams.commands)
+	for (const LLCommand::Params& commandParams : commandsParams.commands)
 	{
 		LLCommand * command = new LLCommand(commandParams);
 
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 2303cd24b7..a2beda5b9e 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -59,7 +59,6 @@
 #include "llmultifloater.h"
 #include "llsdutil.h"
 #include "lluiusage.h"
-#include <boost/foreach.hpp>
 
 
 // use this to control "jumping" behavior when Ctrl-Tabbing
@@ -2385,7 +2384,7 @@ void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
 			//{
 			//	floaterp->translate(translate_x, translate_y);
 			//}
-			BOOST_FOREACH(LLHandle<LLFloater> dependent_floater, floaterp->mDependents)
+			for (LLHandle<LLFloater> dependent_floater : floaterp->mDependents)
 			{
 				if (dependent_floater.get())
 				{
@@ -2400,10 +2399,9 @@ void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
 void LLFloaterView::restoreAll()
 {
 	// make sure all subwindows aren't minimized
-	child_list_t child_list = *(getChildList());
-	for (child_list_const_iter_t child_it = child_list.begin(); child_it != child_list.end(); ++child_it)
+	for (auto child : *getChildList())
 	{
-		LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
+		LLFloater* floaterp = dynamic_cast<LLFloater*>(child);
 		if (floaterp)
 		{
 			floaterp->setMinimized(FALSE);
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 7e4e828a88..9ccf3b1627 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -395,8 +395,7 @@ void LLLayoutStack::updateLayout()
 							: getRect().getHeight();
 
 	// first, assign minimum dimensions
-	LLLayoutPanel* panelp = NULL;
-	BOOST_FOREACH(panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		if (panelp->mAutoResize)
 		{
@@ -409,12 +408,15 @@ void LLLayoutStack::updateLayout()
 	llassert(total_visible_fraction < 1.05f);
 
 	// don't need spacing after last panel
-	space_to_distribute += panelp ? ll_round((F32)mPanelSpacing * panelp->getVisibleAmount()) : 0;
+	{
+		LLLayoutPanel* panelp = mPanels.empty() ? nullptr : mPanels.back();
+		space_to_distribute += panelp ? ll_round((F32)mPanelSpacing * panelp->getVisibleAmount()) : 0;
+	}
 
 	S32 remaining_space = space_to_distribute;
 	if (space_to_distribute > 0 && total_visible_fraction > 0.f)
 	{	// give space proportionally to visible auto resize panels
-		BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+		for (LLLayoutPanel* panelp : mPanels)
 		{
 			if (panelp->mAutoResize)
 			{
@@ -427,7 +429,7 @@ void LLLayoutStack::updateLayout()
 	}
 
 	// distribute any left over pixels to non-collapsed, visible panels
-	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		if (remaining_space == 0) break;
 
@@ -443,7 +445,7 @@ void LLLayoutStack::updateLayout()
 
 	F32 cur_pos = (mOrientation == HORIZONTAL) ? 0.f : (F32)getRect().getHeight();
 
-	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		F32 panel_dim = llmax(panelp->getExpandedMinDim(), panelp->mTargetDim);
 
@@ -538,7 +540,7 @@ LLLayoutPanel* LLLayoutStack::findEmbeddedPanel(LLPanel* panelp) const
 {
 	if (!panelp) return NULL;
 
-	BOOST_FOREACH(LLLayoutPanel* p, mPanels)
+	for (LLLayoutPanel* p : mPanels)
 	{
 		if (p == panelp)
 		{
@@ -552,7 +554,7 @@ LLLayoutPanel* LLLayoutStack::findEmbeddedPanelByName(const std::string& name) c
 {
 	LLLayoutPanel* result = NULL;
 
-	BOOST_FOREACH(LLLayoutPanel* p, mPanels)
+	for (LLLayoutPanel* p : mPanels)
 	{
 		if (p->getName() == name)
 		{
@@ -566,7 +568,7 @@ LLLayoutPanel* LLLayoutStack::findEmbeddedPanelByName(const std::string& name) c
 
 void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp)
 {
-	BOOST_FOREACH(LLLayoutPanel* lp, mPanels)
+	for (LLLayoutPanel* lp : mPanels)
 	{
 		if (lp->mResizeBar == NULL)
 		{
@@ -669,7 +671,7 @@ void LLLayoutStack::updateFractionalSizes()
 {
 	F32 total_resizable_dim = 0.f;
 
-	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		if (panelp->mAutoResize)
 		{
@@ -677,7 +679,7 @@ void LLLayoutStack::updateFractionalSizes()
 		}
 	}
 
-	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		if (panelp->mAutoResize)
 		{
@@ -698,7 +700,7 @@ void LLLayoutStack::normalizeFractionalSizes()
 	S32 num_auto_resize_panels = 0;
 	F32 total_fractional_size = 0.f;
 	
-	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		if (panelp->mAutoResize)
 		{
@@ -709,7 +711,7 @@ void LLLayoutStack::normalizeFractionalSizes()
 
 	if (total_fractional_size == 0.f)
 	{ // equal distribution
-		BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+		for (LLLayoutPanel* panelp : mPanels)
 		{
 			if (panelp->mAutoResize)
 			{
@@ -719,7 +721,7 @@ void LLLayoutStack::normalizeFractionalSizes()
 	}
 	else
 	{ // renormalize
-		BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+		for (LLLayoutPanel* panelp : mPanels)
 		{
 			if (panelp->mAutoResize)
 			{
@@ -736,7 +738,7 @@ bool LLLayoutStack::animatePanels()
 	//
 	// animate visibility
 	//
-	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		if (panelp->getVisible())
 		{
@@ -834,7 +836,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 	LLLayoutPanel* other_resize_panel = NULL;
 	LLLayoutPanel* following_panel = NULL;
 
-	BOOST_REVERSE_FOREACH(LLLayoutPanel* panelp, mPanels)
+	BOOST_REVERSE_FOREACH(LLLayoutPanel* panelp, mPanels) // Should replace this when C++20 reverse view adaptor becomes available...
 	{
 		if (panelp->mAutoResize)
 		{
@@ -883,7 +885,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 		AFTER_RESIZED_PANEL
 	} which_panel = BEFORE_RESIZED_PANEL;
 
-	BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
+	for (LLLayoutPanel* panelp : mPanels)
 	{
 		if (!panelp->getVisible() || panelp->mCollapsed) 
 		{
@@ -974,6 +976,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
 												MIN_FRACTIONAL_SIZE,
 												MAX_FRACTIONAL_SIZE);
 			}
+			break;
 		default:
 			break;
 		}
@@ -990,8 +993,8 @@ void LLLayoutStack::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 void LLLayoutStack::updateResizeBarLimits()
 {
-	LLLayoutPanel* previous_visible_panelp = NULL;
-	BOOST_REVERSE_FOREACH(LLLayoutPanel* visible_panelp, mPanels)
+	LLLayoutPanel* previous_visible_panelp{ nullptr };
+	BOOST_REVERSE_FOREACH(LLLayoutPanel* visible_panelp, mPanels) // Should replace this when C++20 reverse view adaptor becomes available...
 	{
 		if (!visible_panelp->getVisible() || visible_panelp->mCollapsed)
 		{
diff --git a/indra/llui/llloadingindicator.cpp b/indra/llui/llloadingindicator.cpp
index 1ede5b706f..e8b6b7e43b 100644
--- a/indra/llui/llloadingindicator.cpp
+++ b/indra/llui/llloadingindicator.cpp
@@ -34,7 +34,6 @@
 // Project includes
 #include "lluictrlfactory.h"
 #include "lluiimage.h"
-#include "boost/foreach.hpp"
 
 // registered in llui.cpp to avoid being left out by MS linker
 //static LLDefaultChildRegistry::Register<LLLoadingIndicator> r("loading_indicator");
@@ -52,7 +51,7 @@ LLLoadingIndicator::LLLoadingIndicator(const Params& p)
 
 void LLLoadingIndicator::initFromParams(const Params& p)
 {
-	BOOST_FOREACH(LLUIImage* image, p.images().image)
+	for (LLUIImage* image : p.images().image)
 	{
 		mImages.push_back(image);
 	}
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index cebca70b59..76b50e0cdd 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -60,7 +60,6 @@
 #include "v2math.h"
 #include <set>
 #include <boost/tokenizer.hpp>
-#include <boost/foreach.hpp>
 
 // static
 LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL;
@@ -2156,7 +2155,7 @@ void LLMenuGL::arrange( void )
 		}
 		else
 		{
-			BOOST_FOREACH(LLMenuItemGL* itemp, mItems)
+			for (LLMenuItemGL* itemp : mItems)
 			{
 				// do first so LLMenuGLItemCall can call on_visible to determine if visible
 				itemp->buildDrawLabel();
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index d736aa6634..d5bfef132e 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -45,7 +45,6 @@
 
 #include <algorithm>
 #include <boost/regex.hpp>
-#include <boost/foreach.hpp>
 
 
 const std::string NOTIFICATION_PERSIST_VERSION = "0.93";
@@ -444,14 +443,14 @@ LLNotificationTemplate::LLNotificationTemplate(const LLNotificationTemplate::Par
 		mSoundName = p.sound;
 	}
 
-	BOOST_FOREACH(const LLNotificationTemplate::UniquenessContext& context, p.unique.contexts)
+	for (const LLNotificationTemplate::UniquenessContext& context : p.unique.contexts)
 	{
 		mUniqueContext.push_back(context.value);
 	}
 	
 	LL_DEBUGS("Notifications") << "notification \"" << mName << "\": tag count is " << p.tags.size() << LL_ENDL;
 	
-	BOOST_FOREACH(const LLNotificationTemplate::Tag& tag, p.tags)
+	for (const LLNotificationTemplate::Tag& tag : p.tags)
 	{
 		LL_DEBUGS("Notifications") << "    tag \"" << std::string(tag.value) << "\"" << LL_ENDL;
 		mTags.push_back(tag.value);
@@ -1153,7 +1152,7 @@ LLNotificationChannel::LLNotificationChannel(const Params& p)
 	LLInstanceTracker<LLNotificationChannel, std::string>(p.name.isProvided() ? p.name : LLUUID::generateNewID().asString()),
 	mName(p.name.isProvided() ? p.name : LLUUID::generateNewID().asString())
 {
-	BOOST_FOREACH(const std::string& source, p.sources)
+	for (const std::string& source : p.sources)
     {
 		connectToChannel(source);
 	}
@@ -1521,7 +1520,7 @@ void replaceFormText(LLNotificationForm::Params& form, const std::string& patter
 		form.ignore.text = replace;
 	}
 
-	BOOST_FOREACH(LLNotificationForm::FormElement& element, form.form_elements.elements)
+	for (LLNotificationForm::FormElement& element : form.form_elements.elements)
 	{
 		if (element.button.isChosen() && element.button.text() == pattern)
 		{
@@ -1569,19 +1568,19 @@ bool LLNotifications::loadTemplates()
 
 	mTemplates.clear();
 
-	BOOST_FOREACH(LLNotificationTemplate::GlobalString& string, params.strings)
+	for (const LLNotificationTemplate::GlobalString& string : params.strings)
 	{
 		mGlobalStrings[string.name] = string.value;
 	}
 
 	std::map<std::string, LLNotificationForm::Params> form_templates;
 
-	BOOST_FOREACH(LLNotificationTemplate::Template& notification_template, params.templates)
+	for (const LLNotificationTemplate::Template& notification_template : params.templates)
 	{
 		form_templates[notification_template.name] = notification_template.form;
 	}
 
-	BOOST_FOREACH(LLNotificationTemplate::Params& notification, params.notifications)
+	for (LLNotificationTemplate::Params& notification : params.notifications)
 	{
 		if (notification.form_ref.form_template.isChosen())
 		{
@@ -1635,7 +1634,7 @@ bool LLNotifications::loadVisibilityRules()
 
 	mVisibilityRules.clear();
 
-	BOOST_FOREACH(LLNotificationVisibilityRule::Rule& rule, params.rules)
+	for (const LLNotificationVisibilityRule::Rule& rule : params.rules)
 	{
 		mVisibilityRules.push_back(LLNotificationVisibilityRulePtr(new LLNotificationVisibilityRule(rule)));
 	}
diff --git a/indra/llui/llnotificationslistener.cpp b/indra/llui/llnotificationslistener.cpp
index e73ba1fbe9..02108c089c 100644
--- a/indra/llui/llnotificationslistener.cpp
+++ b/indra/llui/llnotificationslistener.cpp
@@ -32,7 +32,6 @@
 #include "llnotificationtemplate.h"
 #include "llsd.h"
 #include "llui.h"
-#include <boost/foreach.hpp>
 
 LLNotificationsListener::LLNotificationsListener(LLNotifications & notifications) :
     LLEventAPI("LLNotifications",
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 2707f7a15c..04772ddc73 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -27,7 +27,6 @@
 
 #include "linden_common.h"
 
-#include <boost/foreach.hpp>
 #include "lltoolbar.h"
 
 #include "llcommandmanager.h"
@@ -219,7 +218,7 @@ void LLToolBar::initFromParams(const LLToolBar::Params& p)
 	
 	mCenteringStack->addChild(LLUICtrlFactory::create<LLLayoutPanel>(border_panel_p));
 
-	BOOST_FOREACH(LLCommandId id, p.commands)
+	for (const LLCommandId& id : p.commands)
 	{
 		addCommand(id);
 	}
@@ -417,7 +416,7 @@ BOOL LLToolBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
 		// Determine which button the mouse was over during the click in case the context menu action
 		// is intended to affect the button.
 		mRightMouseTargetButton = NULL;
-		BOOST_FOREACH(LLToolBarButton* button, mButtons)
+		for (LLToolBarButton* button : mButtons)
 		{
 			LLRect button_rect;
 			button->localRectToOtherView(button->getLocalRect(), &button_rect, this);
@@ -505,7 +504,7 @@ void LLToolBar::setButtonType(LLToolBarEnums::ButtonType button_type)
 void LLToolBar::resizeButtonsInRow(std::vector<LLToolBarButton*>& buttons_in_row, S32 max_row_girth)
 {
 	// make buttons in current row all same girth
-	BOOST_FOREACH(LLToolBarButton* button, buttons_in_row)
+	for (LLToolBarButton* button : buttons_in_row)
 	{
 		if (getOrientation(mSideType) == LLLayoutStack::HORIZONTAL)
 		{
@@ -693,7 +692,7 @@ void LLToolBar::updateLayoutAsNeeded()
 
 	std::vector<LLToolBarButton*> buttons_in_row;
 
-	BOOST_FOREACH(LLToolBarButton* button, mButtons)
+	for (LLToolBarButton* button : mButtons)
 	{
 		button->reshape(button->mWidthRange.getMin(), button->mDesiredHeight);
 		button->autoResize();
@@ -878,7 +877,7 @@ void LLToolBar::createButtons()
 {
 	std::set<LLUUID> set_flashing;
 
-	BOOST_FOREACH(LLToolBarButton* button, mButtons)
+	for (LLToolBarButton* button : mButtons)
 	{
         if (button->getFlashTimer() && button->getFlashTimer()->isFlashingInProgress())
         {
@@ -896,7 +895,7 @@ void LLToolBar::createButtons()
 	mButtonMap.clear();
 	mRightMouseTargetButton = NULL;
 	
-	BOOST_FOREACH(LLCommandId& command_id, mButtonCommands)
+	for (const LLCommandId& command_id : mButtonCommands)
 	{
 		LLToolBarButton* button = createButton(command_id);
 		mButtons.push_back(button);
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index 096336045c..f43bdf1fdc 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -32,7 +32,6 @@
 #include "llui.h"
 #include "lluicolortable.h"
 #include "lluictrlfactory.h"
-#include <boost/foreach.hpp>
 
 LLUIColorTable::ColorParams::ColorParams()
 :	value("value"),
@@ -208,7 +207,7 @@ bool LLUIColorTable::loadFromSettings()
 
 	// pass constraint=LLDir::ALL_SKINS because we want colors.xml from every
 	// skin dir
-	BOOST_FOREACH(std::string colors_path,
+	for (const std::string& colors_path :
 				  gDirUtilp->findSkinnedFilenames(LLDir::SKINBASE, "colors.xml", LLDir::ALL_SKINS))
 	{
 		result |= loadFromFilename(colors_path, mLoadedColors);
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index da7868d804..070cd4b107 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -32,7 +32,6 @@
 
 #include <sstream>
 #include <boost/tokenizer.hpp>
-#include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 
 #include "llrender.h"
@@ -592,7 +591,7 @@ void LLView::deleteAllChildren()
 
 void LLView::setAllChildrenEnabled(BOOL b)
 {
-	BOOST_FOREACH(LLView* viewp, mChildList)
+	for (LLView* viewp : mChildList)
 	{
 		viewp->setEnabled(b);
 	}
@@ -621,7 +620,7 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
 {
 	BOOL old_visibility;
 	BOOL log_visibility_change = LLViewerEventRecorder::instance().getLoggingStatus();
-	BOOST_FOREACH(LLView* viewp, mChildList)
+	for (LLView* viewp : mChildList)
 	{
 		if (!viewp)
 		{
@@ -725,7 +724,7 @@ LLView* LLView::childrenHandleCharEvent(const std::string& desc, const METHOD& m
 {
 	if ( getVisible() && getEnabled() )
 	{
-		BOOST_FOREACH(LLView* viewp, mChildList)
+		for (LLView* viewp : mChildList)
 		{
 			if ((viewp->*method)(c, mask, TRUE))
 			{
@@ -744,7 +743,7 @@ LLView* LLView::childrenHandleCharEvent(const std::string& desc, const METHOD& m
 template <typename METHOD, typename XDATA>
 LLView* LLView::childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDATA extra, bool allow_mouse_block)
 {
-	BOOST_FOREACH(LLView* viewp, mChildList)
+	for (LLView* viewp : mChildList)
 	{
 		S32 local_x = x - viewp->getRect().mLeft;
 		S32 local_y = y - viewp->getRect().mBottom;
@@ -773,7 +772,7 @@ LLView* LLView::childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDA
 
 LLView* LLView::childrenHandleToolTip(S32 x, S32 y, MASK mask)
 {
-	BOOST_FOREACH(LLView* viewp, mChildList)
+	for (LLView* viewp : mChildList)
 	{
 		S32 local_x = x - viewp->getRect().mLeft;
 		S32 local_y = y - viewp->getRect().mBottom;
@@ -805,7 +804,7 @@ LLView* LLView::childrenHandleDragAndDrop(S32 x, S32 y, MASK mask,
 	// default to not accepting drag and drop, will be overridden by handler
 	*accept = ACCEPT_NO;
 
-	BOOST_FOREACH(LLView* viewp, mChildList)
+	for (LLView* viewp : mChildList)
 	{
 		S32 local_x = x - viewp->getRect().mLeft;
 		S32 local_y = y - viewp->getRect().mBottom;
@@ -831,7 +830,7 @@ LLView* LLView::childrenHandleDragAndDrop(S32 x, S32 y, MASK mask,
 
 LLView* LLView::childrenHandleHover(S32 x, S32 y, MASK mask)
 {
-	BOOST_FOREACH(LLView* viewp, mChildList)
+	for (LLView* viewp : mChildList)
 	{
 		S32 local_x = x - viewp->getRect().mLeft;
 		S32 local_y = y - viewp->getRect().mBottom;
@@ -859,7 +858,7 @@ LLView*	LLView::childFromPoint(S32 x, S32 y, bool recur)
 	if (!getVisible())
 		return NULL;
 
-	BOOST_FOREACH(LLView* viewp, mChildList)
+	for (LLView* viewp : mChildList)
 	{
 		S32 local_x = x - viewp->getRect().mLeft;
 		S32 local_y = y - viewp->getRect().mBottom;
@@ -1379,7 +1378,7 @@ void LLView::reshape(S32 width, S32 height, BOOL called_from_parent)
 		mRect.mTop = getRect().mBottom + height;
 
 		// move child views according to reshape flags
-		BOOST_FOREACH(LLView* viewp, mChildList)
+		for (LLView* viewp : mChildList)
 		{
 			if (viewp != NULL)
 			{
@@ -1451,7 +1450,7 @@ LLRect LLView::calcBoundingRect()
 {
 	LLRect local_bounding_rect = LLRect::null;
 
-	BOOST_FOREACH(LLView* childp, mChildList)
+	for (LLView* childp : mChildList)
 	{
 		// ignore invisible and "top" children when calculating bounding rect
 		// such as combobox popups
@@ -1614,7 +1613,7 @@ LLView* LLView::findChildView(const std::string& name, BOOL recurse) const
     LL_PROFILE_ZONE_SCOPED_CATEGORY_UI;
 	
     // Look for direct children *first*
-	BOOST_FOREACH(LLView* childp, mChildList)
+	for (LLView* childp : mChildList)
 	{
 		llassert(childp);
 		if (childp->getName() == name)
@@ -1625,7 +1624,7 @@ LLView* LLView::findChildView(const std::string& name, BOOL recurse) const
 	if (recurse)
 	{
 		// Look inside each child as well.
-		BOOST_FOREACH(LLView* childp, mChildList)
+		for (LLView* childp : mChildList)
 		{
 			llassert(childp);
 			LLView* viewp = childp->findChildView(name, recurse);
@@ -2800,7 +2799,7 @@ S32	LLView::notifyParent(const LLSD& info)
 bool	LLView::notifyChildren(const LLSD& info)
 {
 	bool ret = false;
-	BOOST_FOREACH(LLView* childp, mChildList)
+	for (LLView* childp : mChildList)
 	{
 		ret = ret || childp->notifyChildren(info);
 	}
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3853aaa8fd..1b765dfb83 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -95,7 +95,6 @@
 #include "llworld.h"
 #include "llworldmap.h"
 #include "stringize.h"
-#include "boost/foreach.hpp"
 #include "llcorehttputil.h"
 #include "lluiusage.h"
 
@@ -2329,7 +2328,7 @@ void LLAgent::endAnimationUpdateUI()
 			LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
 			LLFloaterIMContainer::floater_list_t conversations;
 			im_box->getDetachedConversationFloaters(conversations);
-			BOOST_FOREACH(LLFloater* conversation, conversations)
+			for (LLFloater* conversation : conversations)
 			{
 				LL_INFOS() << "skip_list.insert(session_floater): " << conversation->getTitle() << LL_ENDL;
 				skip_list.insert(conversation);
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index ebf08eacd9..c84657cf7a 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -27,7 +27,6 @@
 #include "llviewerprecompiledheaders.h"
 
 #include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
 #include "llaccordionctrltab.h"
 #include "llagent.h"
 #include "llagentcamera.h"
@@ -1647,7 +1646,7 @@ void LLAppearanceMgr::removeOutfitPhoto(const LLUUID& outfit_id)
         sub_cat_array,
         outfit_item_array,
         LLInventoryModel::EXCLUDE_TRASH);
-    BOOST_FOREACH(LLViewerInventoryItem* outfit_item, outfit_item_array)
+    for (LLViewerInventoryItem* outfit_item : outfit_item_array)
     {
         LLViewerInventoryItem* linked_item = outfit_item->getLinkedItem();
         if (linked_item != NULL)
@@ -3438,7 +3437,7 @@ void update_base_outfit_after_ordering()
 								sub_cat_array,
 								outfit_item_array,
 								LLInventoryModel::EXCLUDE_TRASH);
-	BOOST_FOREACH(LLViewerInventoryItem* outfit_item, outfit_item_array)
+	for (LLViewerInventoryItem* outfit_item : outfit_item_array)
 	{
 		LLViewerInventoryItem* linked_item = outfit_item->getLinkedItem();
 		if (linked_item != NULL)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 4a43133ff6..b85ae408d4 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -143,7 +143,6 @@
 
 // Third party library includes
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 #include <boost/throw_exception.hpp>
@@ -1207,7 +1206,7 @@ bool LLAppViewer::init()
             LLSD item(LeapCommand);
             LeapCommand.append(item);
         }
-        BOOST_FOREACH(const std::string& leap, llsd::inArray(LeapCommand))
+        for (const std::string& leap : llsd::inArray(LeapCommand))
         {
             LL_INFOS("InitInfo") << "processing --leap \"" << leap << '"' << LL_ENDL;
             // We don't have any better description of this plugin than the
@@ -2357,7 +2356,7 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
 		LL_ERRS() << "Invalid settings location list" << LL_ENDL;
 	}
 
-	BOOST_FOREACH(const SettingsGroup& group, mSettingsLocationList->groups)
+	for (const SettingsGroup& group : mSettingsLocationList->groups)
 	{
 		// skip settings groups that aren't the one we requested
 		if (group.name() != location_key) continue;
@@ -2369,7 +2368,7 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
 			return false;
 		}
 
-		BOOST_FOREACH(const SettingsFile& file, group.files)
+		for (const SettingsFile& file : group.files)
 		{
 			LL_INFOS("Settings") << "Attempting to load settings for the group " << file.name()
 			    << " - from location " << location_key << LL_ENDL;
@@ -2433,11 +2432,11 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
 std::string LLAppViewer::getSettingsFilename(const std::string& location_key,
 											 const std::string& file)
 {
-	BOOST_FOREACH(const SettingsGroup& group, mSettingsLocationList->groups)
+	for (const SettingsGroup& group : mSettingsLocationList->groups)
 	{
 		if (group.name() == location_key)
 		{
-			BOOST_FOREACH(const SettingsFile& settings_file, group.files)
+			for (const SettingsFile& settings_file : group.files)
 			{
 				if (settings_file.name() == file)
 				{
@@ -3017,7 +3016,7 @@ void LLAppViewer::initStrings()
 	// Now that we've set "[sourceid]", have to go back through
 	// default_trans_args and reinitialize all those other keys because some
 	// of them, in turn, reference "[sourceid]".
-	BOOST_FOREACH(std::string key, default_trans_args)
+	for (const std::string& key : default_trans_args)
 	{
 		std::string brackets(key), nobrackets(key);
 		// Invalid to inspect key[0] if key is empty(). But then, the entire
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index e7ead90840..3c59ca046d 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -32,7 +32,6 @@
 #include "llnotificationsutil.h"
 #include "lltrans.h"
 
-#include <boost/foreach.hpp>
 #include "boost/lexical_cast.hpp"
 
 const S32Days CONVERSATION_LIFETIME = (S32Days)30; // lifetime of LLConversation is 30 days by spec
@@ -392,7 +391,7 @@ void LLConversationLog::deleteBackupLogs()
 	std::vector<std::string> backup_logs;
 	getListOfBackupLogs(backup_logs);
 
-	BOOST_FOREACH(const std::string& fullpath, backup_logs)
+	for (const std::string& fullpath : backup_logs)
 	{
 		LLFile::remove(fullpath);
 	}
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index 9ec4fb085b..fa5248920d 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -37,8 +37,6 @@
 #include "llimview.h" //For LLIMModel
 #include "lltrans.h"
 
-#include <boost/foreach.hpp>
-
 //
 // Conversation items : common behaviors
 //
@@ -293,8 +291,7 @@ void LLConversationItemSession::updateName(LLConversationItemParticipant* partic
 		// In the case of a P2P conversation, we need to grab the name of the other participant in the session instance itself
 		// as we do not create participants for such a session.
 
-		LLFolderViewModelItem * itemp;
-		BOOST_FOREACH(itemp, mChildren)
+		for (auto itemp : mChildren)
 		{
 			LLConversationItem* current_participant = dynamic_cast<LLConversationItem*>(itemp);
 			// Add the avatar uuid to the list (except if it's the own agent uuid)
diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp
index b66eb754a4..b0d88159c1 100644
--- a/indra/newview/llexternaleditor.cpp
+++ b/indra/newview/llexternaleditor.cpp
@@ -32,7 +32,6 @@
 #include "llprocess.h"
 #include "llsdutil.h"
 #include "llstring.h"
-#include <boost/foreach.hpp>
 
 // static
 const std::string LLExternalEditor::sFilenameMarker = "%s";
@@ -93,7 +92,7 @@ LLExternalEditor::EErrorCode LLExternalEditor::run(const std::string& file_path)
 	params.executable = mProcessParams.executable;
 
 	// Substitute the filename marker in the command with the actual passed file name.
-	BOOST_FOREACH(const std::string& arg, mProcessParams.args)
+	for (const std::string& arg : mProcessParams.args)
 	{
 		std::string fixed(arg);
 		LLStringUtil::replaceString(fixed, sFilenameMarker, file_path);
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index f997dc9910..92c54d2ffe 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -57,7 +57,6 @@
 #include "llsdserialize.h"
 #include "llviewermenu.h" // is_agent_mappable
 #include "llviewerobjectlist.h"
-#include "boost/foreach.hpp"
 
 
 const S32 EVENTS_PER_IDLE_LOOP_CURRENT_SESSION = 80;
@@ -808,9 +807,9 @@ void LLFloaterIMContainer::getDetachedConversationFloaters(floater_list_t& float
 	typedef conversations_widgets_map::value_type conv_pair;
 	LLFloaterIMNearbyChat *nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
 
-	BOOST_FOREACH(conv_pair item, mConversationsWidgets)
+	for (const auto& [key, fvi] : mConversationsWidgets)
 	{
-		LLConversationViewSession* widget = dynamic_cast<LLConversationViewSession*>(item.second);
+		LLConversationViewSession* widget = dynamic_cast<LLConversationViewSession*>(fvi);
 		if (widget)
 		{
 			LLFloater* session_floater = widget->getSessionFloater();
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 6ac8bbee76..eb979335f8 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -91,8 +91,6 @@
 #include "llvoavatarself.h"
 #include "llwearablelist.h"
 
-#include <boost/foreach.hpp>
-
 BOOL LLInventoryState::sWearNewClothing = FALSE;
 LLUUID LLInventoryState::sWearNewClothingTransactionID;
 std::list<LLUUID> LLInventoryAction::sMarketplaceFolders;
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index ca88f90ea9..55a947a09d 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -42,7 +42,6 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/regex.hpp>
-#include <boost/foreach.hpp>
 
 #if LL_MSVC
 #pragma warning(push)  
@@ -709,7 +708,7 @@ bool LLLogChat::moveTranscripts(const std::string originDirectory,
 	std::string backupFileName;
 	unsigned backupFileCount;
 
-	BOOST_FOREACH(const std::string& fullpath, listOfFilesToMove)
+	for (const std::string& fullpath : listOfFilesToMove)
 	{
 		backupFileCount = 0;
 		newFullPath = targetDirectory + fullpath.substr(originDirectory.length(), std::string::npos);
@@ -780,7 +779,7 @@ void LLLogChat::deleteTranscripts()
 	getListOfTranscriptFiles(list_of_transcriptions);
 	getListOfTranscriptBackupFiles(list_of_transcriptions);
 
-	BOOST_FOREACH(const std::string& fullpath, list_of_transcriptions)
+	for (const std::string& fullpath : list_of_transcriptions)
 	{
 		S32 retry_count = 0;
 		while (retry_count < 5)
diff --git a/indra/newview/llmarketplacenotifications.cpp b/indra/newview/llmarketplacenotifications.cpp
index 0886f9a990..02bd9e1f34 100644
--- a/indra/newview/llmarketplacenotifications.cpp
+++ b/indra/newview/llmarketplacenotifications.cpp
@@ -33,7 +33,6 @@
 
 #include "llerror.h"
 
-#include <boost/foreach.hpp>
 #include <boost/signals2.hpp>
 
 
@@ -54,7 +53,7 @@ namespace LLMarketplaceInventoryNotifications
 			llassert(!no_copy_payloads.empty());
 			llassert(no_copy_cb_action != NULL);
 			
-			BOOST_FOREACH(const LLSD& payload, no_copy_payloads)
+			for (const LLSD& payload : no_copy_payloads)
 			{
 				(*no_copy_cb_action)(payload);
 			}
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index b06131cf38..3f6a86106a 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -34,9 +34,6 @@
 #include "llfloaterimnearbychathandler.h"
 #include "llnotifications.h"
 
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-
 using namespace LLNotificationsUI;
 
 //--------------------------------------------------------------------------
@@ -53,15 +50,15 @@ LLNotificationManager::~LLNotificationManager()
 //--------------------------------------------------------------------------
 void LLNotificationManager::init()
 {
-	mChannels.push_back(new LLScriptHandler());
-	mChannels.push_back(new LLTipHandler());
-	mChannels.push_back(new LLGroupHandler());
-	mChannels.push_back(new LLAlertHandler("Alerts", "alert", false));
-	mChannels.push_back(new LLAlertHandler("AlertModal", "alertmodal", true));
-	mChannels.push_back(new LLOfferHandler());
-	mChannels.push_back(new LLHintHandler());
-	mChannels.push_back(new LLBrowserNotification());
-	mChannels.push_back(new LLIMHandler());
+	mChannels.emplace_back(new LLScriptHandler());
+	mChannels.emplace_back(new LLTipHandler());
+	mChannels.emplace_back(new LLGroupHandler());
+	mChannels.emplace_back(new LLAlertHandler("Alerts", "alert", false));
+	mChannels.emplace_back(new LLAlertHandler("AlertModal", "alertmodal", true));
+	mChannels.emplace_back(new LLOfferHandler());
+	mChannels.emplace_back(new LLHintHandler());
+	mChannels.emplace_back(new LLBrowserNotification());
+	mChannels.emplace_back(new LLIMHandler());
   
 	mChatHandler = std::shared_ptr<LLFloaterIMNearbyChatHandler>(new LLFloaterIMNearbyChatHandler());
 }
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index de988555c5..432f18139c 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -28,8 +28,6 @@
 #include "llviewerprecompiledheaders.h" // must be first include
 #include "lloutfitgallery.h"
 
-#include <boost/foreach.hpp>
-
 // llcommon
 #include "llcommonutils.h"
 #include "llfilesystem.h"
@@ -1253,7 +1251,7 @@ void LLOutfitGallery::refreshOutfit(const LLUUID& category_id)
                 sub_cat_array,
                 outfit_item_array,
                 LLInventoryModel::EXCLUDE_TRASH);
-            BOOST_FOREACH(LLViewerInventoryItem* outfit_item, outfit_item_array)
+            for (LLViewerInventoryItem* outfit_item : outfit_item_array)
             {
                 LLViewerInventoryItem* linked_item = outfit_item->getLinkedItem();
                 LLUUID asset_id, inv_id;
diff --git a/indra/newview/llpanelexperiencelisteditor.cpp b/indra/newview/llpanelexperiencelisteditor.cpp
index 0fdb9a57f3..854a32621a 100644
--- a/indra/newview/llpanelexperiencelisteditor.cpp
+++ b/indra/newview/llpanelexperiencelisteditor.cpp
@@ -40,7 +40,6 @@
 #include "lltextbox.h"
 #include "lltrans.h"
 #include "llsdutil.h"
-#include <boost/foreach.hpp>
 
 
 static LLPanelInjector<LLPanelExperienceListEditor> t_panel_experience_list_editor("panel_experience_list_editor");
@@ -96,7 +95,7 @@ void LLPanelExperienceListEditor::addExperienceIds( const uuid_vec_t& experience
 void LLPanelExperienceListEditor::setExperienceIds( const LLSD& experience_ids )
 {
 	mExperienceIds.clear();
-	BOOST_FOREACH(LLSD uuid, llsd::inArray(experience_ids))
+	for (LLSD uuid : llsd::inArray(experience_ids))
 	{
 		// Using insert(range) doesn't work here because the conversion from
 		// LLSD to LLUUID is ambiguous: have to specify asUUID() for each entry.
diff --git a/indra/newview/llpanelgroupbulkban.cpp b/indra/newview/llpanelgroupbulkban.cpp
index cf1f0bc32f..2b6bf1bcd6 100644
--- a/indra/newview/llpanelgroupbulkban.cpp
+++ b/indra/newview/llpanelgroupbulkban.cpp
@@ -49,8 +49,6 @@
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 
-#include <boost/foreach.hpp>
-
 LLPanelGroupBulkBan::LLPanelGroupBulkBan(const LLUUID& group_id) : LLPanelGroupBulk(group_id)
 {
 	// Pass on construction of this panel to the control factory.
@@ -163,8 +161,8 @@ void LLPanelGroupBulkBan::submit()
 	// remove already banned users and yourself from request.
 	std::vector<LLAvatarName> banned_avatar_names;
 	std::vector<LLAvatarName> out_of_limit_names;
-	bool banning_self = FALSE;
-	std::vector<LLUUID>::iterator conflict = std::find(banned_agent_list.begin(), banned_agent_list.end(), gAgent.getID());
+	bool banning_self{ false };
+	std::vector<LLUUID>::iterator conflict = std::find(banned_agent_list.begin(), banned_agent_list.end(), gAgentID);
 	if (conflict != banned_agent_list.end())
 	{
 		banned_agent_list.erase(conflict);
@@ -172,18 +170,17 @@ void LLPanelGroupBulkBan::submit()
 	}
 	if (group_datap)
 	{
-		BOOST_FOREACH(const LLGroupMgrGroupData::ban_list_t::value_type& group_ban_pair, group_datap->mBanList)
+		for (const auto& [group_ban_agent_id, group_ban_data] : group_datap->mBanList)
 		{
-			const LLUUID& group_ban_agent_id = group_ban_pair.first;
 			std::vector<LLUUID>::iterator conflict = std::find(banned_agent_list.begin(), banned_agent_list.end(), group_ban_agent_id);
 			if (conflict != banned_agent_list.end())
 			{
 				LLAvatarName av_name;
 				LLAvatarNameCache::get(group_ban_agent_id, &av_name);
-				banned_avatar_names.push_back(av_name);
+				banned_avatar_names.emplace_back(av_name);
 
 				banned_agent_list.erase(conflict);
-				if (banned_agent_list.size() == 0)
+				if (banned_agent_list.empty())
 				{
 					break;
 				}
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index f6628293ee..9157d20f98 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -46,8 +46,6 @@
 #include "llviewercontrol.h"  // HACK for destinations guide on startup
 #include "llinventorymodel.h" // HACK to disable starter avatars button for NUX
 
-#include <boost/foreach.hpp>
-
 LLToolBarView* gToolBarView = NULL;
 
 static LLDefaultChildRegistry::Register<LLToolBarView> r("toolbar_view");
@@ -282,7 +280,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 			LLToolBarEnums::ButtonType button_type = toolbar_set.left_toolbar.button_display_mode;
 			mToolbars[LLToolBarEnums::TOOLBAR_LEFT]->setButtonType(button_type);
 		}
-		BOOST_FOREACH(const LLCommandId::Params& command_params, toolbar_set.left_toolbar.commands)
+		for (const LLCommandId::Params& command_params : toolbar_set.left_toolbar.commands)
 		{
 			if (!addCommandInternal(LLCommandId(command_params), mToolbars[LLToolBarEnums::TOOLBAR_LEFT]))
 			{
@@ -297,7 +295,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 			LLToolBarEnums::ButtonType button_type = toolbar_set.right_toolbar.button_display_mode;
 			mToolbars[LLToolBarEnums::TOOLBAR_RIGHT]->setButtonType(button_type);
 		}
-		BOOST_FOREACH(const LLCommandId::Params& command_params, toolbar_set.right_toolbar.commands)
+		for (const LLCommandId::Params& command_params : toolbar_set.right_toolbar.commands)
 		{
 			if (!addCommandInternal(LLCommandId(command_params), mToolbars[LLToolBarEnums::TOOLBAR_RIGHT]))
 			{
@@ -312,7 +310,7 @@ bool LLToolBarView::loadToolbars(bool force_default)
 			LLToolBarEnums::ButtonType button_type = toolbar_set.bottom_toolbar.button_display_mode;
 			mToolbars[LLToolBarEnums::TOOLBAR_BOTTOM]->setButtonType(button_type);
 		}
-		BOOST_FOREACH(const LLCommandId::Params& command_params, toolbar_set.bottom_toolbar.commands)
+		for (const LLCommandId::Params& command_params : toolbar_set.bottom_toolbar.commands)
 		{
 			if (!addCommandInternal(LLCommandId(command_params), mToolbars[LLToolBarEnums::TOOLBAR_BOTTOM]))
 			{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ada898b98c..1dbb58a910 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -119,8 +119,6 @@
 #include "llviewerregion.h"
 #include "llfloaterregionrestarting.h"
 
-#include <boost/foreach.hpp>
-
 #include "llnotificationmanager.h" //
 #include "llexperiencecache.h"
 
@@ -5620,7 +5618,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 		BOOL caution = FALSE;
 		S32 count = 0;
 		std::string perms;
-		BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)
+		for (const script_perm_t& script_perm : SCRIPT_PERMISSIONS)
 		{
 			if ((orig_questions & script_perm.permbit)
 				&& script_perm.caution)
@@ -5864,7 +5862,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 		S32 known_questions = 0;
 		bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
 		// check the received permission flags against each permission
-		BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)
+		for (const script_perm_t& script_perm : SCRIPT_PERMISSIONS)
 		{
 			if (questions & script_perm.permbit)
 			{
-- 
cgit v1.2.3


From b3bb13b00647a2bb06b2657bd1f6110de3f5f039 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 9 Jan 2024 09:42:42 +0100
Subject: Simplify expression

---
 indra/llui/lllayoutstack.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 9ccf3b1627..2769a96875 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -408,9 +408,9 @@ void LLLayoutStack::updateLayout()
 	llassert(total_visible_fraction < 1.05f);
 
 	// don't need spacing after last panel
+	if (!mPanels.empty())
 	{
-		LLLayoutPanel* panelp = mPanels.empty() ? nullptr : mPanels.back();
-		space_to_distribute += panelp ? ll_round((F32)mPanelSpacing * panelp->getVisibleAmount()) : 0;
+		space_to_distribute += ll_round(F32(mPanelSpacing) * mPanels.back()->getVisibleAmount());
 	}
 
 	S32 remaining_space = space_to_distribute;
-- 
cgit v1.2.3


From 5b2d5a68542833fc2d89cc2917a378d63853975a Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 9 Jan 2024 21:02:18 +0200
Subject: DRTVWR-599 OSX buildfix

---
 indra/llui/lltoolbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 04772ddc73..204b8b9984 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -218,7 +218,7 @@ void LLToolBar::initFromParams(const LLToolBar::Params& p)
 	
 	mCenteringStack->addChild(LLUICtrlFactory::create<LLLayoutPanel>(border_panel_p));
 
-	for (const LLCommandId& id : p.commands)
+	for (const auto& id : p.commands)
 	{
 		addCommand(id);
 	}
-- 
cgit v1.2.3


From ffe0948b4a28abb1def26dabd32b292d413e55d1 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 9 Jan 2024 21:19:07 +0200
Subject: DRTVWR-599 OSX buildfix #2

remove unused typedef
---
 indra/newview/llfloaterimcontainer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 92c54d2ffe..8f12abe7a5 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -804,7 +804,6 @@ void LLFloaterIMContainer::setVisible(BOOL visible)
 
 void LLFloaterIMContainer::getDetachedConversationFloaters(floater_list_t& floaters)
 {
-	typedef conversations_widgets_map::value_type conv_pair;
 	LLFloaterIMNearbyChat *nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
 
 	for (const auto& [key, fvi] : mConversationsWidgets)
-- 
cgit v1.2.3


From 284a3cbee95a001c9f7f897a7dd6f81a4b974bd1 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 9 Jan 2024 21:54:22 +0200
Subject: DRTVWR-599 OSX buildfix #3

---
 indra/newview/llappviewer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b85ae408d4..2599b1e4a0 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1206,7 +1206,7 @@ bool LLAppViewer::init()
             LLSD item(LeapCommand);
             LeapCommand.append(item);
         }
-        for (const std::string& leap : llsd::inArray(LeapCommand))
+        for (const auto& leap : llsd::inArray(LeapCommand))
         {
             LL_INFOS("InitInfo") << "processing --leap \"" << leap << '"' << LL_ENDL;
             // We don't have any better description of this plugin than the
-- 
cgit v1.2.3


From 983a3c7207bcb233fb5a1cfdfbed8b9a3f992a73 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 9 Jan 2024 15:52:33 -0600
Subject: SL-20780 Clean up some dead code.

---
 indra/newview/llgltfmateriallist.cpp | 171 +----------------------------------
 indra/newview/llgltfmateriallist.h   |   4 -
 indra/newview/llstartup.cpp          |   3 -
 indra/newview/llviewerobject.cpp     |   5 -
 indra/newview/llviewerregion.cpp     |  11 ---
 indra/newview/llviewerregion.h       |   2 -
 6 files changed, 2 insertions(+), 194 deletions(-)

diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 8919229c78..92c58a2dbc 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -139,69 +139,18 @@ static bool is_valid_update(const LLSD& data)
 }
 #endif
 
-class LLGLTFMaterialOverrideDispatchHandler : public LLDispatchHandler
+class LLGLTFMaterialOverrideDispatchHandler
 {
     LOG_CLASS(LLGLTFMaterialOverrideDispatchHandler);
 public:
     LLGLTFMaterialOverrideDispatchHandler() = default;
-    ~LLGLTFMaterialOverrideDispatchHandler() override = default;
+    ~LLGLTFMaterialOverrideDispatchHandler() = default;
 
     void addCallback(void(*callback)(const LLUUID& object_id, S32 side))
     {
         mSelectionCallbacks.push_back(callback);
     }
 
-    bool operator()(const LLDispatcher* dispatcher, const std::string& key, const LLUUID& invoice, const sparam_t& strings) override
-    {
-        LL_PROFILE_ZONE_SCOPED;
-        // receive override data from simulator via LargeGenericMessage
-        // message should have:
-        //  object_id - UUID of LLViewerObject
-        //  sides - array of S32 indices of texture entries
-        //  gltf_json - array of corresponding Strings of GLTF json for override data
-
-        LLSD message;
-        bool success = true;
-#if 0 //deprecated
-        for(const std::string& llsdRaw : strings)
-        {
-            std::istringstream llsdData(llsdRaw);
-            if (!LLSDSerialize::deserialize(message, llsdData, llsdRaw.length()))
-            {
-                LL_WARNS() << "LLGLTFMaterialOverrideDispatchHandler: Attempted to read parameter data into LLSD but failed:" << llsdRaw << LL_ENDL;
-                success = false;
-                continue;
-            }
-
-            LLGLTFOverrideCacheEntry object_override;
-            if (!object_override.fromLLSD(message))
-            {
-                // malformed message, nothing we can do to handle it
-                LL_DEBUGS("GLTF") << "Message without id:" << message << LL_ENDL;
-                success = false;
-                continue;
-            }
-
-            // Cache the data
-            {
-                LLViewerRegion * region = LLWorld::instance().getRegionFromHandle(object_override.mRegionHandle);
-
-                if (region)
-                {
-                    region->cacheFullUpdateGLTFOverride(object_override);
-                }
-                else
-                {
-                    LL_WARNS("GLTF") << "could not access region for material overrides message cache, region_handle: " << LL_ENDL;
-                }
-            }
-            applyData(object_override);
-        }
-
-#endif
-        return success;
-    }
-
     void doSelectionCallbacks(const LLUUID& object_id, S32 side)
     {
         for (auto& callback : mSelectionCallbacks)
@@ -210,112 +159,6 @@ public:
         }
     }
 
-    void applyData(const LLGLTFOverrideCacheEntry &object_override)
-    {
-        // Parse the data
-
-#if 0 // DEPRECATED
-        LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
-        LL::WorkQueue::ptr_t general_queue = LL::WorkQueue::getInstance("General");
-
-        struct ReturnData
-        {
-        public:
-            LLGLTFMaterial mMaterial;
-            S32 mSide;
-            bool mSuccess;
-        };
-
-        if (!object_override.mSides.empty())
-        {
-            // fromJson() is performance heavy offload to a thread.
-            main_queue->postTo(
-                general_queue,
-                [sides=object_override.mSides]() // Work done on general queue
-            {
-                std::vector<ReturnData> results;
-
-                results.reserve(sides.size());
-                // parse json
-                std::unordered_map<S32, LLSD>::const_iterator iter = sides.begin();
-                std::unordered_map<S32, LLSD>::const_iterator end = sides.end();
-                while (iter != end)
-                {
-                    ReturnData result;
-
-                    result.mMaterial.applyOverrideLLSD(iter->second);
-                    
-                    result.mSuccess = true;
-                    result.mSide = iter->first;
-
-                    results.push_back(result);
-                    iter++;
-                }
-                return results;
-            },
-            [object_id=object_override.mObjectId, this](std::vector<ReturnData> results) // Callback to main thread
-            {
-                LLViewerObject * obj = gObjectList.findObject(object_id);
-
-                if (results.size() > 0 )
-                {
-                    std::unordered_set<S32> side_set;
-
-                    for (auto const & result : results)
-                    {
-                        S32 side = result.mSide;
-                        if (result.mSuccess)
-                        {
-                            // copy to heap here because LLTextureEntry is going to take ownership with an LLPointer
-                            LLGLTFMaterial * material = new LLGLTFMaterial(result.mMaterial);
-
-                            // flag this side to not be nulled out later
-                            side_set.insert(side);
-
-                            if (obj)
-                            {
-                                obj->setTEGLTFMaterialOverride(side, material);
-                            }
-                        }
-
-                        // unblock material editor
-                        if (obj && obj->getTE(side) && obj->getTE(side)->isSelected())
-                        {
-                            doSelectionCallbacks(object_id, side);
-                        }
-                    }
-
-                    if (obj && side_set.size() != obj->getNumTEs())
-                    { // object exists and at least one texture entry needs to have its override data nulled out
-                        for (int i = 0; i < obj->getNumTEs(); ++i)
-                        {
-                            if (side_set.find(i) == side_set.end())
-                            {
-                                obj->setTEGLTFMaterialOverride(i, nullptr);
-                                if (obj->getTE(i) && obj->getTE(i)->isSelected())
-                                {
-                                    doSelectionCallbacks(object_id, i);
-                                }
-                            }
-                        }
-                    }
-                }
-                else if (obj)
-                { // override list was empty or an error occurred, null out all overrides for this object
-                    for (int i = 0; i < obj->getNumTEs(); ++i)
-                    {
-                        obj->setTEGLTFMaterialOverride(i, nullptr);
-                        if (obj->getTE(i) && obj->getTE(i)->isSelected())
-                        {
-                            doSelectionCallbacks(obj->getID(), i);
-                        }
-                    }
-                }
-            });
-        }
-#endif
-    }
-
 private:
 
     std::vector<void(*)(const LLUUID& object_id, S32 side)> mSelectionCallbacks;
@@ -821,12 +664,6 @@ void LLGLTFMaterialList::flushMaterials()
     }
 }
 
-// static
-void LLGLTFMaterialList::registerCallbacks()
-{
-    gGenericDispatcher.addHandler("GLTFMaterialOverride", &handle_gltf_override_message);
-}
-
 // static
 void LLGLTFMaterialList::modifyMaterialCoro(std::string cap_url, LLSD overrides, void(*done_callback)(bool) )
 {
@@ -864,7 +701,3 @@ void LLGLTFMaterialList::modifyMaterialCoro(std::string cap_url, LLSD overrides,
     }
 }
 
-void LLGLTFMaterialList::loadCacheOverrides(const LLGLTFOverrideCacheEntry& override)
-{
-    handle_gltf_override_message.applyData(override);
-}
diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h
index 7317214019..f1c4ce20f9 100644
--- a/indra/newview/llgltfmateriallist.h
+++ b/indra/newview/llgltfmateriallist.h
@@ -52,8 +52,6 @@ public:
 
     void flushMaterials();
 
-    static void registerCallbacks();
-
     // Queue an modification of a material that we want to send to the simulator.  Call "flushUpdates" to flush pending updates.
     //  id - ID of object to modify
     //  side - TexureEntry index to modify, or -1 for all sides
@@ -99,8 +97,6 @@ public:
     // any override data that arrived before the object was ready to receive it
     void applyQueuedOverrides(LLViewerObject* obj);
 
-    static void loadCacheOverrides(const LLGLTFOverrideCacheEntry& override);
-
     // Apply an override update with the given data
     void applyOverrideMessage(LLMessageSystem* msg, const std::string& data);
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index d0b76848f7..8681bf6e2a 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1511,9 +1511,6 @@ bool idle_startup()
 		gXferManager->registerCallbacks(gMessageSystem);
 		display_startup();
 
-		LLGLTFMaterialList::registerCallbacks();
-		display_startup();
-
 		LLStartUp::initNameCache();
 		display_startup();
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d4346ee2d9..a741f57753 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5041,11 +5041,6 @@ void LLViewerObject::updateTEMaterialTextures(U8 te)
                     LLViewerObject* obj = gObjectList.findObject(id);
                     if (obj)
                     {
-                        LLViewerRegion* region = obj->getRegion();
-                        if(region)
-                        {
-                            region->loadCacheMiscExtras(obj->getLocalID());
-                        }
                         obj->markForUpdate();
                     }
                 });
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 452dcdd8fd..60862ae5bd 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1879,8 +1879,6 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
 		addActiveCacheEntry(entry);
 	}
 
-    loadCacheMiscExtras(entry->getLocalID());
-
 	return obj;
 }
 
@@ -3655,15 +3653,6 @@ std::string LLViewerRegion::getSimHostName()
 	return std::string("...");
 }
 
-void LLViewerRegion::loadCacheMiscExtras(U32 local_id)
-{
-    auto iter = mImpl->mGLTFOverridesLLSD.find(local_id);
-    if (iter != mImpl->mGLTFOverridesLLSD.end())
-    {
-        LLGLTFMaterialList::loadCacheOverrides(iter->second);
-    }
-}
-
 void LLViewerRegion::applyCacheMiscExtras(LLViewerObject* obj)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_DISPLAY;
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index a409d837a4..622490c881 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -435,8 +435,6 @@ private:
 	bool isNonCacheableObjectCreated(U32 local_id);	
 
 public:
-	void loadCacheMiscExtras(U32 local_id);
-
     void applyCacheMiscExtras(LLViewerObject* obj);
 
 	struct CompareDistance
-- 
cgit v1.2.3


From 390a5031dcdbc6bf191f49a105021c8a707a9949 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 10 Jan 2024 01:43:36 +0200
Subject: SL-19555 Fix picker failing to highlight default material in
 inventory

---
 indra/newview/llfloaterchangeitemthumbnail.cpp |   3 +-
 indra/newview/llinventoryfunctions.cpp         |   6 ++
 indra/newview/llinventoryfunctions.h           |  22 +++++
 indra/newview/llpanelface.cpp                  |   2 +-
 indra/newview/llpanelprofile.cpp               |   6 +-
 indra/newview/lltexturectrl.cpp                | 123 +++++++++++++++----------
 indra/newview/lltexturectrl.h                  |  24 ++---
 7 files changed, 119 insertions(+), 67 deletions(-)

diff --git a/indra/newview/llfloaterchangeitemthumbnail.cpp b/indra/newview/llfloaterchangeitemthumbnail.cpp
index 0301627c15..776f8dc785 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.cpp
+++ b/indra/newview/llfloaterchangeitemthumbnail.cpp
@@ -751,7 +751,8 @@ void LLFloaterChangeItemThumbnail::showTexturePicker(const LLUUID &thumbnail_id)
             PERM_NONE,
             PERM_NONE,
             FALSE,
-            NULL);
+            NULL,
+            PICK_TEXTURE);
 
         mPickerHandle = floaterp->getHandle();
 
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 4aeacae6ed..207dd692a8 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2554,6 +2554,12 @@ bool LLIsOfAssetType::operator()(LLInventoryCategory* cat, LLInventoryItem* item
 	return FALSE;
 }
 
+bool LLAssetIDAndTypeMatches::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+{
+    if (!item) return false;
+    return (item->getActualType() == mType && item->getAssetUUID() == mAssetID);
+}
+
 bool LLIsValidItemLink::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 {
 	LLViewerInventoryItem *vitem = dynamic_cast<LLViewerInventoryItem*>(item);
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 925217dda3..2056a7f6a3 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -278,6 +278,28 @@ protected:
 	LLAssetType::EType mType;
 };
 
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLAssetIDAndTypeMatches
+//
+// Implementation of a LLInventoryCollectFunctor which returns TRUE if
+// the item matches both asset type and asset id.
+// This is needed in case you are looking for a specific type with default id
+// (since null is default for multiple asset types)
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLAssetIDAndTypeMatches: public LLInventoryCollectFunctor
+{
+public:
+    LLAssetIDAndTypeMatches(const LLUUID& asset_id, LLAssetType::EType type): mAssetID(asset_id), mType(type) {}
+    virtual ~LLAssetIDAndTypeMatches() {}
+    bool operator()(LLInventoryCategory* cat,
+                    LLInventoryItem* item);
+
+protected:
+    LLUUID mAssetID;
+    LLAssetType::EType mType;
+};
+
 class LLIsValidItemLink : public LLInventoryCollectFunctor
 {
 public:
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 033c396d08..269ae23eb8 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -330,7 +330,7 @@ BOOL	LLPanelFace::postBuild()
         pbr_ctrl->setImmediateFilterPermMask(PERM_NONE);
         pbr_ctrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
         pbr_ctrl->setBakeTextureEnabled(false);
-        pbr_ctrl->setInventoryPickType(LLTextureCtrl::PICK_MATERIAL);
+        pbr_ctrl->setInventoryPickType(PICK_MATERIAL);
     }
 
 	mTextureCtrl = getChild<LLTextureCtrl>("texture control");
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index ffbed778c1..8114e05a94 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -1969,7 +1969,8 @@ void LLPanelProfileSecondLife::onShowTexturePicker()
                 PERM_NONE,
                 PERM_NONE,
                 FALSE,
-                NULL);
+                NULL,
+                PICK_TEXTURE);
 
             mFloaterTexturePickerHandle = texture_floaterp->getHandle();
 
@@ -2304,7 +2305,8 @@ void LLPanelProfileFirstLife::onChangePhoto()
                 PERM_NONE,
                 PERM_NONE,
                 FALSE,
-                NULL);
+                NULL,
+                PICK_TEXTURE);
 
             mFloaterTexturePickerHandle = texture_floaterp->getHandle();
 
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 28e01c6c21..233b864fba 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -151,7 +151,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	PermissionMask immediate_filter_perm_mask,
 	PermissionMask dnd_filter_perm_mask,
 	BOOL can_apply_immediately,
-	LLUIImagePtr fallback_image)
+	LLUIImagePtr fallback_image,
+    EPickInventoryType pick_type)
 :	LLFloater(LLSD()),
 	mOwner( owner ),
 	mImageAssetID( image_asset_id ),
@@ -181,7 +182,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mSetImageAssetIDCallback(NULL),
 	mOnUpdateImageStatsCallback(NULL),
 	mBakeTextureEnabled(FALSE),
-    mInventoryPickType(LLTextureCtrl::PICK_TEXTURE)
+    mInventoryPickType(pick_type)
 {
 	mCanApplyImmediately = can_apply_immediately;
 	buildFromFile("floater_texture_ctrl.xml");
@@ -225,7 +226,7 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selecti
 
                 LLInventoryItem* itemp = gInventory.getItem(inv_view->getUUID());
 
-                if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL
+                if (mInventoryPickType == PICK_MATERIAL
                     && mImageAssetID == LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID
                     && itemp && itemp->getAssetUUID().isNull())
                 {
@@ -266,7 +267,7 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selecti
 void LLFloaterTexturePicker::setImageIDFromItem(const LLInventoryItem* itemp, bool set_selection)
 {
     LLUUID asset_id = itemp->getAssetUUID();
-    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL && asset_id.isNull())
+    if (mInventoryPickType == PICK_MATERIAL && asset_id.isNull())
     {
         // If an inventory item has a null asset, consider it a valid blank material(gltf)
         asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
@@ -425,11 +426,11 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
     bool is_material = cargo_type == DAD_MATERIAL;
 
     bool allow_dnd = false;
-    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+    if (mInventoryPickType == PICK_MATERIAL)
     {
         allow_dnd = is_material;
     }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
+    else if (mInventoryPickType == PICK_TEXTURE)
     {
         allow_dnd = is_texture || is_mesh;
     }
@@ -602,9 +603,7 @@ BOOL LLFloaterTexturePicker::postBuild()
 		// don't put keyboard focus on selected item, because the selection callback
 		// will assume that this was user input
 
-		
-
-		if(!mImageAssetID.isNull())
+		if(!mImageAssetID.isNull() || mInventoryPickType == PICK_MATERIAL)
 		{
 			mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO);
 		}
@@ -661,7 +660,7 @@ void LLFloaterTexturePicker::draw()
         mGLTFMaterial = NULL;
         if (mImageAssetID.notNull())
         {
-            if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+            if (mInventoryPickType == PICK_MATERIAL)
             {
                 mGLTFMaterial = (LLFetchedGLTFMaterial*) gGLTFMaterialList.getMaterial(mImageAssetID);
                 llassert(mGLTFMaterial == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(gGLTFMaterialList.getMaterial(mImageAssetID)) != nullptr);
@@ -786,27 +785,43 @@ void LLFloaterTexturePicker::draw()
 
 const LLUUID& LLFloaterTexturePicker::findItemID(const LLUUID& asset_id, BOOL copyable_only, BOOL ignore_library)
 {
-    LLUUID loockup_id = asset_id;
-	if (loockup_id.isNull())
+	if (asset_id.isNull())
 	{
-        if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
-        {
-            loockup_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
-        }
-        else
-        {
-            return LLUUID::null;
-        }
+        // null asset id means, no material or texture assigned
+        return LLUUID::null;
 	}
 
+    LLUUID loockup_id = asset_id;
+    if (mInventoryPickType == PICK_MATERIAL && loockup_id == LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID)
+    {
+        // default asset id means we are looking for an inventory item with a default asset UUID (null)
+        loockup_id = LLUUID::null;
+    }
+
 	LLViewerInventoryCategory::cat_array_t cats;
 	LLViewerInventoryItem::item_array_t items;
-	LLAssetIDMatches asset_id_matches(loockup_id);
-	gInventory.collectDescendentsIf(LLUUID::null,
-							cats,
-							items,
-							LLInventoryModel::INCLUDE_TRASH,
-							asset_id_matches);
+
+    if (loockup_id.isNull())
+    {
+        // looking for a material with a null id, null id is shared by a lot
+        // of objects as a default value, so have to filter by type as well
+        LLAssetIDAndTypeMatches matches(loockup_id, LLAssetType::AT_MATERIAL);
+        gInventory.collectDescendentsIf(LLUUID::null,
+                                        cats,
+                                        items,
+                                        LLInventoryModel::INCLUDE_TRASH,
+                                        matches);
+    }
+    else
+    {
+        LLAssetIDMatches asset_id_matches(loockup_id);
+        gInventory.collectDescendentsIf(LLUUID::null,
+                                        cats,
+                                        items,
+                                        LLInventoryModel::INCLUDE_TRASH,
+                                        asset_id_matches);
+    }
+
 
 	if (items.size())
 	{
@@ -871,7 +886,7 @@ void LLFloaterTexturePicker::commitCallback(LLTextureCtrl::ETexturePickOp op)
 
                     LLInventoryItem* itemp = gInventory.getItem(inv_view->getUUID());
 
-                    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL
+                    if (mInventoryPickType == PICK_MATERIAL
                         && mImageAssetID == LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID
                         && itemp && itemp->getAssetUUID().isNull())
                     {
@@ -1064,15 +1079,15 @@ void LLFloaterTexturePicker::onBtnAdd(void* userdata)
 {
     LLFloaterTexturePicker* self = (LLFloaterTexturePicker*)userdata;
 
-    if (self->mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
+    if (self->mInventoryPickType == PICK_TEXTURE_MATERIAL)
     {
         LLFilePickerReplyThread::startPicker(boost::bind(&onPickerCallback, _1, self->getHandle()), LLFilePicker::FFLOAD_MATERIAL_TEXTURE, true);
     }
-    else if (self->mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
+    else if (self->mInventoryPickType == PICK_TEXTURE)
     {
         LLFilePickerReplyThread::startPicker(boost::bind(&onPickerCallback, _1, self->getHandle()), LLFilePicker::FFLOAD_IMAGE, true);
     }
-    else if (self->mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+    else if (self->mInventoryPickType == PICK_MATERIAL)
     {
         LLFilePickerReplyThread::startPicker(boost::bind(&onPickerCallback, _1, self->getHandle()), LLFilePicker::FFLOAD_MATERIAL, true);
     }
@@ -1351,7 +1366,7 @@ void LLFloaterTexturePicker::changeMode()
     getChild<LLCheckBoxCtrl>("hide_base_mesh_region")->setVisible(FALSE);// index == 2 ? TRUE : FALSE);
 
     bool pipette_visible = (index == PICKER_INVENTORY)
-        && (mInventoryPickType != LLTextureCtrl::PICK_MATERIAL);
+        && (mInventoryPickType != PICK_MATERIAL);
     mPipetteBtn->setVisible(pipette_visible);
 
     if (index == PICKER_BAKE)
@@ -1414,16 +1429,16 @@ void LLFloaterTexturePicker::refreshLocalList()
 {
     mLocalScrollCtrl->clearRows();
 
-    if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
+    if (mInventoryPickType == PICK_TEXTURE_MATERIAL)
     {
         LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
         LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
     }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
+    else if (mInventoryPickType == PICK_TEXTURE)
     {
         LLLocalBitmapMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
     }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+    else if (mInventoryPickType == PICK_MATERIAL)
     {
         LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(mLocalScrollCtrl);
     }
@@ -1433,18 +1448,18 @@ void LLFloaterTexturePicker::refreshInventoryFilter()
 {
     U32 filter_types = 0x0;
 
-    if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
+    if (mInventoryPickType == PICK_TEXTURE_MATERIAL)
     {
         filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
         filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
         filter_types |= 0x1 << LLInventoryType::IT_MATERIAL;
     }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
+    else if (mInventoryPickType == PICK_TEXTURE)
     {
         filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
         filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
     }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+    else if (mInventoryPickType == PICK_MATERIAL)
     {
         filter_types |= 0x1 << LLInventoryType::IT_MATERIAL;
     }
@@ -1479,13 +1494,13 @@ void LLFloaterTexturePicker::setBakeTextureEnabled(BOOL enabled)
 	onModeSelect(0, this);
 }
 
-void LLFloaterTexturePicker::setInventoryPickType(LLTextureCtrl::EPickInventoryType type)
+void LLFloaterTexturePicker::setInventoryPickType(EPickInventoryType type)
 {
     mInventoryPickType = type;
     refreshLocalList();
     refreshInventoryFilter();
 
-    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+    if (mInventoryPickType == PICK_MATERIAL)
     {
         getChild<LLButton>("Pipette")->setVisible(false);
     }
@@ -1501,7 +1516,7 @@ void LLFloaterTexturePicker::setInventoryPickType(LLTextureCtrl::EPickInventoryT
 
         setTitle(pick + mLabel);
     }
-    else if(mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+    else if(mInventoryPickType == PICK_MATERIAL)
     {
         setTitle(getString("pick_material"));
     }
@@ -1509,6 +1524,12 @@ void LLFloaterTexturePicker::setInventoryPickType(LLTextureCtrl::EPickInventoryT
     {
         setTitle(getString("pick_texture"));
     }
+
+    // refresh selection
+    if (!mImageAssetID.isNull() || mInventoryPickType == PICK_MATERIAL)
+    {
+        mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO);
+    }
 }
 
 void LLFloaterTexturePicker::setImmediateFilterPermMask(PermissionMask mask)
@@ -1543,16 +1564,16 @@ void LLFloaterTexturePicker::onPickerCallback(const std::vector<std::string>& fi
         LLFloaterTexturePicker* self = (LLFloaterTexturePicker*)handle.get();
         self->mLocalScrollCtrl->clearRows();
 
-        if (self->mInventoryPickType == LLTextureCtrl::PICK_TEXTURE_MATERIAL)
+        if (self->mInventoryPickType == PICK_TEXTURE_MATERIAL)
         {
             LLLocalBitmapMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
             LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
         }
-        else if (self->mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
+        else if (self->mInventoryPickType == PICK_TEXTURE)
         {
             LLLocalBitmapMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
         }
-        else if (self->mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+        else if (self->mInventoryPickType == PICK_MATERIAL)
         {
             LLLocalGLTFMaterialMgr::getInstance()->feedScrollList(self->mLocalScrollCtrl);
         }
@@ -1565,7 +1586,7 @@ void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te )
 	if (inventory_item_id.notNull())
 	{
 		LLToolPipette::getInstance()->setResult(TRUE, "");
-        if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+        if (mInventoryPickType == PICK_MATERIAL)
         {
             // tes have no data about material ids
             // Plus gltf materials are layered with overrides,
@@ -1807,7 +1828,8 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
 			mImmediateFilterPermMask,
 			mDnDFilterPermMask,
 			mCanApplyImmediately,
-			mFallbackImage);
+			mFallbackImage,
+			mInventoryPickType);
 		mFloaterHandle = floaterp->getHandle();
 
 		LLFloaterTexturePicker* texture_floaterp = dynamic_cast<LLFloaterTexturePicker*>(floaterp);
@@ -1828,7 +1850,6 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
 			texture_floaterp->setSetImageAssetIDCallback(boost::bind(&LLTextureCtrl::setImageAssetID, this, _1));
 
 			texture_floaterp->setBakeTextureEnabled(mBakeTextureEnabled);
-            texture_floaterp->setInventoryPickType(mInventoryPickType);
 		}
 
 		LLFloater* root_floater = gFloaterView->getParentFloater(this);
@@ -1891,7 +1912,7 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 		if (!mOpenTexPreview)
 		{
 			showPicker(FALSE);
-            if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+            if (mInventoryPickType == PICK_MATERIAL)
             {
                 //grab materials first...
                 LLInventoryModelBackgroundFetch::instance().start(gInventory.findCategoryUUIDForType(LLFolderType::FT_MATERIAL));
@@ -2089,11 +2110,11 @@ BOOL LLTextureCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
     bool is_material = cargo_type == DAD_MATERIAL;
 
     bool allow_dnd = false;
-    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+    if (mInventoryPickType == PICK_MATERIAL)
     {
         allow_dnd = is_material;
     }
-    else if (mInventoryPickType == LLTextureCtrl::PICK_TEXTURE)
+    else if (mInventoryPickType == PICK_TEXTURE)
     {
         allow_dnd = is_texture || is_mesh;
     }
@@ -2156,7 +2177,7 @@ void LLTextureCtrl::draw()
 
 		if (texture.isNull())
 		{
-            if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL)
+            if (mInventoryPickType == PICK_MATERIAL)
             {
                 LLPointer<LLFetchedGLTFMaterial> material = gGLTFMaterialList.getMaterial(mImageAssetID);
                 if (material)
@@ -2313,7 +2334,7 @@ BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)
     // no callback installed, so just set the image ids and carry on.
     LLUUID asset_id = item->getAssetUUID();
 
-    if (mInventoryPickType == LLTextureCtrl::PICK_MATERIAL && asset_id.isNull())
+    if (mInventoryPickType == PICK_MATERIAL && asset_id.isNull())
     {
         // If an inventory material has a null asset, consider it a valid blank material(gltf)
         asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 7a96eea60d..cb6ce636e0 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -72,6 +72,13 @@ enum LLPickerSource
     PICKER_UNKNOWN, // on cancel, default ids
 };
 
+typedef enum e_pick_inventory_type
+{
+    PICK_TEXTURE_MATERIAL = 0,
+    PICK_TEXTURE = 1,
+    PICK_MATERIAL = 2,
+} EPickInventoryType;
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // LLTextureCtrl
 
@@ -87,13 +94,6 @@ public:
 		TEXTURE_CANCEL
 	} ETexturePickOp;
 
-    typedef enum e_pick_inventory_type
-    {
-        PICK_TEXTURE_MATERIAL = 0,
-        PICK_TEXTURE = 1,
-        PICK_MATERIAL = 2,
-    } EPickInventoryType;
-
 public:
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
@@ -276,7 +276,7 @@ private:
 	S32						 	mLabelWidth;
 	bool						mOpenTexPreview;
 	bool						mBakeTextureEnabled;
-    LLTextureCtrl::EPickInventoryType mInventoryPickType;
+    EPickInventoryType mInventoryPickType;
 };
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -300,8 +300,8 @@ public:
 		PermissionMask immediate_filter_perm_mask,
 		PermissionMask dnd_filter_perm_mask,
 		BOOL can_apply_immediately,
-		LLUIImagePtr fallback_image_name
-		);
+		LLUIImagePtr fallback_image_name,
+		EPickInventoryType pick_type);
 
 	virtual ~LLFloaterTexturePicker();
 
@@ -369,7 +369,7 @@ public:
 	void 			setLocalTextureEnabled(BOOL enabled);
 	void 			setBakeTextureEnabled(BOOL enabled);
 
-    void setInventoryPickType(LLTextureCtrl::EPickInventoryType type);
+    void setInventoryPickType(EPickInventoryType type);
     void setImmediateFilterPermMask(PermissionMask mask);
 
     static void		onPickerCallback(const std::vector<std::string>& filenames, LLHandle<LLFloater> handle);
@@ -428,7 +428,7 @@ private:
     bool mLimitsSet;
     S32 mMaxDim;
     S32 mMinDim;
-    LLTextureCtrl::EPickInventoryType mInventoryPickType;
+    EPickInventoryType mInventoryPickType;
 
 
 	texture_selected_callback mTextureSelectedCallback;
-- 
cgit v1.2.3


From 38a89c1fe66a7002b47e3801c074304f0893cba2 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Wed, 10 Jan 2024 17:16:00 +0200
Subject: SL-20770 FIXED Picks location field not updating to different
 parcel/region

---
 indra/newview/llpanelprofilepicks.cpp | 32 ++++++++++++++++++++++++++++++++
 indra/newview/llpanelprofilepicks.h   |  7 ++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index e02ecfaa0a..5826621645 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -252,6 +252,8 @@ void LLPanelProfilePicks::onClickNewBtn()
         select_tab(true).
         label(pick_panel->getPickName()));
     updateButtons();
+
+    pick_panel->addLocationChangedCallbacks();
 }
 
 void LLPanelProfilePicks::onClickDelete()
@@ -488,6 +490,8 @@ LLPanelProfilePick::LLPanelProfilePick()
  , mLocationChanged(false)
  , mNewPick(false)
  , mIsEditing(false)
+ , mRegionCallbackConnection()
+ , mParcelCallbackConnection()
 {
 }
 
@@ -505,6 +509,15 @@ LLPanelProfilePick::~LLPanelProfilePick()
     {
         LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this);
     }
+
+    if (mRegionCallbackConnection.connected())
+    {
+        mRegionCallbackConnection.disconnect();
+    }
+    if (mParcelCallbackConnection.connected())
+    {
+        mParcelCallbackConnection.disconnect();
+    }
 }
 
 void LLPanelProfilePick::setAvatarId(const LLUUID& avatar_id)
@@ -781,6 +794,18 @@ void LLPanelProfilePick::onClickSetLocation()
 
 void LLPanelProfilePick::onClickSave()
 {
+    if (mRegionCallbackConnection.connected())
+    {
+        mRegionCallbackConnection.disconnect();
+    }
+    if (mParcelCallbackConnection.connected())
+    {
+        mParcelCallbackConnection.disconnect();
+    }
+    if (mLocationChanged) 
+    {
+        onClickSetLocation();
+    }
     sendUpdate();
 
     mLocationChanged = false;
@@ -828,6 +853,13 @@ void LLPanelProfilePick::processParcelInfo(const LLParcelData& parcel_data)
     }
 }
 
+void LLPanelProfilePick::addLocationChangedCallbacks()
+{
+    mRegionCallbackConnection = gAgent.addRegionChangedCallback([this]() { onClickSetLocation(); });
+    mParcelCallbackConnection = gAgent.addParcelChangedCallback([this]() { onClickSetLocation(); });
+}
+
+
 void LLPanelProfilePick::sendUpdate()
 {
     LLPickData pick_data;
diff --git a/indra/newview/llpanelprofilepicks.h b/indra/newview/llpanelprofilepicks.h
index 27331831d3..d56f786ff1 100644
--- a/indra/newview/llpanelprofilepicks.h
+++ b/indra/newview/llpanelprofilepicks.h
@@ -140,7 +140,9 @@ public:
     void setParcelID(const LLUUID& parcel_id) override { mParcelId = parcel_id; }
     void setErrorStatus(S32 status, const std::string& reason) override {};
 
-protected:
+    void addLocationChangedCallbacks();
+
+  protected:
 
     /**
      * Sends remote parcel info request to resolve parcel name from its ID.
@@ -239,6 +241,9 @@ protected:
     LLUUID mRequestedId;
     std::string mPickNameStr;
 
+    boost::signals2::connection mRegionCallbackConnection;
+    boost::signals2::connection mParcelCallbackConnection;
+
     bool mLocationChanged;
     bool mNewPick;
     bool                mIsEditing;
-- 
cgit v1.2.3


From fab4cfbab26948fbec9015bd2ba1e8b05c3cd9e3 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 10 Jan 2024 13:50:15 -0600
Subject: SL-20704 Fix for pathfinding debug display not working.

---
 autobuild.xml                      | 1542 ++++++++++++++++++------------------
 indra/llrender/llrendernavprim.cpp |   10 +-
 2 files changed, 783 insertions(+), 769 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 0e5a5a2a25..6098b4ffdf 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" ?>
 <llsd>
 <map>
-    <key>version</key>
-    <string>1.3</string>
-    <key>type</key>
-    <string>autobuild</string>
     <key>installables</key>
     <map>
       <key>SDL</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
+        <key>description</key>
+        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/SDL.txt</string>
+        <key>name</key>
+        <string>SDL</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -24,21 +30,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/SDL.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
         <key>version</key>
         <string>1.2.15</string>
-        <key>name</key>
-        <string>SDL</string>
-        <key>description</key>
-        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
       </map>
       <key>apr_suite</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
+        <key>description</key>
+        <string>Apache portable runtime project</string>
+        <key>license</key>
+        <string>apache</string>
+        <key>license_file</key>
+        <string>LICENSES/apr_suite.txt</string>
+        <key>name</key>
+        <string>apr_suite</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -82,21 +88,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>apache</string>
-        <key>license_file</key>
-        <string>LICENSES/apr_suite.txt</string>
-        <key>copyright</key>
-        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
         <key>version</key>
         <string>1.7.2-e935465</string>
-        <key>name</key>
-        <string>apr_suite</string>
-        <key>description</key>
-        <string>Apache portable runtime project</string>
       </map>
       <key>boost</key>
       <map>
+        <key>copyright</key>
+        <string>(see individual source files)</string>
+        <key>description</key>
+        <string>Boost C++ Libraries</string>
+        <key>license</key>
+        <string>boost 1.0</string>
+        <key>license_file</key>
+        <string>LICENSES/boost.txt</string>
+        <key>name</key>
+        <string>boost</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -140,21 +146,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>boost 1.0</string>
-        <key>license_file</key>
-        <string>LICENSES/boost.txt</string>
-        <key>copyright</key>
-        <string>(see individual source files)</string>
         <key>version</key>
         <string>1.81</string>
-        <key>name</key>
-        <string>boost</string>
-        <key>description</key>
-        <string>Boost C++ Libraries</string>
       </map>
       <key>bugsplat</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2003-2017, BugSplat</string>
+        <key>description</key>
+        <string>Bugsplat crash reporting package</string>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
+        <key>name</key>
+        <string>bugsplat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -186,21 +192,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2003-2017, BugSplat</string>
         <key>version</key>
         <string>4.0.3.0-527603a</string>
-        <key>name</key>
-        <string>bugsplat</string>
-        <key>description</key>
-        <string>Bugsplat crash reporting package</string>
       </map>
       <key>colladadom</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
+        <key>license</key>
+        <string>SCEA</string>
+        <key>license_file</key>
+        <string>LICENSES/collada.txt</string>
+        <key>name</key>
+        <string>colladadom</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -244,19 +248,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>SCEA</string>
-        <key>license_file</key>
-        <string>LICENSES/collada.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
         <key>version</key>
         <string>2.3.d1ef72a</string>
-        <key>name</key>
-        <string>colladadom</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
+        <key>name</key>
+        <string>cubemaptoequirectangular</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -300,19 +304,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
         <key>version</key>
         <string>1.1.0</string>
-        <key>name</key>
-        <string>cubemaptoequirectangular</string>
       </map>
       <key>curl</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
+        <key>description</key>
+        <string>Library for transferring data specified with URL syntax</string>
+        <key>license</key>
+        <string>curl</string>
+        <key>license_file</key>
+        <string>LICENSES/curl.txt</string>
+        <key>name</key>
+        <string>curl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -356,21 +362,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>curl</string>
-        <key>license_file</key>
-        <string>LICENSES/curl.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
         <key>version</key>
         <string>7.54.1-5a4a82d</string>
-        <key>name</key>
-        <string>curl</string>
-        <key>description</key>
-        <string>Library for transferring data specified with URL syntax</string>
       </map>
       <key>dbus_glib</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) Red Hat Inc.</string>
+        <key>description</key>
+        <string>D-Bus bindings for glib</string>
+        <key>license</key>
+        <string>Academic Free License v. 2.1</string>
+        <key>license_file</key>
+        <string>LICENSES/dbus-glib.txt</string>
+        <key>name</key>
+        <string>dbus_glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -386,21 +392,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Academic Free License v. 2.1</string>
-        <key>license_file</key>
-        <string>LICENSES/dbus-glib.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) Red Hat Inc.</string>
         <key>version</key>
         <string>0.76</string>
-        <key>name</key>
-        <string>dbus_glib</string>
-        <key>description</key>
-        <string>D-Bus bindings for glib</string>
       </map>
       <key>dictionaries</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2014 Apache OpenOffice software</string>
+        <key>description</key>
+        <string>Spell checking dictionaries to bundled into the viewer</string>
+        <key>license</key>
+        <string>various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/dictionaries.txt</string>
+        <key>name</key>
+        <string>dictionaries</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -418,21 +424,21 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>various open source</string>
-        <key>license_file</key>
-        <string>LICENSES/dictionaries.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2014 Apache OpenOffice software</string>
         <key>version</key>
         <string>None</string>
-        <key>name</key>
-        <string>dictionaries</string>
-        <key>description</key>
-        <string>Spell checking dictionaries to bundled into the viewer</string>
       </map>
       <key>dullahan</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2017, Linden Research, Inc.</string>
+        <key>description</key>
+        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
+        <key>license</key>
+        <string>MPL</string>
+        <key>license_file</key>
+        <string>LICENSES/LICENSE.txt</string>
+        <key>name</key>
+        <string>dullahan</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -464,21 +470,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MPL</string>
-        <key>license_file</key>
-        <string>LICENSES/LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.14.0.202310131404_118.4.1_g3dd6078_chromium-118.0.5993.54</string>
-        <key>name</key>
-        <string>dullahan</string>
-        <key>description</key>
-        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
       </map>
       <key>expat</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
+        <key>description</key>
+        <string>Expat is an XML parser library written in C</string>
+        <key>license</key>
+        <string>expat</string>
+        <key>license_file</key>
+        <string>LICENSES/expat.txt</string>
+        <key>name</key>
+        <string>expat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -524,21 +530,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>expat</string>
-        <key>license_file</key>
-        <string>LICENSES/expat.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
         <key>version</key>
         <string>2.1.1.1f36d02</string>
-        <key>name</key>
-        <string>expat</string>
-        <key>description</key>
-        <string>Expat is an XML parser library written in C</string>
       </map>
       <key>fmodstudio</key>
       <map>
+        <key>copyright</key>
+        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
+        <key>description</key>
+        <string>FMOD Studio API</string>
+        <key>license</key>
+        <string>fmod</string>
+        <key>license_file</key>
+        <string>LICENSES/fmodstudio.txt</string>
+        <key>name</key>
+        <string>fmodstudio</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -590,21 +596,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>fmod</string>
-        <key>license_file</key>
-        <string>LICENSES/fmodstudio.txt</string>
-        <key>copyright</key>
-        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
         <key>version</key>
         <string>2.02.13.578928</string>
-        <key>name</key>
-        <string>fmodstudio</string>
-        <key>description</key>
-        <string>FMOD Studio API</string>
       </map>
       <key>fontconfig</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
+        <key>description</key>
+        <string>Fontconfig is a library for configuring and customizing font access.</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/fontconfig.txt</string>
+        <key>name</key>
+        <string>fontconfig</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -620,21 +626,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/fontconfig.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
         <key>version</key>
         <string>2.11.0</string>
-        <key>name</key>
-        <string>fontconfig</string>
-        <key>description</key>
-        <string>Fontconfig is a library for configuring and customizing font access.</string>
       </map>
       <key>freetype</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
+        <key>description</key>
+        <string>Font rendering library</string>
+        <key>license</key>
+        <string>FreeType</string>
+        <key>license_file</key>
+        <string>LICENSES/freetype.txt</string>
+        <key>name</key>
+        <string>freetype</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -680,21 +686,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>FreeType</string>
-        <key>license_file</key>
-        <string>LICENSES/freetype.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
         <key>version</key>
         <string>2.4.4.4f739fa</string>
-        <key>name</key>
-        <string>freetype</string>
-        <key>description</key>
-        <string>Font rendering library</string>
       </map>
       <key>glext</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
+        <key>description</key>
+        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
+        <key>license</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
+        <key>license_file</key>
+        <string>LICENSES/glext.txt</string>
+        <key>name</key>
+        <string>glext</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -712,21 +718,21 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
-        <key>license_file</key>
-        <string>LICENSES/glext.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
         <key>version</key>
         <string>68</string>
-        <key>name</key>
-        <string>glext</string>
-        <key>description</key>
-        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
       </map>
       <key>glh_linear</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2000 Cass Everitt</string>
+        <key>description</key>
+        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/glh-linear.txt</string>
+        <key>name</key>
+        <string>glh_linear</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -744,21 +750,21 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/glh-linear.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2000 Cass Everitt</string>
         <key>version</key>
         <string>None</string>
-        <key>name</key>
-        <string>glh_linear</string>
-        <key>description</key>
-        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
       </map>
       <key>googlemock</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2008, Google Inc.</string>
+        <key>description</key>
+        <string>a library for writing and using C++ mock classes</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/gmock.txt</string>
+        <key>name</key>
+        <string>googlemock</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -802,21 +808,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/gmock.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2008, Google Inc.</string>
         <key>version</key>
         <string>1.7.0.77bba00</string>
-        <key>name</key>
-        <string>googlemock</string>
-        <key>description</key>
-        <string>a library for writing and using C++ mock classes</string>
       </map>
       <key>gstreamer</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/gstreamer.txt</string>
+        <key>name</key>
+        <string>gstreamer</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -832,19 +836,19 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/gstreamer.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
         <key>version</key>
         <string>0.10.6.314267</string>
-        <key>name</key>
-        <string>gstreamer</string>
       </map>
       <key>gtk-atk-pango-glib</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (various, see sources)</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/gtk-atk-pango-glib.txt</string>
+        <key>name</key>
+        <string>gtk-atk-pango-glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -860,19 +864,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/gtk-atk-pango-glib.txt</string>
-        <key>copyright</key>
-        <string>Copyright (various, see sources)</string>
         <key>version</key>
         <string>0.1</string>
-        <key>name</key>
-        <string>gtk-atk-pango-glib</string>
       </map>
       <key>havok-source</key>
       <map>
+        <key>copyright</key>
+        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
+        <key>description</key>
+        <string>Havok source code for libs and demos</string>
+        <key>license</key>
+        <string>havok</string>
+        <key>license_file</key>
+        <string>LICENSES/havok.txt</string>
+        <key>name</key>
+        <string>havok-source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -920,21 +926,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>havok</string>
-        <key>license_file</key>
-        <string>LICENSES/havok.txt</string>
-        <key>copyright</key>
-        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
         <key>version</key>
         <string>2012.1-2</string>
-        <key>name</key>
-        <string>havok-source</string>
-        <key>description</key>
-        <string>Havok source code for libs and demos</string>
       </map>
       <key>jpegencoderbasic</key>
       <map>
+        <key>copyright</key>
+        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
+        <key>license</key>
+        <string>NONE</string>
+        <key>license_file</key>
+        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
+        <key>name</key>
+        <string>jpegencoderbasic</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -978,19 +982,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>NONE</string>
-        <key>license_file</key>
-        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
         <key>version</key>
         <string>1.0</string>
-        <key>name</key>
-        <string>jpegencoderbasic</string>
       </map>
       <key>jpeglib</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
+        <key>description</key>
+        <string>JPEG encoding, decoding library</string>
+        <key>license</key>
+        <string>jpeglib</string>
+        <key>license_file</key>
+        <string>LICENSES/jpeglib.txt</string>
+        <key>name</key>
+        <string>jpeglib</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1036,21 +1042,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>jpeglib</string>
-        <key>license_file</key>
-        <string>LICENSES/jpeglib.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
         <key>version</key>
         <string>8c.7846234</string>
-        <key>name</key>
-        <string>jpeglib</string>
-        <key>description</key>
-        <string>JPEG encoding, decoding library</string>
       </map>
       <key>jsoncpp</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
+        <key>description</key>
+        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
+        <key>license</key>
+        <string>public domain</string>
+        <key>license_file</key>
+        <string>LICENSES/jsoncpp.txt</string>
+        <key>name</key>
+        <string>jsoncpp</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1096,21 +1102,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>public domain</string>
-        <key>license_file</key>
-        <string>LICENSES/jsoncpp.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
         <key>version</key>
         <string>0.5.0.bc46e62</string>
-        <key>name</key>
-        <string>jsoncpp</string>
-        <key>description</key>
-        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
       </map>
       <key>kdu</key>
       <map>
+        <key>copyright</key>
+        <string>Kakadu software</string>
+        <key>description</key>
+        <string>JPEG2000 library by Kakadu</string>
+        <key>license</key>
+        <string>Kakadu</string>
+        <key>license_file</key>
+        <string>LICENSES/kdu.txt</string>
+        <key>name</key>
+        <string>kdu</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1162,21 +1168,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Kakadu</string>
-        <key>license_file</key>
-        <string>LICENSES/kdu.txt</string>
-        <key>copyright</key>
-        <string>Kakadu software</string>
         <key>version</key>
         <string>7.10.4.539108</string>
-        <key>name</key>
-        <string>kdu</string>
-        <key>description</key>
-        <string>JPEG2000 library by Kakadu</string>
       </map>
       <key>libhunspell</key>
       <map>
+        <key>copyright</key>
+        <string>See hunspell.txt</string>
+        <key>description</key>
+        <string>Spell checking library</string>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/hunspell.txt</string>
+        <key>name</key>
+        <string>libhunspell</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1222,21 +1228,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/hunspell.txt</string>
-        <key>copyright</key>
-        <string>See hunspell.txt</string>
         <key>version</key>
         <string>1.3.2.650fb94</string>
-        <key>name</key>
-        <string>libhunspell</string>
-        <key>description</key>
-        <string>Spell checking library</string>
       </map>
       <key>libndofdev</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
+        <key>description</key>
+        <string>3DConnexion SDK</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/libndofdev.txt</string>
+        <key>name</key>
+        <string>libndofdev</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1268,29 +1274,29 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/libndofdev.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
         <key>version</key>
         <string>0.1.8e9edc7</string>
-        <key>name</key>
-        <string>libndofdev</string>
-        <key>description</key>
-        <string>3DConnexion SDK</string>
       </map>
       <key>libpng</key>
       <map>
-        <key>platforms</key>
-        <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>fea8f0684a4ed0a73343651948b13049a135a92a</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
+        <key>description</key>
+        <string>PNG Reference library</string>
+        <key>license</key>
+        <string>libpng</string>
+        <key>license_file</key>
+        <string>LICENSES/libpng.txt</string>
+        <key>name</key>
+        <string>libpng</string>
+        <key>platforms</key>
+        <map>
+          <key>darwin64</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>fea8f0684a4ed0a73343651948b13049a135a92a</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
@@ -1326,21 +1332,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>libpng</string>
-        <key>license_file</key>
-        <string>LICENSES/libpng.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
         <key>version</key>
         <string>1.6.38-ca06e99</string>
-        <key>name</key>
-        <string>libpng</string>
-        <key>description</key>
-        <string>PNG Reference library</string>
       </map>
       <key>libuuid</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
+        <key>description</key>
+        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
+        <key>license</key>
+        <string>UUID</string>
+        <key>license_file</key>
+        <string>LICENSES/uuid.txt</string>
+        <key>name</key>
+        <string>libuuid</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -1356,21 +1362,21 @@
             <string>linux64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>UUID</string>
-        <key>license_file</key>
-        <string>LICENSES/uuid.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
         <key>version</key>
         <string>1.6.2</string>
-        <key>name</key>
-        <string>libuuid</string>
-        <key>description</key>
-        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
       </map>
       <key>libxml2</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
+        <key>description</key>
+        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/libxml2.txt</string>
+        <key>name</key>
+        <string>libxml2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1416,21 +1422,21 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/libxml2.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
         <key>version</key>
         <string>2.9.4.7476681</string>
-        <key>name</key>
-        <string>libxml2</string>
-        <key>description</key>
-        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
       </map>
       <key>llappearance_utility</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
+        <key>description</key>
+        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/llappearanceutility.txt</string>
+        <key>name</key>
+        <string>llappearance_utility</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1446,21 +1452,20 @@
             <string>linux</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/llappearanceutility.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
         <key>version</key>
         <string>0.0.1</string>
-        <key>name</key>
-        <string>llappearance_utility</string>
-        <key>description</key>
-        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
       </map>
       <key>llca</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
+      </string>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/ca-license.txt</string>
+        <key>name</key>
+        <string>llca</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -1478,20 +1483,19 @@
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/ca-license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
-      </string>
         <key>version</key>
         <string>202310121530.0</string>
-        <key>name</key>
-        <string>llca</string>
       </map>
       <key>llphysicsextensions_source</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/llphysicsextensions.txt</string>
+        <key>name</key>
+        <string>llphysicsextensions_source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1501,11 +1505,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>48bca5d0233d1e724a59f649a2c6c7ac5f40ec3c</string>
+              <string>b037cc0b29ea70ee834cfae6dda5b7a25cd57174</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/117009335</string>
+              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851460</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1517,15 +1521,31 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>39f52d0350e130f41c5c758f7cb94e87b962c223</string>
+              <string>bdea1fd5c4da9da5afde088d16188b45d0853e04</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/117009336</string>
+              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851461</string>
             </map>
             <key>name</key>
             <string>linux64</string>
           </map>
+          <key>windows</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>creds</key>
+              <string>github</string>
+              <key>hash</key>
+              <string>2e6a66da6071253ae888839cfab59d3f5c1b8b4c</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
+              <key>url</key>
+              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851462</string>
+            </map>
+            <key>name</key>
+            <string>windows</string>
+          </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
@@ -1533,29 +1553,29 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>7b5e645fb7eb399abbea63bd21e8063bbb32a911</string>
+              <string>f652ce0d6aef864689f0ed44255da4d9cd65a43f</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/117009339</string>
+              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851463</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
+        <key>version</key>
+        <string>1.0.479d20a</string>
+      </map>
+      <key>llphysicsextensions_stub</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>license</key>
         <string>internal</string>
         <key>license_file</key>
         <string>LICENSES/llphysicsextensions.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
-        <key>version</key>
-        <string>1.0.565768</string>
         <key>name</key>
-        <string>llphysicsextensions_source</string>
-      </map>
-      <key>llphysicsextensions_stub</key>
-      <map>
+        <string>llphysicsextensions_stub</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1595,19 +1615,19 @@
             <string>windows</string>
           </map>
         </map>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/llphysicsextensions.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.542456</string>
-        <key>name</key>
-        <string>llphysicsextensions_stub</string>
       </map>
       <key>llphysicsextensions_tpv</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/HavokSublicense.pdf</string>
+        <key>name</key>
+        <string>llphysicsextensions_tpv</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1647,19 +1667,17 @@
             <string>windows</string>
           </map>
         </map>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/HavokSublicense.pdf</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.561752</string>
-        <key>name</key>
-        <string>llphysicsextensions_tpv</string>
       </map>
       <key>mesa</key>
       <map>
+        <key>license</key>
+        <string>mesa</string>
+        <key>license_file</key>
+        <string>LICENSES/mesa.txt</string>
+        <key>name</key>
+        <string>mesa</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1675,17 +1693,23 @@
             <string>linux</string>
           </map>
         </map>
-        <key>license</key>
-        <string>mesa</string>
-        <key>license_file</key>
-        <string>LICENSES/mesa.txt</string>
         <key>version</key>
         <string>7.11.1.297294</string>
-        <key>name</key>
-        <string>mesa</string>
       </map>
       <key>meshoptimizer</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
+        <key>description</key>
+        <string>Meshoptimizer. Mesh optimization library.</string>
+        <key>license</key>
+        <string>meshoptimizer</string>
+        <key>license_file</key>
+        <string>LICENSES/meshoptimizer.txt</string>
+        <key>name</key>
+        <string>meshoptimizer</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1717,20 +1741,8 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>meshoptimizer</string>
-        <key>license_file</key>
-        <string>LICENSES/meshoptimizer.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
         <key>version</key>
         <string>160</string>
-        <key>name</key>
-        <string>meshoptimizer</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
-        <key>description</key>
-        <string>Meshoptimizer. Mesh optimization library.</string>
       </map>
       <key>mikktspace</key>
       <map>
@@ -1790,6 +1802,18 @@
       </map>
       <key>minizip-ng</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
+        <key>copyright</key>
+        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
+        <key>description</key>
+        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
+        <key>license</key>
+        <string>minizip-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/minizip-ng.txt</string>
+        <key>name</key>
+        <string>minizip-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1835,23 +1859,22 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>minizip-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/minizip-ng.txt</string>
-        <key>copyright</key>
-        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>3.0.2.3e9876e</string>
-        <key>name</key>
-        <string>minizip-ng</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
-        <key>description</key>
-        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
       </map>
       <key>nghttp2</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
+Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
+        <key>description</key>
+        <string>Library providing HTTP 2 support for libcurl</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/nghttp2.txt</string>
+        <key>name</key>
+        <string>nghttp2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1897,28 +1920,27 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/nghttp2.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
-Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
-        <key>version</key>
-        <string>1.40.0.b1526c6</string>
-        <key>name</key>
-        <string>nghttp2</string>
-        <key>description</key>
-        <string>Library providing HTTP 2 support for libcurl</string>
         <key>source_type</key>
         <string>hg</string>
+        <key>version</key>
+        <string>1.40.0.b1526c6</string>
       </map>
       <key>nvapi</key>
       <map>
-        <key>platforms</key>
-        <map>
-          <key>windows64</key>
-          <map>
+        <key>copyright</key>
+        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
+        <key>description</key>
+        <string>NVAPI provides an interface to NVIDIA devices.</string>
+        <key>license</key>
+        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
+        <key>license_file</key>
+        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
+        <key>name</key>
+        <string>nvapi</string>
+        <key>platforms</key>
+        <map>
+          <key>windows64</key>
+          <map>
             <key>archive</key>
             <map>
               <key>hash</key>
@@ -1932,21 +1954,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
-        <key>license_file</key>
-        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
-        <key>copyright</key>
-        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
         <key>version</key>
         <string>352.aac0e19</string>
-        <key>name</key>
-        <string>nvapi</string>
-        <key>description</key>
-        <string>NVAPI provides an interface to NVIDIA devices.</string>
       </map>
       <key>ogg_vorbis</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2002, Xiph.org Foundation</string>
+        <key>description</key>
+        <string>Audio encoding library</string>
+        <key>license</key>
+        <string>ogg-vorbis</string>
+        <key>license_file</key>
+        <string>LICENSES/ogg-vorbis.txt</string>
+        <key>name</key>
+        <string>ogg_vorbis</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1990,96 +2012,96 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>ogg-vorbis</string>
-        <key>license_file</key>
-        <string>LICENSES/ogg-vorbis.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2002, Xiph.org Foundation</string>
         <key>version</key>
         <string>1.3.3-1.3.6.e4101b6</string>
-        <key>name</key>
-        <string>ogg_vorbis</string>
-        <key>description</key>
-        <string>Audio encoding library</string>
       </map>
       <key>open-libndofdev</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
+        <key>description</key>
+        <string>Open Source replacement for 3DConnection SDK</string>
         <key>license</key>
         <string>BSD</string>
         <key>license_file</key>
         <string>LICENSES/libndofdev.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
-        <key>version</key>
-        <string>0.3</string>
         <key>name</key>
         <string>open-libndofdev</string>
-        <key>description</key>
-        <string>Open Source replacement for 3DConnection SDK</string>
+        <key>version</key>
+        <string>0.3</string>
       </map>
       <key>openal</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1999-2007 by authors.</string>
+        <key>description</key>
+        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
+        <key>license</key>
+        <string>LGPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/openal-soft.txt</string>
+        <key>name</key>
+        <string>openal</string>
         <key>platforms</key>
         <map>
-          <key>linux64</key>
+          <key>darwin64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
+              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>darwin64</string>
           </map>
-          <key>windows64</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
+              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>linux64</string>
           </map>
-          <key>darwin64</key>
+          <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
+              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>darwin64</string>
+            <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>LGPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/openal-soft.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1999-2007 by authors.</string>
         <key>version</key>
         <string>1.23.1</string>
-        <key>name</key>
-        <string>openal</string>
-        <key>description</key>
-        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
       </map>
       <key>openjpeg</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
+        <key>description</key>
+        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/openjpeg.txt</string>
+        <key>name</key>
+        <string>openjpeg</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2125,21 +2147,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/openjpeg.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
         <key>version</key>
         <string>2.5.0.ea12248</string>
-        <key>name</key>
-        <string>openjpeg</string>
-        <key>description</key>
-        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
       </map>
       <key>openssl</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
+        <key>description</key>
+        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
+        <key>license</key>
+        <string>openssl</string>
+        <key>license_file</key>
+        <string>LICENSES/openssl.txt</string>
+        <key>name</key>
+        <string>openssl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2185,21 +2207,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>openssl</string>
-        <key>license_file</key>
-        <string>LICENSES/openssl.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
         <key>version</key>
         <string>1.1.1q.de53f55</string>
-        <key>name</key>
-        <string>openssl</string>
-        <key>description</key>
-        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
       </map>
       <key>pcre</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
+        <key>description</key>
+        <string>PCRE Perl-compatible regular expression library</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/pcre-license.txt</string>
+        <key>name</key>
+        <string>pcre</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2243,21 +2265,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/pcre-license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
         <key>version</key>
         <string>8.35.979fd86</string>
-        <key>name</key>
-        <string>pcre</string>
-        <key>description</key>
-        <string>PCRE Perl-compatible regular expression library</string>
       </map>
       <key>slvoice</key>
       <map>
+        <key>copyright</key>
+        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
+        <key>description</key>
+        <string>Vivox SDK components</string>
+        <key>license</key>
+        <string>Mixed</string>
+        <key>license_file</key>
+        <string>LICENSES/vivox_licenses.txt</string>
+        <key>name</key>
+        <string>slvoice</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2305,21 +2327,19 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>Mixed</string>
-        <key>license_file</key>
-        <string>LICENSES/vivox_licenses.txt</string>
-        <key>copyright</key>
-        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
         <key>version</key>
         <string>4.10.0000.32327.5fc3fe7c.571099</string>
-        <key>name</key>
-        <string>slvoice</string>
-        <key>description</key>
-        <string>Vivox SDK components</string>
       </map>
       <key>threejs</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright © 2010-2021 three.js authors</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/THREEJS_LICENSE.txt</string>
+        <key>name</key>
+        <string>threejs</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2363,16 +2383,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/THREEJS_LICENSE.txt</string>
-        <key>copyright</key>
-        <string>Copyright © 2010-2021 three.js authors</string>
         <key>version</key>
         <string>0.132.2</string>
-        <key>name</key>
-        <string>threejs</string>
       </map>
       <key>tinygltf</key>
       <map>
@@ -2412,6 +2424,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tracy</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
+        <key>description</key>
+        <string>Tracy Profiler Library</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tracy_license.txt</string>
+        <key>name</key>
+        <string>tracy</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2441,20 +2465,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
-        <key>version</key>
-        <string>v0.8.1.235e98f</string>
-        <key>name</key>
-        <string>tracy</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>description</key>
-        <string>Tracy Profiler Library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tracy</string>
         <key>source_type</key>
@@ -2464,6 +2474,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tut</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
+        <key>description</key>
+        <string>TUT is a small and portable unit test framework for C++.</string>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tut.txt</string>
+        <key>name</key>
+        <string>tut</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2481,21 +2501,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tut.txt</string>
-        <key>copyright</key>
-        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
         <key>version</key>
         <string>2008.11.30</string>
-        <key>name</key>
-        <string>tut</string>
-        <key>description</key>
-        <string>TUT is a small and portable unit test framework for C++.</string>
       </map>
       <key>uriparser</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
+        <key>description</key>
+        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
+        <key>license</key>
+        <string>New BSD license</string>
+        <key>license_file</key>
+        <string>LICENSES/uriparser.txt</string>
+        <key>name</key>
+        <string>uriparser</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2541,21 +2561,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>New BSD license</string>
-        <key>license_file</key>
-        <string>LICENSES/uriparser.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
         <key>version</key>
         <string>0.9.4</string>
-        <key>name</key>
-        <string>uriparser</string>
-        <key>description</key>
-        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
       </map>
       <key>viewer-manager</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
+        <key>description</key>
+        <string>Linden Lab Viewer Management Process suite.</string>
+        <key>license</key>
+        <string>viewerlgpl</string>
+        <key>license_file</key>
+        <string>LICENSE</string>
+        <key>name</key>
+        <string>viewer-manager</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2601,25 +2621,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>viewerlgpl</string>
-        <key>license_file</key>
-        <string>LICENSE</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
-        <key>version</key>
-        <string>3.0-08bf5ee</string>
-        <key>name</key>
-        <string>viewer-manager</string>
-        <key>description</key>
-        <string>Linden Lab Viewer Management Process suite.</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/vmp-standalone</string>
         <key>source_type</key>
         <string>hg</string>
+        <key>version</key>
+        <string>3.0-08bf5ee</string>
       </map>
       <key>vlc-bin</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
+        <key>license</key>
+        <string>GPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/vlc.txt</string>
+        <key>name</key>
+        <string>vlc-bin</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2651,19 +2669,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>GPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/vlc.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
         <key>version</key>
         <string>3.0.16.c219a5d</string>
-        <key>name</key>
-        <string>vlc-bin</string>
       </map>
-      <key>xmlrpc-epi</key>
+      <key>vulkan_gltf</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>description</key>
+        <string>Vulkan GLTF Sample Implementation</string>
+        <key>license</key>
+        <string>Copyright (c) 2018 Sascha Willems</string>
+        <key>license_file</key>
+        <string>LICENSES/vulkan_gltf.txt</string>
+        <key>name</key>
+        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2671,71 +2693,53 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>8cff2060843db3db788511ee34a8e8cc</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>linux64</key>
+          <key>windows</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>58eea384be49ba756ce9c5e66669540b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>windows</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>xmlrpc-epi</string>
-        <key>license_file</key>
-        <string>LICENSES/xmlrpc-epi.txt</string>
-        <key>copyright</key>
-        <string>Copyright: (C) 2000 Epinions, Inc.</string>
         <key>version</key>
-        <string>0.54.1.8a05acf</string>
-        <key>name</key>
-        <string>xmlrpc-epi</string>
-        <key>description</key>
-        <string>XMLRPC Library</string>
+        <string>1</string>
       </map>
-      <key>vulkan_gltf</key>
+      <key>xmlrpc-epi</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
         <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
+        <string>Copyright: (C) 2000 Epinions, Inc.</string>
         <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
+        <string>XMLRPC Library</string>
         <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
+        <string>xmlrpc-epi</string>
         <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
+        <string>LICENSES/xmlrpc-epi.txt</string>
         <key>name</key>
-        <string>vulkan_gltf</string>
+        <string>xmlrpc-epi</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2743,43 +2747,59 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8cff2060843db3db788511ee34a8e8cc</string>
+              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>windows</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>58eea384be49ba756ce9c5e66669540b</string>
+              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows</string>
+            <string>linux64</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
+              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1</string>
+        <string>0.54.1.8a05acf</string>
       </map>
       <key>xxhash</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2012-2021 Yann Collet</string>
+        <key>description</key>
+        <string>xxHash Library</string>
+        <key>license</key>
+        <string>xxhash</string>
+        <key>license_file</key>
+        <string>LICENSES/xxhash.txt</string>
+        <key>name</key>
+        <string>xxhash</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2837,21 +2857,23 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>xxhash</string>
-        <key>license_file</key>
-        <string>LICENSES/xxhash.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2012-2021 Yann Collet</string>
         <key>version</key>
         <string>0.8.1.7501c90</string>
-        <key>name</key>
-        <string>xxhash</string>
-        <key>description</key>
-        <string>xxHash Library</string>
       </map>
       <key>zlib-ng</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
+        <key>description</key>
+        <string>zlib data compression library for the next generation systems</string>
+        <key>license</key>
+        <string>zlib-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/zlib-ng.txt</string>
+        <key>name</key>
+        <string>zlib-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2897,24 +2919,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>license</key>
-        <string>zlib-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/zlib-ng.txt</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>1.2.11.zlib-ng.32fd361</string>
-        <key>name</key>
-        <string>zlib-ng</string>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
-        <key>description</key>
-        <string>zlib data compression library for the next generation systems</string>
       </map>
     </map>
     <key>package_description</key>
     <map>
+      <key>canonical_repo</key>
+      <string>https://github.com/secondlife/viewer</string>
+      <key>copyright</key>
+      <string>Copyright (c) 2020, Linden Research, Inc.</string>
+      <key>description</key>
+      <string>Second Life Viewer</string>
+      <key>license</key>
+      <string>LGPL</string>
+      <key>license_file</key>
+      <string>docs/LICENSE-source.txt</string>
+      <key>name</key>
+      <string>Second Life Viewer</string>
       <key>platforms</key>
       <map>
         <key>common</key>
@@ -2923,6 +2945,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
           <map>
             <key>RelWithDebInfo</key>
             <map>
+              <key>build</key>
+              <map>
+              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -2933,10 +2958,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfo</string>
@@ -2945,6 +2967,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -2953,17 +2979,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
             </map>
             <key>Release</key>
             <map>
+              <key>build</key>
+              <map>
+              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -2974,10 +2999,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
+                </array>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -2986,6 +3008,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -2994,11 +3020,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-</array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3009,22 +3031,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         </map>
         <key>darwin64</key>
         <map>
+          <key>build_directory</key>
+          <string>build-darwin-x86_64</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>Xcode</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-</array>
-              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3036,23 +3048,27 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
-              <key>default</key>
-              <string>True</string>
-              <key>name</key>
-              <string>RelWithDebInfo</string>
-            </map>
-            <key>RelWithDebInfoOS</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
               </map>
+              <key>default</key>
+              <string>True</string>
+              <key>name</key>
+              <string>RelWithDebInfo</string>
+            </map>
+            <key>RelWithDebInfoOS</key>
+            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3064,25 +3080,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoOS</string>
-            </map>
-            <key>Release</key>
-            <map>
               <key>configure</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-</array>
+                </array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3094,21 +3106,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
               </map>
-              <key>name</key>
-              <string>Release</string>
-            </map>
-            <key>ReleaseOS</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-</array>
+                </array>
               </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3120,40 +3136,48 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>Xcode</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
-          <key>build_directory</key>
-          <string>build-darwin-x86_64</string>
           <key>name</key>
           <string>darwin64</string>
         </map>
         <key>linux64</key>
         <map>
+          <key>build_directory</key>
+          <string>build-linux-x86_64</string>
           <key>configurations</key>
           <map>
             <key>Release</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
+              </map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
+                </array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3162,6 +3186,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseOS</key>
             <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
+              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -3169,12 +3198,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3188,44 +3212,44 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
               <string>default</string>
             </map>
           </map>
-          <key>build_directory</key>
-          <string>build-linux-x86_64</string>
           <key>name</key>
           <string>linux64</string>
         </map>
         <key>windows</key>
         <map>
+          <key>build_directory</key>
+          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>configure</key>
+              <key>build</key>
               <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
+                  <string>SecondLife.sln</string>
+                </array>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
                 <array>
                   <string>/build</string>
                   <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
-</array>
+                  <string>..\indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                </array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3234,25 +3258,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>RelWithDebInfoOS</key>
             <map>
-              <key>configure</key>
+              <key>build</key>
               <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
-</array>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-</array>
-              </map>
-              <key>build</key>
-              <map>
+                  <string>SecondLife.sln</string>
+                </array>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3263,70 +3274,69 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoOS</string>
-            </map>
-            <key>Release</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>..\indra</string>
-</array>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
+                </array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
               <key>build</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
                 <array>
                   <string>/build</string>
                   <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>SecondLife.sln</string>
-</array>
+                </array>
               </map>
-              <key>name</key>
-              <string>Release</string>
-            </map>
-            <key>ReleaseOS</key>
-            <map>
               <key>configure</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
-</array>
-                <key>arguments</key>
-                <array>
-                  <string>..\indra</string>
-</array>
+                </array>
               </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
               <key>build</key>
               <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3337,36 +3347,40 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-</array>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
-</array>
+                  <string>..\indra</string>
+                </array>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
-          <key>build_directory</key>
-          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>name</key>
           <string>windows</string>
         </map>
       </map>
-      <key>license</key>
-      <string>LGPL</string>
-      <key>license_file</key>
-      <string>docs/LICENSE-source.txt</string>
-      <key>copyright</key>
-      <string>Copyright (c) 2020, Linden Research, Inc.</string>
       <key>version_file</key>
       <string>newview/viewer_version.txt</string>
-      <key>name</key>
-      <string>Second Life Viewer</string>
-      <key>canonical_repo</key>
-      <string>https://github.com/secondlife/viewer</string>
-      <key>description</key>
-      <string>Second Life Viewer</string>
     </map>
+    <key>type</key>
+    <string>autobuild</string>
+    <key>version</key>
+    <string>1.3</string>
   </map>
 </llsd>
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp
index d610a44bc6..eea3077632 100644
--- a/indra/llrender/llrendernavprim.cpp
+++ b/indra/llrender/llrendernavprim.cpp
@@ -40,20 +40,20 @@ LLRenderNavPrim gRenderNav;
 //=============================================================================
 void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const
 {
-	LLColor4 cV(color);
-	gGL.color4fv( cV.mV );
-	gGL.begin(LLRender::TRIANGLES);
+    gGL.color4ubv(color.mV);
+
+    gGL.begin(LLRender::TRIANGLES);
 	{
 		gGL.vertex3fv( a.mV );
 		gGL.vertex3fv( b.mV );
 		gGL.vertex3fv( c.mV );
 	}
-	gGL.end();		
+	gGL.end();
 }
 //=============================================================================
 void LLRenderNavPrim::renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertCnt )
 {	
 	pVBO->setBuffer();
-	pVBO->drawArrays( mode, 0, vertCnt );	
+	pVBO->drawArrays( mode, 0, vertCnt );
 }
 //=============================================================================
-- 
cgit v1.2.3


From 990f9dd92fc8b770a85649c022137e53e4549b2d Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Thu, 11 Jan 2024 01:12:01 +0200
Subject: SL-20798 FIXED Crash at LLIMMgr::addMessage

---
 indra/newview/llimview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 61a01d7418..9e6704af26 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -3160,7 +3160,7 @@ void LLIMMgr::addMessage(
 			}
 
             // Fetch group chat history, enabled by default.
-            if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory"))
+            if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory") && gAgent.getRegion())
             {
                 std::string chat_url = gAgent.getRegion()->getCapability("ChatSessionRequest");
                 LLCoros::instance().launch("chatterBoxHistoryCoro",
-- 
cgit v1.2.3


From 0d8bd79c79c1e917bc49669426bdfa89dc48ff04 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 11 Jan 2024 00:19:56 +0200
Subject: SL-20750 MacOS Crash processing attributed string

---
 indra/llwindow/llopenglview-objc.mm  | 68 ++++++++++++++++++++++--------------
 indra/newview/llinventorygallery.cpp |  4 +--
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 37f4568b98..0bd4e506a2 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -736,33 +736,49 @@ attributedStringInfo getSegments(NSAttributedString *str)
 	// SL-19801 Special workaround for system emoji picker
 	if ([aString length] == 2)
 	{
-		uint32_t b0 = [aString characterAtIndex:0];
-		uint32_t b1 = [aString characterAtIndex:1];
-		if (((b0 & 0xF000) == 0xD000) && ((b1 & 0xF000) == 0xD000))
-		{
-			uint32_t b = 0x10000 | ((b0 & 0x3F) << 10) | (b1 & 0x3FF);
-			callUnicodeCallback(b, 0);
-			return;
-		}
-	}
-
-	if (!mHasMarkedText)
-	{
-		for (NSInteger i = 0; i < [aString length]; i++)
-		{
-			callUnicodeCallback([aString characterAtIndex:i], mModifiers);
-		}
-	} else {
-        resetPreedit();
-		// We may never get this point since unmarkText may be called before insertText ever gets called once we submit our text.
-		// But just in case...
-		
-		for (NSInteger i = 0; i < [aString length]; i++)
-		{
-			handleUnicodeCharacter([aString characterAtIndex:i]);
-		}
-		mHasMarkedText = FALSE;
+        @try
+        {
+            uint32_t b0 = [aString characterAtIndex:0];
+            uint32_t b1 = [aString characterAtIndex:1];
+            if (((b0 & 0xF000) == 0xD000) && ((b1 & 0xF000) == 0xD000))
+            {
+                uint32_t b = 0x10000 | ((b0 & 0x3F) << 10) | (b1 & 0x3FF);
+                callUnicodeCallback(b, 0);
+                return;
+            }
+        }
+        @catch(NSException * e)
+        {
+            // One of the characters is an attribute string?
+            NSLog(@"Encountered an unsupported attributed character. Exception: %@ String: %@", e.name, aString);
+            return;
+        }
 	}
+    
+    @try
+    {
+        if (!mHasMarkedText)
+        {
+            for (NSInteger i = 0; i < [aString length]; i++)
+            {
+                callUnicodeCallback([aString characterAtIndex:i], mModifiers);
+            }
+        } else {
+            resetPreedit();
+            // We may never get this point since unmarkText may be called before insertText ever gets called once we submit our text.
+            // But just in case...
+            
+            for (NSInteger i = 0; i < [aString length]; i++)
+            {
+                handleUnicodeCharacter([aString characterAtIndex:i]);
+            }
+            mHasMarkedText = FALSE;
+        }
+    }
+    @catch(NSException * e)
+    {
+        NSLog(@"Failed to process an attributed string. Exception: %@ String: %@", e.name, aString);
+    }
 }
 
 - (void) insertNewline:(id)sender
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 72ef6e5bb6..d4ca58f778 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2432,9 +2432,7 @@ void LLInventoryGallery::startDrag()
             ids.push_back(selected_id);
         }
     }
-    // We must have set this for some reason, but it's causing compile errors
-    (void)src;
-    LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, LLToolDragAndDrop::SOURCE_AGENT);
+    LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, src);
 }
 
 bool LLInventoryGallery::areViewsInitialized()
-- 
cgit v1.2.3


From 82774d2db9649f2df0993604d0a1751ef9a61df2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 20 Dec 2023 17:41:03 +0100
Subject: Build fix for Visual Studio update (std::vector<PermissionBit>)

---
 indra/newview/llmaterialeditor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 292ddb765f..1f5974c74d 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2228,7 +2228,7 @@ bool LLMaterialEditor::canModifyObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_MODIFY}), ItemSource::OBJECT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_MODIFY}), ItemSource::OBJECT, permissions, item_out);
 }
 
 bool LLMaterialEditor::canSaveObjectsMaterial()
@@ -2236,7 +2236,7 @@ bool LLMaterialEditor::canSaveObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item_out);
 }
 
 bool LLMaterialEditor::canClipboardObjectsMaterial()
@@ -2262,7 +2262,7 @@ bool LLMaterialEditor::canClipboardObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), ItemSource::OBJECT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), ItemSource::OBJECT, permissions, item_out);
 }
 
 void LLMaterialEditor::saveObjectsMaterialAs()
@@ -2270,7 +2270,7 @@ void LLMaterialEditor::saveObjectsMaterialAs()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item = nullptr;
-    bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item);
+    bool allowed = can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item);
     if (!allowed)
     {
         LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
-- 
cgit v1.2.3


From 6173bd6236dc452b05b6e32258b59c6db05a022d Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 11 Jan 2024 19:19:35 +0100
Subject: SL-20749 Scrolling up by mouse wheel is endless in
 LLPanelEmojiComplete

---
 indra/newview/llpanelemojicomplete.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 9bfe04fc31..46f455aede 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -264,7 +264,11 @@ BOOL LLPanelEmojiComplete::handleScrollWheel(S32 x, S32 y, S32 clicks)
 
     if (mTotalEmojis > mVisibleEmojis)
     {
-        mScrollPos = llclamp<size_t>(mScrollPos + clicks, 0, mTotalEmojis - mVisibleEmojis);
+        // In case of wheel up (clicks < 0) we shouldn't subtract more than value of mScrollPos
+        // Example: if mScrollPos = 0, clicks = -1 then (mScrollPos + clicks) becomes SIZE_MAX
+        // As a result of llclamp<size_t>() mScrollPos becomes (mTotalEmojis - mVisibleEmojis)
+        S32 newScrollPos = llmax(0, (S32)mScrollPos + clicks);
+        mScrollPos = llclamp<size_t>((size_t)newScrollPos, 0, mTotalEmojis - mVisibleEmojis);
         mCurSelected = posToIndex(x, y);
         return TRUE;
     }
-- 
cgit v1.2.3


From 5c412a2b70fb64d7106492bcb7578f6bba4098bf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 11 Jan 2024 20:46:07 +0200
Subject: SL-20798 use appropriate check

---
 indra/newview/llimview.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 9e6704af26..ce4a032b27 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -3160,11 +3160,13 @@ void LLIMMgr::addMessage(
 			}
 
             // Fetch group chat history, enabled by default.
-            if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory") && gAgent.getRegion())
+            if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory"))
             {
-                std::string chat_url = gAgent.getRegion()->getCapability("ChatSessionRequest");
-                LLCoros::instance().launch("chatterBoxHistoryCoro",
-                    boost::bind(&chatterBoxHistoryCoro, chat_url, session_id, from, msg, timestamp));
+                std::string chat_url = gAgent.getRegionCapability("ChatSessionRequest");
+                if (!chat_url.empty())
+                {
+                    LLCoros::instance().launch("chatterBoxHistoryCoro", boost::bind(&chatterBoxHistoryCoro, chat_url, session_id, from, msg, timestamp));
+                }
             }
 
 			//Play sound for new conversations
-- 
cgit v1.2.3


From 03870e0cf3733d244269f8c9ce7c982309d4f9fd Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 11 Jan 2024 20:29:06 +0100
Subject: SL-20756 The emoji in the profile floater is displayed schematically

---
 indra/llui/lltextbase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 1b83ee401c..8f628b4818 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -168,7 +168,7 @@ LLTextBase::Params::Params()
 	trusted_content("trusted_content", true),
 	always_show_icons("always_show_icons", false),
 	use_ellipses("use_ellipses", false),
-	use_color("use_color", false),
+	use_color("use_color", true),
 	parse_urls("parse_urls", false),
 	force_urls_external("force_urls_external", false),
 	parse_highlights("parse_highlights", false)
-- 
cgit v1.2.3


From 5771736bd2dcae1169acd8899bba87a82fbe9de9 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 12 Jan 2024 14:04:46 +0200
Subject: SL-20799 FIXED Viewer crashes when trying to save snapshot on disc
 without empty space

---
 indra/llimage/llimage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 031471d1fe..f9393dea54 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -2259,9 +2259,9 @@ bool LLImageFormatted::save(const std::string &filename)
 		return false;
 	}
 	
-	outfile.write(getData(), 	getDataSize());
+	S32 result = outfile.write(getData(), getDataSize());
 	outfile.close() ;
-	return true;
+    return (result != 0);
 }
 
 S8 LLImageFormatted::getCodec() const
-- 
cgit v1.2.3


From 577706eddc22cd750c11e2110c79b7ead85e6005 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 Jan 2024 00:20:46 +0200
Subject: SL-20629 Fix first opened legacy env displaying probe ambience as '1'

---
 indra/newview/llenvironment.cpp | 8 ++++++++
 indra/newview/llsettingsvo.cpp  | 4 +---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index ffaca846dd..60c2682078 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -895,6 +895,14 @@ void LLEnvironment::initSingleton()
         gGenericDispatcher.addHandler(MESSAGE_PUSHENVIRONMENT, &environment_push_dispatch_handler);
     }
 
+    gSavedSettings.getControl("RenderSkyAutoAdjustProbeAmbiance")->getSignal()->connect(
+        [](LLControlVariable*, const LLSD& new_val, const LLSD& old_val)
+        {
+            LLSettingsSky::sAutoAdjustProbeAmbiance = new_val.asReal();
+        }
+    );
+    LLSettingsSky::sAutoAdjustProbeAmbiance = gSavedSettings.getF32("RenderSkyAutoAdjustProbeAmbiance");
+
     LLEventPumps::instance().obtain(PUMP_EXPERIENCE).stopListening(LISTENER_NAME);
     LLEventPumps::instance().obtain(PUMP_EXPERIENCE).listen(LISTENER_NAME, [this](LLSD message) { listenExperiencePump(message); return false; });
 }
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 7009fb98ab..c07c939862 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -739,7 +739,6 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
     static LLCachedControl<F32> auto_adjust_blue_horizon_scale(gSavedSettings, "RenderSkyAutoAdjustBlueHorizonScale", 1.f);
     static LLCachedControl<F32> auto_adjust_blue_density_scale(gSavedSettings, "RenderSkyAutoAdjustBlueDensityScale", 1.f);
     static LLCachedControl<F32> auto_adjust_sun_color_scale(gSavedSettings, "RenderSkyAutoAdjustSunColorScale", 1.f);
-    static LLCachedControl<F32> auto_adjust_probe_ambiance(gSavedSettings, "RenderSkyAutoAdjustProbeAmbiance", 1.f);
     static LLCachedControl<F32> sunlight_scale(gSavedSettings, "RenderSkySunlightScale", 1.5f);
     static LLCachedControl<F32> ambient_scale(gSavedSettings, "RenderSkyAmbientScale", 1.5f);
 
@@ -772,8 +771,7 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
             shader->uniform3fv(LLShaderMgr::BLUE_DENSITY, blue_density.mV);
             shader->uniform3fv(LLShaderMgr::BLUE_HORIZON, blue_horizon.mV);
 
-            LLSettingsSky::sAutoAdjustProbeAmbiance = auto_adjust_probe_ambiance;
-            probe_ambiance = auto_adjust_probe_ambiance;  // NOTE -- must match LLSettingsSky::getReflectionProbeAmbiance value for "auto_adjust" true
+            probe_ambiance = sAutoAdjustProbeAmbiance;
         }
         else
         {
-- 
cgit v1.2.3


From 2c8532bdc7afa8ff380fbae7c2be8300b5ce8214 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 Jan 2024 00:22:47 +0200
Subject: SL-20629 Fix Probe ambiance being displayed as 0 when it isn't

And hide warning when it's already 0
---
 indra/newview/app_settings/settings.xml     | 2 +-
 indra/newview/llfloatereditextdaycycle.cpp  | 4 +++-
 indra/newview/llfloaterfixedenvironment.cpp | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 00b59f9a4d..8fbeb82d07 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10720,7 +10720,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>0.001</real>
+    <real>0.01</real>
   </map>
   <key>RenderSkySunlightScale</key>
   <map>
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index bb47feaa95..4e764674e5 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1724,7 +1724,9 @@ void LLFloaterEditExtDayCycle::showHDRNotification(const LLSettingsDay::ptr_t &p
         while (iter != end)
         {
             LLSettingsSky::ptr_t sky = std::static_pointer_cast<LLSettingsSky>(iter->second);
-            if (sky && sky->canAutoAdjust()) 
+            if (sky
+                && sky->canAutoAdjust()
+                && sky->getReflectionProbeAmbiance(true) != 0.f) 
             {
                 LLNotificationsUtil::add("AutoAdjustHDRSky");
                 return;
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index 8e28fd6234..3e8bad3ef5 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -186,7 +186,8 @@ void LLFloaterFixedEnvironment::setEditSettingsAndUpdate(const LLSettingsBase::p
     // teach user about HDR settings
     if (mSettings
         && mSettings->getSettingsType() == "sky"
-        && ((LLSettingsSky*)mSettings.get())->canAutoAdjust())
+        && ((LLSettingsSky*)mSettings.get())->canAutoAdjust()
+        && ((LLSettingsSky*)mSettings.get())->getReflectionProbeAmbiance(true) != 0.f)
     {
         LLNotificationsUtil::add("AutoAdjustHDRSky");
     }
-- 
cgit v1.2.3


From 25d7828bec3e54eeceb76b77fa6b8b1527611bcf Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Fri, 12 Jan 2024 12:39:57 -0600
Subject: DRTVWR-601 Fix for Tracy instrumentation (Tracy doesn't play nice
 with coroutines).

---
 indra/llcommon/llsingleton.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 51ef514cf7..fba8301c4d 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -455,7 +455,7 @@ public:
 
     static DERIVED_TYPE* getInstance()
     {
-        LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD;
+        //LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD; // TODO -- reenable this when we have a fix for using Tracy with coroutines
         // We know the viewer has LLSingleton dependency circularities. If you
         // feel strongly motivated to eliminate them, cheers and good luck.
         // (At that point we could consider a much simpler locking mechanism.)
-- 
cgit v1.2.3


From 568f1a19b16f7febfd6ff3963f28840399aec8b5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 15 Jan 2024 22:30:54 +0200
Subject: SL-20783 Avatar turning animation was affected by framerate

---
 indra/newview/llvoavatar.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index fee00eb6f4..550be30919 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4283,6 +4283,15 @@ void LLVOAvatar::updateOrientation(LLAgent& agent, F32 speed, F32 delta_time)
 				if (mTurning)
 				{
 					pelvis_rot_threshold *= 0.4f;
+                    // account for fps, assume that above value is for ~60fps
+                    constexpr F32 default_frame_sec = 0.016f;
+                    F32 prev_frame_sec = LLFrameTimer::getFrameDeltaTimeF32();
+                    if (default_frame_sec > prev_frame_sec)
+                    {
+                        // reduce threshold since turn rate per second is constant,
+                        // shorter frame means shorter turn.
+                        pelvis_rot_threshold *= prev_frame_sec/default_frame_sec;
+                    }
 				}
 
 				// am I done turning?
-- 
cgit v1.2.3


From 65b501c42973e3ffdbf37e70ed78243bab588039 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 16 Jan 2024 02:12:34 +0100
Subject: SL-20751 Information about frequently used and recently used emojis
 is available to all users

---
 indra/newview/llfloateremojipicker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index a9bc0fd6bb..abc5165f1e 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -973,7 +973,7 @@ void LLFloaterEmojiPicker::loadState()
     if (!sStateFileName.empty())
         return; // Already loaded
 
-    sStateFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "emoji_floater_state.xml");
+    sStateFileName = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "emoji_floater_state.xml");
 
     llifstream file;
     file.open(sStateFileName.c_str());
-- 
cgit v1.2.3


From 382f9f0786b5225ac6d9648241e6c04f4f94f262 Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Sat, 13 Jan 2024 15:36:45 +0900
Subject: replace part of boost::fibers::* to std::*

---
 indra/llcommon/llcond.h            |  1 -
 indra/llcommon/llcoros.h           | 14 +++++---------
 indra/llcommon/lleventcoro.cpp     |  6 +++---
 indra/llcommon/llthreadsafequeue.h |  9 +++------
 indra/llcommon/workqueue.cpp       |  1 -
 indra/llmessage/message.h          |  1 -
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/indra/llcommon/llcond.h b/indra/llcommon/llcond.h
index da6e6affe1..a4bec124ca 100644
--- a/indra/llcommon/llcond.h
+++ b/indra/llcommon/llcond.h
@@ -16,7 +16,6 @@
 
 #include "llunits.h"
 #include "llcoros.h"
-#include LLCOROS_MUTEX_HEADER
 #include "mutex.h"
 #include <chrono>
 
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h
index 966ce03296..8160b87f23 100644
--- a/indra/llcommon/llcoros.h
+++ b/indra/llcommon/llcoros.h
@@ -41,10 +41,6 @@
 #include <exception>
 #include <queue>
 
-// e.g. #include LLCOROS_MUTEX_HEADER
-#define LLCOROS_MUTEX_HEADER   <boost/fiber/mutex.hpp>
-#define LLCOROS_CONDVAR_HEADER <boost/fiber/condition_variable.hpp>
-
 namespace boost {
     namespace fibers {
         class mutex;
@@ -289,17 +285,17 @@ public:
      * proxy, so continue using the aliases.
      */
     template <typename T>
-    using Promise = boost::fibers::promise<T>;
+    using Promise = std::promise<T>;
     template <typename T>
-    using Future = boost::fibers::future<T>;
+    using Future = std::future<T>;
     template <typename T>
     static Future<T> getFuture(Promise<T>& promise) { return promise.get_future(); }
 
     // use mutex, lock, condition_variable suitable for coroutines
-    using Mutex = boost::fibers::mutex;
+    using Mutex = std::mutex;
     using LockType = std::unique_lock<Mutex>;
-    using cv_status = boost::fibers::cv_status;
-    using ConditionVariable = boost::fibers::condition_variable;
+    using cv_status = std::cv_status;
+    using ConditionVariable = std::condition_variable;
 
     /// for data local to each running coroutine
     template <typename T>
diff --git a/indra/llcommon/lleventcoro.cpp b/indra/llcommon/lleventcoro.cpp
index 067b5e6fbc..97a7ad04ad 100644
--- a/indra/llcommon/lleventcoro.cpp
+++ b/indra/llcommon/lleventcoro.cpp
@@ -285,7 +285,7 @@ LLSD llcoro::postAndSuspendWithTimeout(const LLSD& event,
     // declare the future
     LLCoros::Future<LLSD> future = LLCoros::getFuture(promise);
     // wait for specified timeout
-    boost::fibers::future_status status;
+    std::future_status status;
     {
         LLCoros::TempStatus st(STRINGIZE("waiting for " << replyPump.getPump().getName()
                                          << " for " << timeout << "s"));
@@ -296,7 +296,7 @@ LLSD llcoro::postAndSuspendWithTimeout(const LLSD& event,
         status = future.wait_for(std::chrono::milliseconds(long(timeout * 1000)));
     }
     // if the future is NOT yet ready, return timeoutResult instead
-    if (status == boost::fibers::future_status::timeout)
+    if (status == std::future_status::timeout)
     {
         LL_DEBUGS("lleventcoro") << "postAndSuspendWithTimeout(): coroutine " << listenerName
                                  << " timed out after " << timeout << " seconds,"
@@ -305,7 +305,7 @@ LLSD llcoro::postAndSuspendWithTimeout(const LLSD& event,
     }
     else
     {
-        llassert_always(status == boost::fibers::future_status::ready);
+        llassert_always(status == std::future_status::ready);
 
         // future is now ready, no more waiting
         LLSD value(future.get());
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h
index f396a71e6f..0aa75c9b73 100644
--- a/indra/llcommon/llthreadsafequeue.h
+++ b/indra/llcommon/llthreadsafequeue.h
@@ -28,9 +28,6 @@
 #define LL_LLTHREADSAFEQUEUE_H
 
 #include "llcoros.h"
-#include LLCOROS_MUTEX_HEADER
-#include <boost/fiber/timed_mutex.hpp>
-#include LLCOROS_CONDVAR_HEADER
 #include "llexception.h"
 #include "mutex.h"
 #include <chrono>
@@ -182,10 +179,10 @@ protected:
 	size_t mCapacity;
 	bool mClosed;
 
-	boost::fibers::timed_mutex mLock;
+	std::timed_mutex mLock;
 	typedef std::unique_lock<decltype(mLock)> lock_t;
-	boost::fibers::condition_variable_any mCapacityCond;
-	boost::fibers::condition_variable_any mEmptyCond;
+	std::condition_variable_any mCapacityCond;
+	std::condition_variable_any mEmptyCond;
 
 	enum pop_result { EMPTY, DONE, WAITING, POPPED };
 	// implementation logic, suitable for passing to tryLockUntil()
diff --git a/indra/llcommon/workqueue.cpp b/indra/llcommon/workqueue.cpp
index cf80ce0656..9c434bf2a9 100644
--- a/indra/llcommon/workqueue.cpp
+++ b/indra/llcommon/workqueue.cpp
@@ -18,7 +18,6 @@
 // external library headers
 // other Linden headers
 #include "llcoros.h"
-#include LLCOROS_MUTEX_HEADER
 #include "llerror.h"
 #include "llexception.h"
 #include "stringize.h"
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index e25a9ea7ef..4aab0a6537 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -58,7 +58,6 @@
 #include "boost/function.hpp"
 #include "llpounceable.h"
 #include "llcoros.h"
-#include LLCOROS_MUTEX_HEADER
 
 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
-- 
cgit v1.2.3


From 746788e78901835aeb3ba983840092ce97b257da Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Tue, 16 Jan 2024 16:46:34 +0200
Subject: Revert "replaces parts of boost to C++ standard."

---
 indra/llcommon/llcond.h            |  1 +
 indra/llcommon/llcoros.h           | 14 +++++++++-----
 indra/llcommon/lleventcoro.cpp     |  6 +++---
 indra/llcommon/llthreadsafequeue.h |  9 ++++++---
 indra/llcommon/workqueue.cpp       |  1 +
 indra/llmessage/message.h          |  1 +
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/indra/llcommon/llcond.h b/indra/llcommon/llcond.h
index a4bec124ca..da6e6affe1 100644
--- a/indra/llcommon/llcond.h
+++ b/indra/llcommon/llcond.h
@@ -16,6 +16,7 @@
 
 #include "llunits.h"
 #include "llcoros.h"
+#include LLCOROS_MUTEX_HEADER
 #include "mutex.h"
 #include <chrono>
 
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h
index 8160b87f23..966ce03296 100644
--- a/indra/llcommon/llcoros.h
+++ b/indra/llcommon/llcoros.h
@@ -41,6 +41,10 @@
 #include <exception>
 #include <queue>
 
+// e.g. #include LLCOROS_MUTEX_HEADER
+#define LLCOROS_MUTEX_HEADER   <boost/fiber/mutex.hpp>
+#define LLCOROS_CONDVAR_HEADER <boost/fiber/condition_variable.hpp>
+
 namespace boost {
     namespace fibers {
         class mutex;
@@ -285,17 +289,17 @@ public:
      * proxy, so continue using the aliases.
      */
     template <typename T>
-    using Promise = std::promise<T>;
+    using Promise = boost::fibers::promise<T>;
     template <typename T>
-    using Future = std::future<T>;
+    using Future = boost::fibers::future<T>;
     template <typename T>
     static Future<T> getFuture(Promise<T>& promise) { return promise.get_future(); }
 
     // use mutex, lock, condition_variable suitable for coroutines
-    using Mutex = std::mutex;
+    using Mutex = boost::fibers::mutex;
     using LockType = std::unique_lock<Mutex>;
-    using cv_status = std::cv_status;
-    using ConditionVariable = std::condition_variable;
+    using cv_status = boost::fibers::cv_status;
+    using ConditionVariable = boost::fibers::condition_variable;
 
     /// for data local to each running coroutine
     template <typename T>
diff --git a/indra/llcommon/lleventcoro.cpp b/indra/llcommon/lleventcoro.cpp
index 97a7ad04ad..067b5e6fbc 100644
--- a/indra/llcommon/lleventcoro.cpp
+++ b/indra/llcommon/lleventcoro.cpp
@@ -285,7 +285,7 @@ LLSD llcoro::postAndSuspendWithTimeout(const LLSD& event,
     // declare the future
     LLCoros::Future<LLSD> future = LLCoros::getFuture(promise);
     // wait for specified timeout
-    std::future_status status;
+    boost::fibers::future_status status;
     {
         LLCoros::TempStatus st(STRINGIZE("waiting for " << replyPump.getPump().getName()
                                          << " for " << timeout << "s"));
@@ -296,7 +296,7 @@ LLSD llcoro::postAndSuspendWithTimeout(const LLSD& event,
         status = future.wait_for(std::chrono::milliseconds(long(timeout * 1000)));
     }
     // if the future is NOT yet ready, return timeoutResult instead
-    if (status == std::future_status::timeout)
+    if (status == boost::fibers::future_status::timeout)
     {
         LL_DEBUGS("lleventcoro") << "postAndSuspendWithTimeout(): coroutine " << listenerName
                                  << " timed out after " << timeout << " seconds,"
@@ -305,7 +305,7 @@ LLSD llcoro::postAndSuspendWithTimeout(const LLSD& event,
     }
     else
     {
-        llassert_always(status == std::future_status::ready);
+        llassert_always(status == boost::fibers::future_status::ready);
 
         // future is now ready, no more waiting
         LLSD value(future.get());
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h
index 0aa75c9b73..f396a71e6f 100644
--- a/indra/llcommon/llthreadsafequeue.h
+++ b/indra/llcommon/llthreadsafequeue.h
@@ -28,6 +28,9 @@
 #define LL_LLTHREADSAFEQUEUE_H
 
 #include "llcoros.h"
+#include LLCOROS_MUTEX_HEADER
+#include <boost/fiber/timed_mutex.hpp>
+#include LLCOROS_CONDVAR_HEADER
 #include "llexception.h"
 #include "mutex.h"
 #include <chrono>
@@ -179,10 +182,10 @@ protected:
 	size_t mCapacity;
 	bool mClosed;
 
-	std::timed_mutex mLock;
+	boost::fibers::timed_mutex mLock;
 	typedef std::unique_lock<decltype(mLock)> lock_t;
-	std::condition_variable_any mCapacityCond;
-	std::condition_variable_any mEmptyCond;
+	boost::fibers::condition_variable_any mCapacityCond;
+	boost::fibers::condition_variable_any mEmptyCond;
 
 	enum pop_result { EMPTY, DONE, WAITING, POPPED };
 	// implementation logic, suitable for passing to tryLockUntil()
diff --git a/indra/llcommon/workqueue.cpp b/indra/llcommon/workqueue.cpp
index 9c434bf2a9..cf80ce0656 100644
--- a/indra/llcommon/workqueue.cpp
+++ b/indra/llcommon/workqueue.cpp
@@ -18,6 +18,7 @@
 // external library headers
 // other Linden headers
 #include "llcoros.h"
+#include LLCOROS_MUTEX_HEADER
 #include "llerror.h"
 #include "llexception.h"
 #include "stringize.h"
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 4aab0a6537..e25a9ea7ef 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -58,6 +58,7 @@
 #include "boost/function.hpp"
 #include "llpounceable.h"
 #include "llcoros.h"
+#include LLCOROS_MUTEX_HEADER
 
 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
-- 
cgit v1.2.3


From 0fa6ff2b1f488165c2521ef83e8b78aa2981ac88 Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <Ansariel@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:08:39 +0100
Subject: Undo re-ordering of autobuild.xml (#638)

---
 autobuild.xml | 1514 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 750 insertions(+), 764 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6098b4ffdf..8d73bf1fb4 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1,20 +1,14 @@
 <?xml version="1.0" ?>
 <llsd>
 <map>
+    <key>version</key>
+    <string>1.3</string>
+    <key>type</key>
+    <string>autobuild</string>
     <key>installables</key>
     <map>
       <key>SDL</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
-        <key>description</key>
-        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/SDL.txt</string>
-        <key>name</key>
-        <string>SDL</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -30,21 +24,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/SDL.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1997-2012 Sam Lantinga</string>
         <key>version</key>
         <string>1.2.15</string>
+        <key>name</key>
+        <string>SDL</string>
+        <key>description</key>
+        <string>Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.</string>
       </map>
       <key>apr_suite</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
-        <key>description</key>
-        <string>Apache portable runtime project</string>
-        <key>license</key>
-        <string>apache</string>
-        <key>license_file</key>
-        <string>LICENSES/apr_suite.txt</string>
-        <key>name</key>
-        <string>apr_suite</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -88,21 +82,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>apache</string>
+        <key>license_file</key>
+        <string>LICENSES/apr_suite.txt</string>
+        <key>copyright</key>
+        <string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
         <key>version</key>
         <string>1.7.2-e935465</string>
+        <key>name</key>
+        <string>apr_suite</string>
+        <key>description</key>
+        <string>Apache portable runtime project</string>
       </map>
       <key>boost</key>
       <map>
-        <key>copyright</key>
-        <string>(see individual source files)</string>
-        <key>description</key>
-        <string>Boost C++ Libraries</string>
-        <key>license</key>
-        <string>boost 1.0</string>
-        <key>license_file</key>
-        <string>LICENSES/boost.txt</string>
-        <key>name</key>
-        <string>boost</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -146,21 +140,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>boost 1.0</string>
+        <key>license_file</key>
+        <string>LICENSES/boost.txt</string>
+        <key>copyright</key>
+        <string>(see individual source files)</string>
         <key>version</key>
         <string>1.81</string>
+        <key>name</key>
+        <string>boost</string>
+        <key>description</key>
+        <string>Boost C++ Libraries</string>
       </map>
       <key>bugsplat</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2003-2017, BugSplat</string>
-        <key>description</key>
-        <string>Bugsplat crash reporting package</string>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
-        <key>name</key>
-        <string>bugsplat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -192,19 +186,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/BUGSPLAT_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2003-2017, BugSplat</string>
         <key>version</key>
         <string>4.0.3.0-527603a</string>
+        <key>name</key>
+        <string>bugsplat</string>
+        <key>description</key>
+        <string>Bugsplat crash reporting package</string>
       </map>
       <key>colladadom</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
-        <key>license</key>
-        <string>SCEA</string>
-        <key>license_file</key>
-        <string>LICENSES/collada.txt</string>
-        <key>name</key>
-        <string>colladadom</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -248,19 +244,19 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>SCEA</string>
+        <key>license_file</key>
+        <string>LICENSES/collada.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2006 Sony Computer Entertainment Inc.</string>
         <key>version</key>
         <string>2.3.d1ef72a</string>
+        <key>name</key>
+        <string>colladadom</string>
       </map>
       <key>cubemaptoequirectangular</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
-        <key>name</key>
-        <string>cubemaptoequirectangular</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -304,21 +300,19 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/CUBEMAPTOEQUIRECTANGULAR_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017 Jaume Sanchez Elias, http://www.clicktorelease.com</string>
         <key>version</key>
         <string>1.1.0</string>
+        <key>name</key>
+        <string>cubemaptoequirectangular</string>
       </map>
       <key>curl</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
-        <key>description</key>
-        <string>Library for transferring data specified with URL syntax</string>
-        <key>license</key>
-        <string>curl</string>
-        <key>license_file</key>
-        <string>LICENSES/curl.txt</string>
-        <key>name</key>
-        <string>curl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -362,21 +356,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>curl</string>
+        <key>license_file</key>
+        <string>LICENSES/curl.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1996 - 2014, Daniel Stenberg, (daniel@haxx.se).</string>
         <key>version</key>
         <string>7.54.1-5a4a82d</string>
+        <key>name</key>
+        <string>curl</string>
+        <key>description</key>
+        <string>Library for transferring data specified with URL syntax</string>
       </map>
       <key>dbus_glib</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) Red Hat Inc.</string>
-        <key>description</key>
-        <string>D-Bus bindings for glib</string>
-        <key>license</key>
-        <string>Academic Free License v. 2.1</string>
-        <key>license_file</key>
-        <string>LICENSES/dbus-glib.txt</string>
-        <key>name</key>
-        <string>dbus_glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -392,21 +386,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Academic Free License v. 2.1</string>
+        <key>license_file</key>
+        <string>LICENSES/dbus-glib.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) Red Hat Inc.</string>
         <key>version</key>
         <string>0.76</string>
+        <key>name</key>
+        <string>dbus_glib</string>
+        <key>description</key>
+        <string>D-Bus bindings for glib</string>
       </map>
       <key>dictionaries</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2014 Apache OpenOffice software</string>
-        <key>description</key>
-        <string>Spell checking dictionaries to bundled into the viewer</string>
-        <key>license</key>
-        <string>various open source</string>
-        <key>license_file</key>
-        <string>LICENSES/dictionaries.txt</string>
-        <key>name</key>
-        <string>dictionaries</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -424,21 +418,21 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>various open source</string>
+        <key>license_file</key>
+        <string>LICENSES/dictionaries.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2014 Apache OpenOffice software</string>
         <key>version</key>
         <string>None</string>
+        <key>name</key>
+        <string>dictionaries</string>
+        <key>description</key>
+        <string>Spell checking dictionaries to bundled into the viewer</string>
       </map>
       <key>dullahan</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2017, Linden Research, Inc.</string>
-        <key>description</key>
-        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
-        <key>license</key>
-        <string>MPL</string>
-        <key>license_file</key>
-        <string>LICENSES/LICENSE.txt</string>
-        <key>name</key>
-        <string>dullahan</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -470,21 +464,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MPL</string>
+        <key>license_file</key>
+        <string>LICENSES/LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.14.0.202310131404_118.4.1_g3dd6078_chromium-118.0.5993.54</string>
+        <key>name</key>
+        <string>dullahan</string>
+        <key>description</key>
+        <string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
       </map>
       <key>expat</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
-        <key>description</key>
-        <string>Expat is an XML parser library written in C</string>
-        <key>license</key>
-        <string>expat</string>
-        <key>license_file</key>
-        <string>LICENSES/expat.txt</string>
-        <key>name</key>
-        <string>expat</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -530,21 +524,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>expat</string>
+        <key>license_file</key>
+        <string>LICENSES/expat.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.</string>
         <key>version</key>
         <string>2.1.1.1f36d02</string>
+        <key>name</key>
+        <string>expat</string>
+        <key>description</key>
+        <string>Expat is an XML parser library written in C</string>
       </map>
       <key>fmodstudio</key>
       <map>
-        <key>copyright</key>
-        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
-        <key>description</key>
-        <string>FMOD Studio API</string>
-        <key>license</key>
-        <string>fmod</string>
-        <key>license_file</key>
-        <string>LICENSES/fmodstudio.txt</string>
-        <key>name</key>
-        <string>fmodstudio</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -596,21 +590,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>fmod</string>
+        <key>license_file</key>
+        <string>LICENSES/fmodstudio.txt</string>
+        <key>copyright</key>
+        <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
         <key>version</key>
         <string>2.02.13.578928</string>
+        <key>name</key>
+        <string>fmodstudio</string>
+        <key>description</key>
+        <string>FMOD Studio API</string>
       </map>
       <key>fontconfig</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
-        <key>description</key>
-        <string>Fontconfig is a library for configuring and customizing font access.</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/fontconfig.txt</string>
-        <key>name</key>
-        <string>fontconfig</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -626,21 +620,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/fontconfig.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2000,2001,2002,2003,2004,2006,2007 Keith Packard, 2005 Patrick Lam, 2009 Roozbeh Pournader, 2008,2009 Red Hat, Inc., 2008 Danilo Šegan, 2012 Google, Inc.</string>
         <key>version</key>
         <string>2.11.0</string>
+        <key>name</key>
+        <string>fontconfig</string>
+        <key>description</key>
+        <string>Fontconfig is a library for configuring and customizing font access.</string>
       </map>
       <key>freetype</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
-        <key>description</key>
-        <string>Font rendering library</string>
-        <key>license</key>
-        <string>FreeType</string>
-        <key>license_file</key>
-        <string>LICENSES/freetype.txt</string>
-        <key>name</key>
-        <string>freetype</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -686,21 +680,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>FreeType</string>
+        <key>license_file</key>
+        <string>LICENSES/freetype.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
         <key>version</key>
         <string>2.4.4.4f739fa</string>
+        <key>name</key>
+        <string>freetype</string>
+        <key>description</key>
+        <string>Font rendering library</string>
       </map>
       <key>glext</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
-        <key>description</key>
-        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
-        <key>license</key>
-        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
-        <key>license_file</key>
-        <string>LICENSES/glext.txt</string>
-        <key>name</key>
-        <string>glext</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -718,21 +712,21 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
+        <key>license_file</key>
+        <string>LICENSES/glext.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 The Khronos Group Inc.</string>
         <key>version</key>
         <string>68</string>
+        <key>name</key>
+        <string>glext</string>
+        <key>description</key>
+        <string>glext headers define function prototypes and constants for OpenGL extensions</string>
       </map>
       <key>glh_linear</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2000 Cass Everitt</string>
-        <key>description</key>
-        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/glh-linear.txt</string>
-        <key>name</key>
-        <string>glh_linear</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -750,21 +744,21 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/glh-linear.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2000 Cass Everitt</string>
         <key>version</key>
         <string>None</string>
+        <key>name</key>
+        <string>glh_linear</string>
+        <key>description</key>
+        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
       </map>
       <key>googlemock</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2008, Google Inc.</string>
-        <key>description</key>
-        <string>a library for writing and using C++ mock classes</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/gmock.txt</string>
-        <key>name</key>
-        <string>googlemock</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -808,19 +802,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/gmock.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2008, Google Inc.</string>
         <key>version</key>
         <string>1.7.0.77bba00</string>
+        <key>name</key>
+        <string>googlemock</string>
+        <key>description</key>
+        <string>a library for writing and using C++ mock classes</string>
       </map>
       <key>gstreamer</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/gstreamer.txt</string>
-        <key>name</key>
-        <string>gstreamer</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -836,19 +832,19 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/gstreamer.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</string>
         <key>version</key>
         <string>0.10.6.314267</string>
+        <key>name</key>
+        <string>gstreamer</string>
       </map>
       <key>gtk-atk-pango-glib</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (various, see sources)</string>
-        <key>license</key>
-        <string>lgpl</string>
-        <key>license_file</key>
-        <string>LICENSES/gtk-atk-pango-glib.txt</string>
-        <key>name</key>
-        <string>gtk-atk-pango-glib</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -864,21 +860,19 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>license_file</key>
+        <string>LICENSES/gtk-atk-pango-glib.txt</string>
+        <key>copyright</key>
+        <string>Copyright (various, see sources)</string>
         <key>version</key>
         <string>0.1</string>
+        <key>name</key>
+        <string>gtk-atk-pango-glib</string>
       </map>
       <key>havok-source</key>
       <map>
-        <key>copyright</key>
-        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
-        <key>description</key>
-        <string>Havok source code for libs and demos</string>
-        <key>license</key>
-        <string>havok</string>
-        <key>license_file</key>
-        <string>LICENSES/havok.txt</string>
-        <key>name</key>
-        <string>havok-source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -926,19 +920,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>havok</string>
+        <key>license_file</key>
+        <string>LICENSES/havok.txt</string>
+        <key>copyright</key>
+        <string>Uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.</string>
         <key>version</key>
         <string>2012.1-2</string>
+        <key>name</key>
+        <string>havok-source</string>
+        <key>description</key>
+        <string>Havok source code for libs and demos</string>
       </map>
       <key>jpegencoderbasic</key>
       <map>
-        <key>copyright</key>
-        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
-        <key>license</key>
-        <string>NONE</string>
-        <key>license_file</key>
-        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
-        <key>name</key>
-        <string>jpegencoderbasic</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -982,21 +978,19 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>NONE</string>
+        <key>license_file</key>
+        <string>LICENSES/JPEG_ENCODER_BASIC_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Andreas Ritter, www.bytestrom.eu, 11/2009</string>
         <key>version</key>
         <string>1.0</string>
+        <key>name</key>
+        <string>jpegencoderbasic</string>
       </map>
       <key>jpeglib</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
-        <key>description</key>
-        <string>JPEG encoding, decoding library</string>
-        <key>license</key>
-        <string>jpeglib</string>
-        <key>license_file</key>
-        <string>LICENSES/jpeglib.txt</string>
-        <key>name</key>
-        <string>jpeglib</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1042,21 +1036,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>jpeglib</string>
+        <key>license_file</key>
+        <string>LICENSES/jpeglib.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</string>
         <key>version</key>
         <string>8c.7846234</string>
+        <key>name</key>
+        <string>jpeglib</string>
+        <key>description</key>
+        <string>JPEG encoding, decoding library</string>
       </map>
       <key>jsoncpp</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
-        <key>description</key>
-        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
-        <key>license</key>
-        <string>public domain</string>
-        <key>license_file</key>
-        <string>LICENSES/jsoncpp.txt</string>
-        <key>name</key>
-        <string>jsoncpp</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1102,21 +1096,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>public domain</string>
+        <key>license_file</key>
+        <string>LICENSES/jsoncpp.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2007-2010 Baptiste Lepilleur</string>
         <key>version</key>
         <string>0.5.0.bc46e62</string>
+        <key>name</key>
+        <string>jsoncpp</string>
+        <key>description</key>
+        <string>jsoncpp is an implementation of a JSON (http://json.org) reader and writer in C++.</string>
       </map>
       <key>kdu</key>
       <map>
-        <key>copyright</key>
-        <string>Kakadu software</string>
-        <key>description</key>
-        <string>JPEG2000 library by Kakadu</string>
-        <key>license</key>
-        <string>Kakadu</string>
-        <key>license_file</key>
-        <string>LICENSES/kdu.txt</string>
-        <key>name</key>
-        <string>kdu</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1168,21 +1162,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Kakadu</string>
+        <key>license_file</key>
+        <string>LICENSES/kdu.txt</string>
+        <key>copyright</key>
+        <string>Kakadu software</string>
         <key>version</key>
         <string>7.10.4.539108</string>
+        <key>name</key>
+        <string>kdu</string>
+        <key>description</key>
+        <string>JPEG2000 library by Kakadu</string>
       </map>
       <key>libhunspell</key>
       <map>
-        <key>copyright</key>
-        <string>See hunspell.txt</string>
-        <key>description</key>
-        <string>Spell checking library</string>
-        <key>license</key>
-        <string>LGPL</string>
-        <key>license_file</key>
-        <string>LICENSES/hunspell.txt</string>
-        <key>name</key>
-        <string>libhunspell</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1228,21 +1222,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL</string>
+        <key>license_file</key>
+        <string>LICENSES/hunspell.txt</string>
+        <key>copyright</key>
+        <string>See hunspell.txt</string>
         <key>version</key>
         <string>1.3.2.650fb94</string>
+        <key>name</key>
+        <string>libhunspell</string>
+        <key>description</key>
+        <string>Spell checking library</string>
       </map>
       <key>libndofdev</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
-        <key>description</key>
-        <string>3DConnexion SDK</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/libndofdev.txt</string>
-        <key>name</key>
-        <string>libndofdev</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1274,21 +1268,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/libndofdev.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2007, 3Dconnexion, Inc. - All rights reserved.</string>
         <key>version</key>
         <string>0.1.8e9edc7</string>
+        <key>name</key>
+        <string>libndofdev</string>
+        <key>description</key>
+        <string>3DConnexion SDK</string>
       </map>
       <key>libpng</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
-        <key>description</key>
-        <string>PNG Reference library</string>
-        <key>license</key>
-        <string>libpng</string>
-        <key>license_file</key>
-        <string>LICENSES/libpng.txt</string>
-        <key>name</key>
-        <string>libpng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1332,21 +1326,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>libpng</string>
+        <key>license_file</key>
+        <string>LICENSES/libpng.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson</string>
         <key>version</key>
         <string>1.6.38-ca06e99</string>
+        <key>name</key>
+        <string>libpng</string>
+        <key>description</key>
+        <string>PNG Reference library</string>
       </map>
       <key>libuuid</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
-        <key>description</key>
-        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
-        <key>license</key>
-        <string>UUID</string>
-        <key>license_file</key>
-        <string>LICENSES/uuid.txt</string>
-        <key>name</key>
-        <string>libuuid</string>
         <key>platforms</key>
         <map>
           <key>linux64</key>
@@ -1362,21 +1356,21 @@
             <string>linux64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>UUID</string>
+        <key>license_file</key>
+        <string>LICENSES/uuid.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
         <key>version</key>
         <string>1.6.2</string>
+        <key>name</key>
+        <string>libuuid</string>
+        <key>description</key>
+        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
       </map>
       <key>libxml2</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
-        <key>description</key>
-        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/libxml2.txt</string>
-        <key>name</key>
-        <string>libxml2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1422,21 +1416,21 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/libxml2.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2012 Daniel Veillard.  All Rights Reserved.</string>
         <key>version</key>
         <string>2.9.4.7476681</string>
+        <key>name</key>
+        <string>libxml2</string>
+        <key>description</key>
+        <string>Libxml2 is the XML C parser and toolkit developed for the Gnome project.</string>
       </map>
       <key>llappearance_utility</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
-        <key>description</key>
-        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
-        <key>license</key>
-        <string>Proprietary</string>
-        <key>license_file</key>
-        <string>LICENSES/llappearanceutility.txt</string>
-        <key>name</key>
-        <string>llappearance_utility</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1452,20 +1446,21 @@
             <string>linux</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Proprietary</string>
+        <key>license_file</key>
+        <string>LICENSES/llappearanceutility.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
         <key>version</key>
         <string>0.0.1</string>
+        <key>name</key>
+        <string>llappearance_utility</string>
+        <key>description</key>
+        <string>Linden Lab appearance utility for server-side avatar baking services.</string>
       </map>
       <key>llca</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
-      </string>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/ca-license.txt</string>
-        <key>name</key>
-        <string>llca</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -1483,19 +1478,20 @@
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/ca-license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
+      </string>
         <key>version</key>
         <string>202310121530.0</string>
+        <key>name</key>
+        <string>llca</string>
       </map>
       <key>llphysicsextensions_source</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/llphysicsextensions.txt</string>
-        <key>name</key>
-        <string>llphysicsextensions_source</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1530,22 +1526,6 @@
             <key>name</key>
             <string>linux64</string>
           </map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>creds</key>
-              <string>github</string>
-              <key>hash</key>
-              <string>2e6a66da6071253ae888839cfab59d3f5c1b8b4c</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
-              <key>url</key>
-              <string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/144851462</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
@@ -1563,19 +1543,19 @@
             <string>windows64</string>
           </map>
         </map>
-        <key>version</key>
-        <string>1.0.479d20a</string>
-      </map>
-      <key>llphysicsextensions_stub</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>license</key>
         <string>internal</string>
         <key>license_file</key>
         <string>LICENSES/llphysicsextensions.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
+        <key>version</key>
+        <string>1.0.479d20a</string>
         <key>name</key>
-        <string>llphysicsextensions_stub</string>
+        <string>llphysicsextensions_source</string>
+      </map>
+      <key>llphysicsextensions_stub</key>
+      <map>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1615,19 +1595,19 @@
             <string>windows</string>
           </map>
         </map>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/llphysicsextensions.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.542456</string>
+        <key>name</key>
+        <string>llphysicsextensions_stub</string>
       </map>
       <key>llphysicsextensions_tpv</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2010, Linden Research, Inc.</string>
-        <key>license</key>
-        <string>internal</string>
-        <key>license_file</key>
-        <string>LICENSES/HavokSublicense.pdf</string>
-        <key>name</key>
-        <string>llphysicsextensions_tpv</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1667,17 +1647,19 @@
             <string>windows</string>
           </map>
         </map>
+        <key>license</key>
+        <string>internal</string>
+        <key>license_file</key>
+        <string>LICENSES/HavokSublicense.pdf</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
         <string>1.0.561752</string>
+        <key>name</key>
+        <string>llphysicsextensions_tpv</string>
       </map>
       <key>mesa</key>
       <map>
-        <key>license</key>
-        <string>mesa</string>
-        <key>license_file</key>
-        <string>LICENSES/mesa.txt</string>
-        <key>name</key>
-        <string>mesa</string>
         <key>platforms</key>
         <map>
           <key>linux</key>
@@ -1693,23 +1675,17 @@
             <string>linux</string>
           </map>
         </map>
+        <key>license</key>
+        <string>mesa</string>
+        <key>license_file</key>
+        <string>LICENSES/mesa.txt</string>
         <key>version</key>
         <string>7.11.1.297294</string>
+        <key>name</key>
+        <string>mesa</string>
       </map>
       <key>meshoptimizer</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
-        <key>description</key>
-        <string>Meshoptimizer. Mesh optimization library.</string>
-        <key>license</key>
-        <string>meshoptimizer</string>
-        <key>license_file</key>
-        <string>LICENSES/meshoptimizer.txt</string>
-        <key>name</key>
-        <string>meshoptimizer</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1741,8 +1717,20 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>meshoptimizer</string>
+        <key>license_file</key>
+        <string>LICENSES/meshoptimizer.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2016-2021 Arseny Kapoulkine</string>
         <key>version</key>
         <string>160</string>
+        <key>name</key>
+        <string>meshoptimizer</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-meshoptimizer</string>
+        <key>description</key>
+        <string>Meshoptimizer. Mesh optimization library.</string>
       </map>
       <key>mikktspace</key>
       <map>
@@ -1802,18 +1790,6 @@
       </map>
       <key>minizip-ng</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
-        <key>copyright</key>
-        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
-        <key>description</key>
-        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
-        <key>license</key>
-        <string>minizip-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/minizip-ng.txt</string>
-        <key>name</key>
-        <string>minizip-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1859,22 +1835,23 @@
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>minizip-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/minizip-ng.txt</string>
+        <key>copyright</key>
+        <string>This project uses the zlib license. Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>3.0.2.3e9876e</string>
+        <key>name</key>
+        <string>minizip-ng</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-minizip-ng</string>
+        <key>description</key>
+        <string>minizip-ng is a zip manipulation library. Based on work of Gilles Vollant.</string>
       </map>
       <key>nghttp2</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
-Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
-        <key>description</key>
-        <string>Library providing HTTP 2 support for libcurl</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/nghttp2.txt</string>
-        <key>name</key>
-        <string>nghttp2</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -1920,23 +1897,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>source_type</key>
-        <string>hg</string>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/nghttp2.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
+Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>version</key>
         <string>1.40.0.b1526c6</string>
+        <key>name</key>
+        <string>nghttp2</string>
+        <key>description</key>
+        <string>Library providing HTTP 2 support for libcurl</string>
+        <key>source_type</key>
+        <string>hg</string>
       </map>
       <key>nvapi</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
-        <key>description</key>
-        <string>NVAPI provides an interface to NVIDIA devices.</string>
-        <key>license</key>
-        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
-        <key>license_file</key>
-        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
-        <key>name</key>
-        <string>nvapi</string>
         <key>platforms</key>
         <map>
           <key>windows64</key>
@@ -1954,21 +1932,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
+        <key>license_file</key>
+        <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
+        <key>copyright</key>
+        <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
         <key>version</key>
         <string>352.aac0e19</string>
-      </map>
-      <key>ogg_vorbis</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2002, Xiph.org Foundation</string>
-        <key>description</key>
-        <string>Audio encoding library</string>
-        <key>license</key>
-        <string>ogg-vorbis</string>
-        <key>license_file</key>
-        <string>LICENSES/ogg-vorbis.txt</string>
         <key>name</key>
-        <string>ogg_vorbis</string>
+        <string>nvapi</string>
+        <key>description</key>
+        <string>NVAPI provides an interface to NVIDIA devices.</string>
+      </map>
+      <key>ogg_vorbis</key>
+      <map>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2012,96 +1990,96 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>ogg-vorbis</string>
+        <key>license_file</key>
+        <string>LICENSES/ogg-vorbis.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2002, Xiph.org Foundation</string>
         <key>version</key>
         <string>1.3.3-1.3.6.e4101b6</string>
+        <key>name</key>
+        <string>ogg_vorbis</string>
+        <key>description</key>
+        <string>Audio encoding library</string>
       </map>
       <key>open-libndofdev</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
-        <key>description</key>
-        <string>Open Source replacement for 3DConnection SDK</string>
         <key>license</key>
         <string>BSD</string>
         <key>license_file</key>
         <string>LICENSES/libndofdev.txt</string>
-        <key>name</key>
-        <string>open-libndofdev</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2008, Jan Ciger (jan.ciger (at) gmail.com)</string>
         <key>version</key>
         <string>0.3</string>
+        <key>name</key>
+        <string>open-libndofdev</string>
+        <key>description</key>
+        <string>Open Source replacement for 3DConnection SDK</string>
       </map>
       <key>openal</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1999-2007 by authors.</string>
-        <key>description</key>
-        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
-        <key>license</key>
-        <string>LGPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/openal-soft.txt</string>
-        <key>name</key>
-        <string>openal</string>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
+              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>darwin64</string>
+            <string>linux64</string>
           </map>
-          <key>linux64</key>
+          <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e0fbc4874acc4167a6e2b6489fbb8258d98fd665</string>
+              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-linux64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>windows64</string>
           </map>
-          <key>windows64</key>
+          <key>darwin64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6ae3b5310eb1988741bc55416681ca9d64f76f85</string>
+              <string>4edaef5f03a1122eae8467c4a04d9caccaaaf847</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-windows64-18e315c.tar.zst</string>
+              <string>https://github.com/secondlife/3p-openal-soft/releases/download/v1.23.1-18e315c/openal-1.23.1-darwin64-18e315c.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>darwin64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>LGPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/openal-soft.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1999-2007 by authors.</string>
         <key>version</key>
         <string>1.23.1</string>
+        <key>name</key>
+        <string>openal</string>
+        <key>description</key>
+        <string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
       </map>
       <key>openjpeg</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
-        <key>description</key>
-        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/openjpeg.txt</string>
-        <key>name</key>
-        <string>openjpeg</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2147,21 +2125,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/openjpeg.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium; Copyright (c) 2002-2007, Professor Benoit Macq; Copyright (c) 2001-2003, David Janssens; Copyright (c) 2002-2003, Yannick Verschueren; Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe; Copyright (c) 2005, Herve Drolon, FreeImage Team; Copyright (c) 2006-2007, Parvatha Elangovan; Copyright (c) 2008, Jerome Fimes, Communications &amp; Systemes &lt;jerome.fimes@c-s.fr&gt;; Copyright (c) 2010-2011, Kaori Hagihara; Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France; Copyright (c) 2012, CS Systemes d'Information, France;</string>
         <key>version</key>
         <string>2.5.0.ea12248</string>
+        <key>name</key>
+        <string>openjpeg</string>
+        <key>description</key>
+        <string>The OpenJPEG library is an open-source JPEG 2000 codec written in C language.</string>
       </map>
       <key>openssl</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
-        <key>description</key>
-        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
-        <key>license</key>
-        <string>openssl</string>
-        <key>license_file</key>
-        <string>LICENSES/openssl.txt</string>
-        <key>name</key>
-        <string>openssl</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2207,21 +2185,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>openssl</string>
+        <key>license_file</key>
+        <string>LICENSES/openssl.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved; Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</string>
         <key>version</key>
         <string>1.1.1q.de53f55</string>
+        <key>name</key>
+        <string>openssl</string>
+        <key>description</key>
+        <string>Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) Library</string>
       </map>
       <key>pcre</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
-        <key>description</key>
-        <string>PCRE Perl-compatible regular expression library</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/pcre-license.txt</string>
-        <key>name</key>
-        <string>pcre</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2265,21 +2243,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/pcre-license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 1997-2014 University of Cambridge; Copyright(c) 2009-2014 Zoltan Herczeg; Copyright (c) 2007-2012, Google Inc.</string>
         <key>version</key>
         <string>8.35.979fd86</string>
+        <key>name</key>
+        <string>pcre</string>
+        <key>description</key>
+        <string>PCRE Perl-compatible regular expression library</string>
       </map>
       <key>slvoice</key>
       <map>
-        <key>copyright</key>
-        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
-        <key>description</key>
-        <string>Vivox SDK components</string>
-        <key>license</key>
-        <string>Mixed</string>
-        <key>license_file</key>
-        <string>LICENSES/vivox_licenses.txt</string>
-        <key>name</key>
-        <string>slvoice</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2327,19 +2305,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>Mixed</string>
+        <key>license_file</key>
+        <string>LICENSES/vivox_licenses.txt</string>
+        <key>copyright</key>
+        <string>2010 Vivox, including audio coding using Polycom¨ Siren14TM (ITU-T Rec. G.722.1 Annex C)</string>
         <key>version</key>
         <string>4.10.0000.32327.5fc3fe7c.571099</string>
+        <key>name</key>
+        <string>slvoice</string>
+        <key>description</key>
+        <string>Vivox SDK components</string>
       </map>
       <key>threejs</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright © 2010-2021 three.js authors</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/THREEJS_LICENSE.txt</string>
-        <key>name</key>
-        <string>threejs</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2383,8 +2363,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>MIT</string>
+        <key>license_file</key>
+        <string>LICENSES/THREEJS_LICENSE.txt</string>
+        <key>copyright</key>
+        <string>Copyright © 2010-2021 three.js authors</string>
         <key>version</key>
         <string>0.132.2</string>
+        <key>name</key>
+        <string>threejs</string>
       </map>
       <key>tinygltf</key>
       <map>
@@ -2424,18 +2412,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tracy</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
-        <key>description</key>
-        <string>Tracy Profiler Library</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tracy_license.txt</string>
-        <key>name</key>
-        <string>tracy</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2465,6 +2441,20 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tracy_license.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2017-2022, Bartosz Taudul (wolf@nereid.pl)</string>
+        <key>version</key>
+        <string>v0.8.1.235e98f</string>
+        <key>name</key>
+        <string>tracy</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-tracy</string>
+        <key>description</key>
+        <string>Tracy Profiler Library</string>
         <key>source</key>
         <string>https://bitbucket.org/lindenlab/3p-tracy</string>
         <key>source_type</key>
@@ -2474,16 +2464,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
       </map>
       <key>tut</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
-        <key>description</key>
-        <string>TUT is a small and portable unit test framework for C++.</string>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/tut.txt</string>
-        <key>name</key>
-        <string>tut</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2501,21 +2481,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>common</string>
           </map>
         </map>
+        <key>license</key>
+        <string>bsd</string>
+        <key>license_file</key>
+        <string>LICENSES/tut.txt</string>
+        <key>copyright</key>
+        <string>Copyright 2002-2006 Vladimir Dyuzhev, Copyright 2007 Denis Kononenko, Copyright 2008-2009 Michał Rzechonek</string>
         <key>version</key>
         <string>2008.11.30</string>
+        <key>name</key>
+        <string>tut</string>
+        <key>description</key>
+        <string>TUT is a small and portable unit test framework for C++.</string>
       </map>
       <key>uriparser</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
-        <key>description</key>
-        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
-        <key>license</key>
-        <string>New BSD license</string>
-        <key>license_file</key>
-        <string>LICENSES/uriparser.txt</string>
-        <key>name</key>
-        <string>uriparser</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2561,21 +2541,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>New BSD license</string>
+        <key>license_file</key>
+        <string>LICENSES/uriparser.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 2007, Weijia Song &lt;songweijia@gmail.com&gt;, Sebastian Pipping &lt;webmaster@hartwork.org&gt;</string>
         <key>version</key>
         <string>0.9.4</string>
+        <key>name</key>
+        <string>uriparser</string>
+        <key>description</key>
+        <string>uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license.</string>
       </map>
       <key>viewer-manager</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
-        <key>description</key>
-        <string>Linden Lab Viewer Management Process suite.</string>
-        <key>license</key>
-        <string>viewerlgpl</string>
-        <key>license_file</key>
-        <string>LICENSE</string>
-        <key>name</key>
-        <string>viewer-manager</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2621,23 +2601,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
-        <key>source</key>
-        <string>https://bitbucket.org/lindenlab/vmp-standalone</string>
-        <key>source_type</key>
-        <string>hg</string>
+        <key>license</key>
+        <string>viewerlgpl</string>
+        <key>license_file</key>
+        <string>LICENSE</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2000-2012, Linden Research, Inc.</string>
         <key>version</key>
         <string>3.0-08bf5ee</string>
+        <key>name</key>
+        <string>viewer-manager</string>
+        <key>description</key>
+        <string>Linden Lab Viewer Management Process suite.</string>
+        <key>source</key>
+        <string>https://bitbucket.org/lindenlab/vmp-standalone</string>
+        <key>source_type</key>
+        <string>hg</string>
       </map>
       <key>vlc-bin</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
-        <key>license</key>
-        <string>GPL2</string>
-        <key>license_file</key>
-        <string>LICENSES/vlc.txt</string>
-        <key>name</key>
-        <string>vlc-bin</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2669,23 +2651,19 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>GPL2</string>
+        <key>license_file</key>
+        <string>LICENSES/vlc.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
         <key>version</key>
         <string>3.0.16.c219a5d</string>
+        <key>name</key>
+        <string>vlc-bin</string>
       </map>
-      <key>vulkan_gltf</key>
+      <key>xmlrpc-epi</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>description</key>
-        <string>Vulkan GLTF Sample Implementation</string>
-        <key>license</key>
-        <string>Copyright (c) 2018 Sascha Willems</string>
-        <key>license_file</key>
-        <string>LICENSES/vulkan_gltf.txt</string>
-        <key>name</key>
-        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2693,53 +2671,71 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>8cff2060843db3db788511ee34a8e8cc</string>
+              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>windows</key>
+          <key>linux64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>58eea384be49ba756ce9c5e66669540b</string>
+              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows</string>
+            <string>linux64</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
+              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
+              <key>hash_algorithm</key>
+              <string>sha1</string>
               <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
+              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>xmlrpc-epi</string>
+        <key>license_file</key>
+        <string>LICENSES/xmlrpc-epi.txt</string>
+        <key>copyright</key>
+        <string>Copyright: (C) 2000 Epinions, Inc.</string>
         <key>version</key>
-        <string>1</string>
+        <string>0.54.1.8a05acf</string>
+        <key>name</key>
+        <string>xmlrpc-epi</string>
+        <key>description</key>
+        <string>XMLRPC Library</string>
       </map>
-      <key>xmlrpc-epi</key>
+      <key>vulkan_gltf</key>
       <map>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-vulkan-gltf-pbr</string>
         <key>copyright</key>
-        <string>Copyright: (C) 2000 Epinions, Inc.</string>
+        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>description</key>
-        <string>XMLRPC Library</string>
+        <string>Vulkan GLTF Sample Implementation</string>
         <key>license</key>
-        <string>xmlrpc-epi</string>
+        <string>Copyright (c) 2018 Sascha Willems</string>
         <key>license_file</key>
-        <string>LICENSES/xmlrpc-epi.txt</string>
+        <string>LICENSES/vulkan_gltf.txt</string>
         <key>name</key>
-        <string>xmlrpc-epi</string>
+        <string>vulkan_gltf</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2747,59 +2743,43 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa12611374876196b3ebb6bda8d419a697217b8b</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>8cff2060843db3db788511ee34a8e8cc</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-darwin64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101316/891509/vulkan_gltf-1-darwin64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
           </map>
-          <key>linux64</key>
+          <key>windows</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ad0c8b41ee4b4de216382bec46ee1c25962a3f12</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>58eea384be49ba756ce9c5e66669540b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-linux64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101318/891520/vulkan_gltf-1-windows-572743.tar.bz2</string>
             </map>
             <key>name</key>
-            <string>linux64</string>
+            <string>windows</string>
           </map>
           <key>windows64</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>e53fd38c14b8c47c7c84dead8a1b211bb8be170c</string>
-              <key>hash_algorithm</key>
-              <string>sha1</string>
+              <string>79b6a11622c2f83cfc2b7cd1fafb867b</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-xmlrpc-epi/releases/download/v0.54.1.8a05acf/xmlrpc_epi-0.54.1.8a05acf-windows64-8a05acf.tar.zst</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101319/891521/vulkan_gltf-1-windows64-572743.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>0.54.1.8a05acf</string>
+        <string>1</string>
       </map>
       <key>xxhash</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2012-2021 Yann Collet</string>
-        <key>description</key>
-        <string>xxHash Library</string>
-        <key>license</key>
-        <string>xxhash</string>
-        <key>license_file</key>
-        <string>LICENSES/xxhash.txt</string>
-        <key>name</key>
-        <string>xxhash</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -2857,23 +2837,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>xxhash</string>
+        <key>license_file</key>
+        <string>LICENSES/xxhash.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2012-2021 Yann Collet</string>
         <key>version</key>
         <string>0.8.1.7501c90</string>
+        <key>name</key>
+        <string>xxhash</string>
+        <key>description</key>
+        <string>xxHash Library</string>
       </map>
       <key>zlib-ng</key>
       <map>
-        <key>canonical_repo</key>
-        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
-        <key>copyright</key>
-        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
-        <key>description</key>
-        <string>zlib data compression library for the next generation systems</string>
-        <key>license</key>
-        <string>zlib-ng</string>
-        <key>license_file</key>
-        <string>LICENSES/zlib-ng.txt</string>
-        <key>name</key>
-        <string>zlib-ng</string>
         <key>platforms</key>
         <map>
           <key>darwin64</key>
@@ -2919,24 +2897,24 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <string>windows64</string>
           </map>
         </map>
+        <key>license</key>
+        <string>zlib-ng</string>
+        <key>license_file</key>
+        <string>LICENSES/zlib-ng.txt</string>
+        <key>copyright</key>
+        <string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
         <key>version</key>
         <string>1.2.11.zlib-ng.32fd361</string>
+        <key>name</key>
+        <string>zlib-ng</string>
+        <key>canonical_repo</key>
+        <string>https://bitbucket.org/lindenlab/3p-zlib-ng</string>
+        <key>description</key>
+        <string>zlib data compression library for the next generation systems</string>
       </map>
     </map>
     <key>package_description</key>
     <map>
-      <key>canonical_repo</key>
-      <string>https://github.com/secondlife/viewer</string>
-      <key>copyright</key>
-      <string>Copyright (c) 2020, Linden Research, Inc.</string>
-      <key>description</key>
-      <string>Second Life Viewer</string>
-      <key>license</key>
-      <string>LGPL</string>
-      <key>license_file</key>
-      <string>docs/LICENSE-source.txt</string>
-      <key>name</key>
-      <string>Second Life Viewer</string>
       <key>platforms</key>
       <map>
         <key>common</key>
@@ -2945,9 +2923,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>build</key>
-              <map>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -2958,7 +2933,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
               </map>
               <key>name</key>
               <string>RelWithDebInfo</string>
@@ -2967,10 +2945,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -2979,16 +2953,17 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                </array>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+</array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
             </map>
             <key>Release</key>
             <map>
-              <key>build</key>
-              <map>
-              </map>
               <key>configure</key>
               <map>
                 <key>command</key>
@@ -2999,7 +2974,10 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=TRUE</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
               </map>
               <key>name</key>
               <string>Release</string>
@@ -3008,10 +2986,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>command</key>
                 <string>cmake</string>
                 <key>options</key>
@@ -3020,7 +2994,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                   <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                </array>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3031,12 +3009,22 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         </map>
         <key>darwin64</key>
         <map>
-          <key>build_directory</key>
-          <string>build-darwin-x86_64</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>Xcode</string>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+</array>
+              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3048,19 +3036,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
-              </map>
-              <key>configure</key>
-              <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>Xcode</string>
-                </array>
+</array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3069,6 +3045,14 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>RelWithDebInfoOS</key>
             <map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>Xcode</string>
+</array>
+              </map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3080,21 +3064,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
+</array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
               <key>configure</key>
               <map>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-                </array>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+</array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoOS</string>
-            </map>
-            <key>Release</key>
-            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3106,25 +3094,21 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
+</array>
               </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Xcode</string>
-                </array>
+</array>
               </map>
-              <key>name</key>
-              <string>Release</string>
-            </map>
-            <key>ReleaseOS</key>
-            <map>
               <key>build</key>
               <map>
                 <key>command</key>
@@ -3136,48 +3120,40 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-project</string>
                   <string>SecondLife.xcodeproj</string>
                   <string>-parallelizeTargets</string>
-                </array>
-              </map>
-              <key>configure</key>
-              <map>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>Xcode</string>
-                </array>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
+          <key>build_directory</key>
+          <string>build-darwin-x86_64</string>
           <key>name</key>
           <string>darwin64</string>
         </map>
         <key>linux64</key>
         <map>
-          <key>build_directory</key>
-          <string>build-linux-x86_64</string>
           <key>configurations</key>
           <map>
             <key>Release</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
-              </map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>../indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-                </array>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3186,11 +3162,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>ReleaseOS</key>
             <map>
-              <key>build</key>
-              <map>
-                <key>command</key>
-                <string>ninja</string>
-              </map>
               <key>configure</key>
               <map>
                 <key>options</key>
@@ -3198,7 +3169,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>-G</string>
                   <string>Ninja</string>
                   <string>-DLL_TESTS=Off</string>
-                </array>
+</array>
+              </map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>ninja</string>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
@@ -3212,44 +3188,44 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
               <string>default</string>
             </map>
           </map>
+          <key>build_directory</key>
+          <string>build-linux-x86_64</string>
           <key>name</key>
           <string>linux64</string>
         </map>
         <key>windows</key>
         <map>
-          <key>build_directory</key>
-          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
             <map>
-              <key>build</key>
+              <key>configure</key>
               <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+</array>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
-                </array>
+                  <string>..\indra</string>
+</array>
+              </map>
+              <key>build</key>
+              <map>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
                 <array>
                   <string>/build</string>
                   <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
-              </map>
-              <key>configure</key>
-              <map>
+</array>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-                </array>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
+                  <string>SecondLife.sln</string>
+</array>
               </map>
               <key>default</key>
               <string>True</string>
@@ -3258,12 +3234,25 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             </map>
             <key>RelWithDebInfoOS</key>
             <map>
-              <key>build</key>
+              <key>configure</key>
               <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
+                  <string>-A</string>
+                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
+</array>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
-                </array>
+                  <string>..\indra</string>
+</array>
+              </map>
+              <key>build</key>
+              <map>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3274,69 +3263,70 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-                </array>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+</array>
               </map>
+              <key>name</key>
+              <string>RelWithDebInfoOS</string>
+            </map>
+            <key>Release</key>
+            <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>..\indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
-                </array>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+</array>
               </map>
-              <key>name</key>
-              <string>RelWithDebInfoOS</string>
-            </map>
-            <key>Release</key>
-            <map>
               <key>build</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>SecondLife.sln</string>
-                </array>
                 <key>command</key>
                 <string>devenv</string>
                 <key>options</key>
                 <array>
                   <string>/build</string>
                   <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+</array>
               </map>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+            <key>ReleaseOS</key>
+            <map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>..\indra</string>
-                </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
                   <string>-A</string>
                   <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                </array>
+                  <string>-DUNATTENDED:BOOL=ON</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DUSE_KDU=FALSE</string>
+                  <string>-DUSE_OPENAL:BOOL=ON</string>
+</array>
+                <key>arguments</key>
+                <array>
+                  <string>..\indra</string>
+</array>
               </map>
-              <key>name</key>
-              <string>Release</string>
-            </map>
-            <key>ReleaseOS</key>
-            <map>
               <key>build</key>
               <map>
-                <key>arguments</key>
-                <array>
-                  <string>SecondLife.sln</string>
-                </array>
                 <key>command</key>
                 <string>msbuild.exe</string>
                 <key>options</key>
@@ -3347,40 +3337,36 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:minimal</string>
                   <string>/p:VCBuildAdditionalOptions= /incremental</string>
-                </array>
-              </map>
-              <key>configure</key>
-              <map>
+</array>
                 <key>arguments</key>
                 <array>
-                  <string>..\indra</string>
-                </array>
-                <key>options</key>
-                <array>
-                  <string>-G</string>
-                  <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
-                  <string>-A</string>
-                  <string>${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
-                  <string>-DUNATTENDED:BOOL=ON</string>
-                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
-                  <string>-DUSE_KDU=FALSE</string>
-                  <string>-DUSE_OPENAL:BOOL=ON</string>
-                </array>
+                  <string>SecondLife.sln</string>
+</array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>
             </map>
           </map>
+          <key>build_directory</key>
+          <string>build-vc${AUTOBUILD_VSVER|170}-$AUTOBUILD_ADDRSIZE</string>
           <key>name</key>
           <string>windows</string>
         </map>
       </map>
+      <key>license</key>
+      <string>LGPL</string>
+      <key>license_file</key>
+      <string>docs/LICENSE-source.txt</string>
+      <key>copyright</key>
+      <string>Copyright (c) 2020, Linden Research, Inc.</string>
       <key>version_file</key>
       <string>newview/viewer_version.txt</string>
+      <key>name</key>
+      <string>Second Life Viewer</string>
+      <key>canonical_repo</key>
+      <string>https://github.com/secondlife/viewer</string>
+      <key>description</key>
+      <string>Second Life Viewer</string>
     </map>
-    <key>type</key>
-    <string>autobuild</string>
-    <key>version</key>
-    <string>1.3</string>
   </map>
 </llsd>
-- 
cgit v1.2.3


From bf43a8574c394c27bad1b0b08c88cad308a55572 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 16 Jan 2024 12:09:26 -0500
Subject: Fix failure to optimize away alpha channel on some GLTF upload paths
 (#606)

Co-authored-by: RunitaiLinden <davep@lindenlab.com>
---
 indra/newview/lltinygltfhelper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp
index 999be07dba..5b75db37d0 100644
--- a/indra/newview/lltinygltfhelper.cpp
+++ b/indra/newview/lltinygltfhelper.cpp
@@ -178,6 +178,7 @@ LLImageRaw * LLTinyGLTFHelper::getTexture(const std::string & folder, const tiny
     {
         rawImage = new LLImageRaw(&image->image[0], image->width, image->height, image->component);
         rawImage->verticalFlip();
+        rawImage->optimizeAwayAlpha();
     }
 
     return rawImage;
-- 
cgit v1.2.3


From a67dde1f16c144247cff0b765201e64f8f8e75c2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 16 Jan 2024 02:58:07 +0200
Subject: SL-20783 Fix excessive control messages

controlFlagsDirty() gets set every frame as an example if 'w' is held,
causing viewer to send updates each frame, which can be excessive
---
 indra/newview/llappviewer.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2599b1e4a0..401476e177 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4681,16 +4681,23 @@ void LLAppViewer::idle()
 		// When appropriate, update agent location to the simulator.
 		F32 agent_update_time = agent_update_timer.getElapsedTimeF32();
 		F32 agent_force_update_time = mLastAgentForceUpdate + agent_update_time;
-		BOOL force_update = gAgent.controlFlagsDirty()
-							|| (mLastAgentControlFlags != gAgent.getControlFlags())
-							|| (agent_force_update_time > (1.0f / (F32) AGENT_FORCE_UPDATES_PER_SECOND));
-		if (force_update || (agent_update_time > (1.0f / (F32) AGENT_UPDATES_PER_SECOND)))
+        bool timed_out = agent_update_time > (1.0f / (F32)AGENT_UPDATES_PER_SECOND);
+        BOOL force_send =
+            // if there is something to send
+            (gAgent.controlFlagsDirty() && timed_out)
+            // if something changed
+            || (mLastAgentControlFlags != gAgent.getControlFlags())
+            // keep alive
+            || (agent_force_update_time > (1.0f / (F32) AGENT_FORCE_UPDATES_PER_SECOND));
+        // timing out doesn't warranty that an update will be sent,
+        // just that it will be checked.
+		if (force_send || timed_out)
 		{
 			LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;
 			// Send avatar and camera info
 			mLastAgentControlFlags = gAgent.getControlFlags();
-			mLastAgentForceUpdate = force_update ? 0 : agent_force_update_time;
-			send_agent_update(force_update);
+			mLastAgentForceUpdate = force_send ? 0 : agent_force_update_time;
+			send_agent_update(force_send);
 			agent_update_timer.reset();
 		}
 	}
-- 
cgit v1.2.3


From 71bcc8977646072d4fbf3a2cd49c7a4ee1b4ea78 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 16 Jan 2024 22:04:18 +0200
Subject: SL-20669 Material editor uses incorect blank normal maps

---
 indra/newview/llmaterialeditor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index db9589666c..34f2f77d25 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -43,6 +43,7 @@
 #include "llnotificationsutil.h"
 #include "lltexturectrl.h"
 #include "lltrans.h"
+#include "llviewercontrol.h"
 #include "llviewermenufile.h"
 #include "llviewertexture.h"
 #include "llsdutil.h"
@@ -448,6 +449,10 @@ BOOL LLMaterialEditor::postBuild()
     mEmissiveTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_EMISIVE_TEX_DIRTY));
     mNormalTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_NORMAL_TEX_DIRTY));
 
+    // should match normal textures from mBumpyTextureCtrl
+    mNormalTextureCtrl->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("DefaultObjectNormalTexture")));
+    mNormalTextureCtrl->setBlankImageAssetID(LLUUID(gSavedSettings.getString("DefaultBlankNormalTexture")));
+
     if (mIsOverride)
     {
         // Live editing needs a recovery mechanism on cancel
-- 
cgit v1.2.3


From ae91ae43a51c58cc496f3947921fbf886c6be86e Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 15 Jan 2024 23:20:24 +0100
Subject: SL-20795 Part of previously typed emojis disappear in the 'Save
 settings as a preset...' option of the 'Preferences' floater

---
 indra/llcommon/llstring.cpp                        |  2 --
 indra/llrender/llfontfreetype.cpp                  | 11 ++++++++++-
 indra/llrender/llfontgl.cpp                        |  6 +++---
 indra/llrender/llfontgl.h                          |  8 ++++----
 indra/llui/llbutton.cpp                            |  2 +-
 indra/llui/llfolderviewitem.cpp                    | 10 +++++-----
 indra/llui/lllineeditor.cpp                        |  2 +-
 indra/llui/llview.cpp                              |  3 +--
 indra/newview/llfloateremojipicker.cpp             | 22 ++++------------------
 indra/newview/llfloateruipreview.cpp               |  8 ++++----
 indra/newview/llpanelemojicomplete.cpp             |  8 ++++----
 indra/newview/lltextureview.cpp                    |  3 +--
 indra/newview/llviewerwindow.cpp                   |  3 +--
 indra/newview/llworldmapview.cpp                   |  3 +--
 .../default/xui/en/panel_preferences_graphics1.xml |  2 +-
 15 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 81b0207038..17d69351ec 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -339,8 +339,6 @@ S32 wchar_utf8_length(const llwchar wc)
 {
 	if (wc < 0x80)
 	{
-		// This case will also catch negative values which are
-		// technically invalid.
 		return 1;
 	}
 	else if (wc < 0x800)
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index ca9f2ed778..d87fb5245c 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -665,7 +665,16 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index) co
 		load_flags |= FT_LOAD_COLOR;
 	}
 
-	llassert_always(! FT_Load_Glyph(mFTFace, glyph_index, load_flags) );
+	FT_Error error = FT_Load_Glyph(mFTFace, glyph_index, load_flags);
+	if (FT_Err_Ok != error)
+	{
+		std::string message = llformat(
+			"Error %d (%s) loading glyph %u: bitmap_type=%u, load_flags=%d",
+			error, FT_Error_String(error), glyph_index, bitmap_type, load_flags);
+		LL_WARNS_ONCE() << message << LL_ENDL;
+		error = FT_Load_Glyph(mFTFace, glyph_index, load_flags ^ FT_LOAD_COLOR);
+		llassert_always_msg(FT_Err_Ok == error, message.c_str());
+	}
 
 	llassert_always(! FT_Render_Glyph(mFTFace->glyph, gFontRenderMode) );
 
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index f0b89f9a1d..53661b6a63 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -420,7 +420,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 
 S32 LLFontGL::render(const LLWString &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color) const
 {
-	return render(text, begin_offset, x, y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+	return render(text, begin_offset, x, y, color, LEFT, BASELINE, NORMAL, NO_SHADOW);
 }
 
 S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels, F32* right_x, BOOL use_ellipses, BOOL use_color) const
@@ -430,12 +430,12 @@ S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y
 
 S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color) const
 {
-	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, LEFT, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE, FALSE);
+	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, LEFT, BASELINE, NORMAL, NO_SHADOW);
 }
 
 S32 LLFontGL::renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style, ShadowType shadow) const
 {
-	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, halign, valign, style, shadow, S32_MAX, S32_MAX, NULL, FALSE, FALSE);
+	return renderUTF8(text, begin_offset, (F32)x, (F32)y, color, halign, valign, style, shadow);
 }
 
 // font metrics - override for LLFontFreetype that returns units of virtual pixels
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index a9d512f7ce..f6ec416c8b 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -99,7 +99,7 @@ public:
 				S32 max_chars = S32_MAX,
 				F32* right_x=NULL, 
 				BOOL use_ellipses = FALSE,
-				BOOL use_color = FALSE) const;
+				BOOL use_color = TRUE) const;
 
 	S32 render(const LLWString &text, S32 begin_offset, 
 				const LLRectf& rect, 
@@ -109,7 +109,7 @@ public:
 				S32 max_chars = S32_MAX,
 				F32* right_x=NULL, 
 				BOOL use_ellipses = FALSE,
-				BOOL use_color = FALSE) const;
+				BOOL use_color = TRUE) const;
 
 	S32 render(const LLWString &text, S32 begin_offset, 
 				F32 x, F32 y, 
@@ -119,12 +119,12 @@ public:
 				S32 max_chars = S32_MAX, S32 max_pixels = S32_MAX, 
 				F32* right_x=NULL, 
 				BOOL use_ellipses = FALSE,
-				BOOL use_color = FALSE) const;
+				BOOL use_color = TRUE) const;
 
 	S32 render(const LLWString &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color) const;
 
 	// renderUTF8 does a conversion, so is slower!
-	S32 renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars, S32 max_pixels,  F32* right_x, BOOL use_ellipses, BOOL use_color) const;
+	S32 renderUTF8(const std::string &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign,  VAlign valign, U8 style, ShadowType shadow, S32 max_chars = S32_MAX, S32 max_pixels = S32_MAX,  F32* right_x = NULL, BOOL use_ellipses = FALSE, BOOL use_color = TRUE) const;
 	S32 renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color) const;
 	S32 renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style = NORMAL, ShadowType shadow = NO_SHADOW) const;
 
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 5ce1cbd63c..9ef019840a 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -68,7 +68,7 @@ LLButton::Params::Params()
 	label_shadow("label_shadow", true),
 	auto_resize("auto_resize", false),
 	use_ellipses("use_ellipses", false),
-	use_font_color("use_font_color", false),
+	use_font_color("use_font_color", true),
 	image_unselected("image_unselected"),
 	image_selected("image_selected"),
 	image_hover_selected("image_hover_selected"),
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index c47f4c60e3..bc9469cfad 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -890,7 +890,7 @@ void LLFolderViewItem::drawLabel(const LLFontGL * font, const F32 x, const F32 y
     //
     font->renderUTF8(mLabel, 0, x, y, color,
         LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-        S32_MAX, getRect().getWidth() - (S32) x - mLabelPaddingRight, &right_x, /*use_ellipses*/TRUE, /*use_color*/FALSE);
+        S32_MAX, getRect().getWidth() - (S32) x - mLabelPaddingRight, &right_x, /*use_ellipses*/TRUE);
 }
 
 void LLFolderViewItem::draw()
@@ -999,7 +999,7 @@ void LLFolderViewItem::draw()
 	{
         suffix_font->renderUTF8( mLabelSuffix, 0, right_x, y, isFadeItem() ? color : (LLColor4)sSuffixColor,
 						  LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-						  S32_MAX, S32_MAX, &right_x, /*use_ellipses*/FALSE, /*use_color*/FALSE );
+						  S32_MAX, S32_MAX, &right_x);
 	}
 
 	//--------------------------------------------------------------------------------//
@@ -1013,7 +1013,7 @@ void LLFolderViewItem::draw()
             F32 yy = (F32)getRect().getHeight() - font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
             font->renderUTF8(combined_string, filter_offset, match_string_left, yy,
                 sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                filter_string_length, S32_MAX, &right_x, FALSE, FALSE);
+                filter_string_length, S32_MAX, &right_x);
         }
         else
         {
@@ -1024,7 +1024,7 @@ void LLFolderViewItem::draw()
                 F32 yy = (F32)getRect().getHeight() - font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
                 font->renderUTF8(mLabel, filter_offset, match_string_left, yy,
                     sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                    label_filter_length, S32_MAX, &right_x, FALSE, FALSE);
+                    label_filter_length, S32_MAX, &right_x);
             }
             
             S32 suffix_filter_length = label_filter_length > 0 ? filter_string_length - label_filter_length : filter_string_length;
@@ -1035,7 +1035,7 @@ void LLFolderViewItem::draw()
                 F32 yy = (F32)getRect().getHeight() - suffix_font->getLineHeight() - (F32)mTextPad - (F32)TOP_PAD;
                 suffix_font->renderUTF8(mLabelSuffix, suffix_offset, match_string_left, yy, sFilterTextColor,
                     LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                    suffix_filter_length, S32_MAX, &right_x, FALSE, FALSE);
+                    suffix_filter_length, S32_MAX, &right_x);
             }
         }
 
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index bd6fd5b79e..e032b4b8c2 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -2107,7 +2107,7 @@ void LLLineEditor::draw()
 							LLFontGL::NO_SHADOW,
 							S32_MAX,
 							mTextRightEdge - ll_round(rendered_pixels_right),
-							&rendered_pixels_right, FALSE);
+							&rendered_pixels_right);
 		}
 		// Draw children (border)
 		LLView::draw();
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 7b6661a519..0afccef735 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1336,8 +1336,7 @@ void LLView::drawDebugRect()
 			std::string debug_text = llformat("%s (%d x %d)", getName().c_str(),
 										debug_rect.getWidth(), debug_rect.getHeight());
 			LLFontGL::getFontSansSerifSmall()->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
-												LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-												S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
+					LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW);
 		}
 	}
 	LLUI::popMatrix();
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index abc5165f1e..ecfc4e7b41 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -102,11 +102,7 @@ public:
             LLFontGL::VCENTER,          // valign
             LLFontGL::NORMAL,           // style
             LLFontGL::DROP_SHADOW_SOFT, // shadow
-            mText.size(),               // max_chars
-            S32_MAX,                    // max_pixels
-            nullptr,                    // right_x
-            false,                      // use_ellipses
-            true);                      // use_color
+            mText.size());              // max_chars
     }
 
     virtual void updatePanel(BOOL allow_modify) override {}
@@ -144,11 +140,7 @@ public:
             LLFontGL::VCENTER,          // valign
             LLFontGL::NORMAL,           // style
             LLFontGL::DROP_SHADOW_SOFT, // shadow
-            1,                          // max_chars
-            S32_MAX,                    // max_pixels
-            nullptr,                    // right_x
-            false,                      // use_ellipses
-            true);                      // use_color
+            1);                         // max_chars
     }
 
     virtual void updatePanel(BOOL allow_modify) override {}
@@ -225,10 +217,7 @@ protected:
             LLFontGL::NORMAL,           // style
             LLFontGL::DROP_SHADOW_SOFT, // shadow
             1,                          // max_chars
-            max_pixels,                 // max_pixels
-            nullptr,                    // right_x
-            false,                      // use_ellipses
-            true);                      // use_color
+            max_pixels);                // max_pixels
     }
 
     void drawName(std::string name, F32 x, F32 y, S32 max_pixels, LLColor4& color)
@@ -244,10 +233,7 @@ protected:
             LLFontGL::NORMAL,           // style
             LLFontGL::DROP_SHADOW_SOFT, // shadow
             -1,                         // max_chars
-            max_pixels,                 // max_pixels
-            nullptr,                    // right_x
-            true,                       // use_ellipses
-            false);                     // use_color
+            max_pixels);                // max_pixels
     }
 
 private:
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 6032064c31..db69c3e2c3 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -1601,7 +1601,7 @@ void LLOverlapPanel::draw()
 		LLUI::translate(5,getRect().getHeight()-20);	// translate to top-5,left-5
 		LLView::sDrawPreviewHighlights = FALSE;
 		LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection_text, 0, 0, 0, text_color,
-				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
+				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW);
 	}
 	else
 	{
@@ -1619,7 +1619,7 @@ void LLOverlapPanel::draw()
 			std::string current_selection = std::string(current_selection_text + LLView::sPreviewClickedElement->getName() + " (no elements overlap)");
 			S32 text_width = LLFontGL::getFontSansSerifSmall()->getWidth(current_selection) + 10;
 			LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection, 0, 0, 0, text_color,
-					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
+					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW);
 			// widen panel enough to fit this text
 			LLRect rect = getRect();
 			setRect(LLRect(rect.mLeft,rect.mTop,rect.getWidth() < text_width ? rect.mLeft + text_width : rect.mRight,rect.mTop));
@@ -1685,7 +1685,7 @@ void LLOverlapPanel::draw()
 		// draw currently-selected element at top of overlappers
 		LLUI::translate(0,-mSpacing);
 		LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection_text + LLView::sPreviewClickedElement->getName(), 0, 0, 0, text_color,
-				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
+				LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW);
 		LLUI::translate(0,-mSpacing-LLView::sPreviewClickedElement->getRect().getHeight());	// skip spacing distance + height
 		LLView::sPreviewClickedElement->draw();
 
@@ -1700,7 +1700,7 @@ void LLOverlapPanel::draw()
 			// draw name
 			LLUI::translate(0,-mSpacing);
 			LLFontGL::getFontSansSerifSmall()->renderUTF8(overlapper_text + viewp->getName(), 0, 0, 0, text_color,
-					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
+					LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW);
 
 			// draw element
 			LLUI::translate(0,-mSpacing-viewp->getRect().getHeight());	// skip spacing distance + height
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 46f455aede..e6e3a10e13 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -118,7 +118,7 @@ void LLPanelEmojiComplete::draw()
         LLWString text(1, mEmojis[curIdx].Character);
         mIconFont->render(text, 0, iconCenterX, iconCenterY,
             LLColor4::white, LLFontGL::HCENTER, LLFontGL::VCENTER, LLFontGL::NORMAL,
-            LLFontGL::DROP_SHADOW_SOFT, 1, S32_MAX, nullptr, false, true);
+            LLFontGL::DROP_SHADOW_SOFT, 1);
         if (mVertical)
         {
             const std::string& shortCode = mEmojis[curIdx].String;
@@ -129,7 +129,7 @@ void LLPanelEmojiComplete::draw()
                 std::string text = shortCode.substr(0, mEmojis[curIdx].Begin);
                 mTextFont->renderUTF8(text, 0, x0, iconCenterY, LLColor4::white,
                     LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                    text.size(), x1, NULL, FALSE, FALSE);
+                    text.size(), x1);
                 x0 += mTextFont->getWidthF32(text);
                 x1 = textLeft + textWidth - x0;
             }
@@ -138,7 +138,7 @@ void LLPanelEmojiComplete::draw()
                 std::string text = shortCode.substr(mEmojis[curIdx].Begin, mEmojis[curIdx].End - mEmojis[curIdx].Begin);
                 mTextFont->renderUTF8(text, 0, x0, iconCenterY, LLColor4::yellow6,
                     LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                    text.size(), x1, NULL, FALSE, FALSE);
+                    text.size(), x1);
                 x0 += mTextFont->getWidthF32(text);
                 x1 = textLeft + textWidth - x0;
             }
@@ -147,7 +147,7 @@ void LLPanelEmojiComplete::draw()
                 std::string text = shortCode.substr(mEmojis[curIdx].End);
                 mTextFont->renderUTF8(text, 0, x0, iconCenterY, LLColor4::white,
                     LLFontGL::LEFT, LLFontGL::VCENTER, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
-                    text.size(), x1, NULL, FALSE, FALSE);
+                    text.size(), x1);
             }
             iconCenterY -= mEmojiHeight;
         }
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 1051194183..84cd6e2da7 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -588,8 +588,7 @@ void LLGLTexMemBar::draw()
 	x_right = 550.0;
 	LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*3,
 											 text_color, LLFontGL::LEFT, LLFontGL::TOP,
-											 LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX,
-											 &x_right, /*use_ellipses*/FALSE, /*use_color*/FALSE);
+											 LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &x_right);
 
 	F32Kilobits bandwidth(LLAppViewer::getTextureFetch()->getTextureBandwidth());
 	F32Kilobits max_bandwidth(gSavedSettings.getF32("ThrottleBandwidthKBPS"));
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 6de510bc11..47c7eed872 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -955,8 +955,7 @@ public:
 		{
 			const Line& line = *iter;
 			LLFontGL::getFontMonospace()->renderUTF8(line.text, 0, (F32)line.x, (F32)line.y, mTextColor,
-											 LLFontGL::LEFT, LLFontGL::TOP,
-											 LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE);
+					LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, LLFontGL::NO_SHADOW);
 		}
 	}
 
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index d597207859..a8676d2ad6 100755
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -520,8 +520,7 @@ void LLWorldMapView::draw()
 					S32_MAX, //max_chars
 					mMapScale, //max_pixels
 					NULL,
-					/*use_ellipses*/TRUE,
-					/*use_color*/FALSE);
+					/*use_ellipses*/TRUE);
 			}
 		}
 	}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index fe74cea2f1..8a9d3b755e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -27,7 +27,7 @@
     left_delta="110"
     name="preset_text"
     top="5"
-    width="120">
+    width="320">
       (None)
   </text>
 
-- 
cgit v1.2.3


From 586e4cd090b22f11a68fa635e598847ce3b84d21 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Wed, 17 Jan 2024 12:14:44 -0600
Subject: SL-18429 Make it so auto adjusting legacy skies merely turns on
 tonemapping.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8fbeb82d07..77ca52a7f7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10676,7 +10676,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>2.0</real>
+    <real>1.0</real>
   </map>
   <key>RendeSkyAutoAdjustBlueHorizonScale</key>
   <map>
-- 
cgit v1.2.3


From 90aa7f0042b0793e205a399dcf82a246ed089526 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 18 Jan 2024 02:18:39 +0200
Subject: SL-20723 CLICK_ACTION_IGNORE was ignored on some attachments

Now should match LLOctreeIntersect's check
---
 indra/newview/llvovolume.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ec2f490742..c5b6eca5ae 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4575,6 +4575,11 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a&
         }
     }
 
+    if (getClickAction() == CLICK_ACTION_IGNORE && !LLFloater::isVisible(gFloaterTools))
+    {
+        return FALSE;
+    }
+
 	BOOL ret = FALSE;
 
 	LLVolume* volume = getVolume();
-- 
cgit v1.2.3


From 6e8d4f48466a5bbad2fcc27bc2877a30e575d4ce Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 10:59:03 -0500
Subject: DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision

in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.

(cherry picked from commit b782ab73e640e434e4ed67fa8dfc951f09757585)
---
 .github/workflows/build.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d7f0daf8b3..da7e0b9809 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -34,6 +34,9 @@ jobs:
       AUTOBUILD_GITHUB_TOKEN: ${{ secrets.SHARED_AUTOBUILD_GITHUB_TOKEN }}
       AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables
       AUTOBUILD_VARIABLES_FILE: ${{ github.workspace }}/.build-variables/variables
+      # Direct autobuild to store vcs_url, vcs_branch and vcs_revision in
+      # autobuild-package.xml.
+      AUTOBUILD_VCS_INFO: "true"
       AUTOBUILD_VSVER: "170"
       DEVELOPER_DIR: ${{ matrix.developer_dir }}
       # Ensure that Linden viewer builds engage Bugsplat.
@@ -199,6 +202,11 @@ jobs:
           fi
           export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
 
+          # branch will be something like "origin/mybranch"
+          branch="$(git branch -r --contains ${{ github.event.pull_request.head.sha || github.sha }} | head -n 1)"
+          # strip off "origin/"
+          export AUTOBUILD_VCS_BRANCH="${branch#*/}"
+
           ./build.sh
 
           # Each artifact is downloaded as a distinct .zip file. Multiple jobs
-- 
cgit v1.2.3


From ff1741cecae0fac6d94507fa4a6e4662219af707 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 17:35:23 -0500
Subject: DRTVWR-601: Use viewer-build-util/which-branch to determine branch.

(cherry picked from commit 2c5066f1fcc0c9f145698ef3aaec72d27bce7181)
---
 .github/workflows/build.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index da7e0b9809..d21acccbd2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -100,10 +100,17 @@ jobs:
         if: runner.os == 'Windows'
         run: choco install nsis-unicode
 
+      - name: Determine source branch
+        id: which-branch
+        uses: secondlife/viewer-build-util/which-branch@v1
+        with:
+          token: ${{ github.token }}
+
       - name: Build
         id: build
         shell: bash
         env:
+          AUTOBUILD_VCS_BRANCH: ${{ steps.which-branch.outputs.branch }}
           RUNNER_OS: ${{ runner.os }}
         run: |
           # set up things the viewer's build.sh script expects
@@ -154,7 +161,7 @@ jobs:
           }
           repo_branch()
           {
-            git -C "$1" branch | grep '^* ' | cut -c 3-
+            echo "$AUTOBUILD_VCS_BRANCH"
           }
           record_dependencies_graph()
           {
@@ -202,11 +209,6 @@ jobs:
           fi
           export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
 
-          # branch will be something like "origin/mybranch"
-          branch="$(git branch -r --contains ${{ github.event.pull_request.head.sha || github.sha }} | head -n 1)"
-          # strip off "origin/"
-          export AUTOBUILD_VCS_BRANCH="${branch#*/}"
-
           ./build.sh
 
           # Each artifact is downloaded as a distinct .zip file. Multiple jobs
-- 
cgit v1.2.3


From 09f66828ba573515c3766cce32f4746b8189efcf Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 18 Jan 2024 13:34:40 -0500
Subject: SL-20546: Use branch for autobuild package as well as release page.

which_branch.py has moved to viewer-build-util as a reusable action.
---
 .github/workflows/build.yaml      |  8 +---
 .github/workflows/which_branch.py | 77 ---------------------------------------
 2 files changed, 1 insertion(+), 84 deletions(-)
 delete mode 100644 .github/workflows/which_branch.py

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d21acccbd2..deabdf9c1e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,7 +24,7 @@ jobs:
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
       viewer_version: ${{ steps.build.outputs.viewer_version }}
-      viewer_branch:  ${{ steps.build.outputs.viewer_branch }}
+      viewer_branch:  ${{ steps.which-branch.outputs.branch }}
       imagename: ${{ steps.build.outputs.imagename }}
     env:
       AUTOBUILD_ADDRSIZE: 64
@@ -187,15 +187,9 @@ jobs:
           if [[ "$GITHUB_REF_TYPE" == "tag" && "${GITHUB_REF_NAME:0:12}" == "Second_Life_" ]]
           then viewer_channel="${GITHUB_REF_NAME%#*}"
                export viewer_channel="${viewer_channel//_/ }"
-               # Since GITHUB_REF_NAME is a tag rather than a branch, we need
-               # to discover to what branch this tag corresponds.
-               viewer_branch="$(python3 .github/workflows/which_branch.py \
-                                --token "${{ github.token }}" ${{ github.workflow_sha }})"
           else export viewer_channel="Second Life Test"
-               viewer_branch="${GITHUB_REF_NAME}"
           fi
           echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
-          echo "viewer_branch=$viewer_branch" >> "$GITHUB_OUTPUT"
 
           # On windows we need to point the build to the correct python
           # as neither CMake's FindPython nor our custom Python.cmake module
diff --git a/.github/workflows/which_branch.py b/.github/workflows/which_branch.py
deleted file mode 100644
index 802ea44b5a..0000000000
--- a/.github/workflows/which_branch.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env python3
-"""\
-@file   which_branch.py
-@author Nat Goodspeed
-@date   2023-11-14
-@brief  Discover which git branch(es) correspond to a given commit hash.
-
-$LicenseInfo:firstyear=2023&license=viewerlgpl$
-Copyright (c) 2023, Linden Research, Inc.
-$/LicenseInfo$
-"""
-
-import github
-import re
-import sys
-import subprocess
-
-class Error(Exception):
-    pass
-
-def branches_for(token, commit, repo=None):
-    """
-    Use the GitHub REST API to discover which branch(es) correspond to the
-    passed commit hash. The commit string can actually be any of the ways git
-    permits to identify a commit:
-
-    https://git-scm.com/docs/gitrevisions#_specifying_revisions
-
-    branches_for() generates a (possibly empty) sequence of all the branches
-    of the specified repo for which the specified commit is the tip.
-
-    If repo is omitted or None, assume the current directory is a local clone
-    whose 'origin' remote is the GitHub repository of interest.
-    """
-    if not repo:
-        url = subprocess.check_output(['git', 'remote', 'get-url', 'origin'],
-                                      text=True)
-        parts = re.split(r'[:/]', url.rstrip())
-        repo = '/'.join(parts[-2:]).removesuffix('.git')
-
-    gh = github.MainClass.Github(token)
-    grepo = gh.get_repo(repo)
-    for branch in grepo.get_branches():
-        try:
-            delta = grepo.compare(base=commit, head=branch.name)
-        except github.GithubException:
-            continue
-
-        if delta.ahead_by == 0 and delta.behind_by == 0:
-            yield branch
-
-def main(*raw_args):
-    from argparse import ArgumentParser
-    parser = ArgumentParser(description=
-"%(prog)s reports the branch(es) for which the specified commit hash is the tip.",
-                            epilog="""\
-When GitHub Actions launches a tag build, it checks out the specific changeset
-identified by the tag, and so 'git branch' reports detached HEAD. But we use
-tag builds to build a GitHub 'release' of the tip of a particular branch, and
-it's useful to be able to identify which branch that is.
-""")
-    parser.add_argument('-t', '--token', required=True,
-                        help="""GitHub REST API access token""")
-    parser.add_argument('-r', '--repo',
-                        help="""GitHub repository name, in the form OWNER/REPOSITORY""")
-    parser.add_argument('commit',
-                        help="""commit hash at the tip of the sought branch""")
-
-    args = parser.parse_args(raw_args)
-    for branch in branches_for(token=args.token, commit=args.commit, repo=args.repo):
-        print(branch.name)
-
-if __name__ == "__main__":
-    try:
-        sys.exit(main(*sys.argv[1:]))
-    except Error as err:
-        sys.exit(str(err))
-- 
cgit v1.2.3


From dd0ec112fe5ded8ed5f69b72b3df26343ca12d35 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 18 Jan 2024 13:43:34 -0500
Subject: SL-20546: PyGithub was only needed for local which_branch.py.

Now that which_branch.py has moved to viewer-build-util, so has the PyGithub
dependency.
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index deabdf9c1e..19a6a0ef6f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -84,7 +84,7 @@ jobs:
           path: .master-message-template
 
       - name: Install autobuild and python dependencies
-        run: pip3 install autobuild PyGithub llsd
+        run: pip3 install autobuild llsd
 
       - name: Cache autobuild packages
         uses: actions/cache@v3
-- 
cgit v1.2.3


From 834cc3d1e094bdc9615e6ba46cf49c8c5db872d7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 18 Jan 2024 15:21:15 -0500
Subject: SL-20546: Test new viewer-build-util branch pr-branch.

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 19a6a0ef6f..2e97d7c6dc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -102,7 +102,7 @@ jobs:
 
       - name: Determine source branch
         id: which-branch
-        uses: secondlife/viewer-build-util/which-branch@v1
+        uses: secondlife/viewer-build-util/which-branch@pr-branch
         with:
           token: ${{ github.token }}
 
-- 
cgit v1.2.3


From b156dd92957bc5ba123f69781bbe538cdc3a06c7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 18 Jan 2024 15:38:48 -0500
Subject: SL-20546: Kick the build.

---
 indra/llmessage/llxfer.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp
index 93d5cfc131..212d0619d1 100644
--- a/indra/llmessage/llxfer.cpp
+++ b/indra/llmessage/llxfer.cpp
@@ -386,12 +386,3 @@ std::ostream& operator<< (std::ostream& os, LLXfer &hh)
 	os << hh.getFileName() ;
 	return os;
 }
-
-
-
-
-
-
-
-
-
-- 
cgit v1.2.3


From 5e19a58a21ce60488d8cba44ee71d22871487b3c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 18 Jan 2024 23:31:44 +0200
Subject: Fix broken fonts

partial revert of 06c2c87bfaf364cb358b8a4b194e6369531a63c6
---
 indra/newview/skins/default/xui/en/fonts.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 1f4ff860da..567dd85090 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -51,19 +51,19 @@
       </os>
   </font>
 
-  <font name="SansSerif1"
+  <font name="SansSerif"
 	comment="Name of bold sans-serif font"
 	font_style="BOLD">
     <file>DejaVuSans-Bold.ttf</file>
   </font>
 
-  <font name="SansSerif2"
+  <font name="SansSerif"
 	comment="Name of italic sans-serif font"
 	font_style="ITALIC">
     <file>DejaVuSans-Oblique.ttf</file>
   </font>
 
-  <font name="SansSerif3"
+  <font name="SansSerif"
 	comment="Name of bold italic sans-serif font"
 	font_style="BOLD|ITALIC">
     <file>DejaVuSans-BoldOblique.ttf</file>
@@ -79,19 +79,19 @@
     <file>DejaVuSans.ttf</file>
   </font>
 
-  <font name="DejaVu1"
+  <font name="DejaVu"
 	comment="Name of DejaVu font (bold)"
 	font_style="BOLD">
     <file>DejaVuSans-Bold.ttf</file>
   </font>
 
-  <font name="DejaVu2"
+  <font name="DejaVu"
 	comment="Name of DejaVu font (italic)"
 	font_style="ITALIC">
     <file>DejaVuSans-Oblique.ttf</file>
   </font>
 
-  <font name="DejaVu3"
+  <font name="DejaVu"
 	comment="Name of DejaVu font (bold italic)"
 	font_style="BOLD|ITALIC">
     <file>DejaVuSans-BoldOblique.ttf</file>
@@ -108,7 +108,7 @@
       </os>
   </font>
 
-  <font name="Helvetica1"
+  <font name="Helvetica"
 	comment="Name of Helvetica font (bold)"
 	font_style="BOLD">
     <file>DejaVuSans-Bold.ttf</file>
@@ -120,7 +120,7 @@
       </os>
   </font>
 
-  <font name="Helvetica2"
+  <font name="Helvetica"
 	comment="Name of Helvetica font (italic)"
 	font_style="ITALIC">
     <file>DejaVuSans-Oblique.ttf</file>
@@ -132,7 +132,7 @@
       </os>
   </font>
 
-  <font name="Helvetica3"
+  <font name="Helvetica"
 	comment="Name of Helvetica font (bold italic)"
 	font_style="BOLD|ITALIC">
     <file>DejaVuSans-BoldOblique.ttf</file>
-- 
cgit v1.2.3


From 6555fb3409fbdbd412a8062962c133af7aea7614 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 18 Jan 2024 21:35:48 -0500
Subject: SL-20546: Use viewer-build-util@v1 instead of PR branch.

The fix we wanted was on the pr-branch branch of the viewer-build-util repo.
Now that it's been published as v1.1.2, the updated v1 tag references the fix,
so revert mention to @v1.
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2e97d7c6dc..19a6a0ef6f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -102,7 +102,7 @@ jobs:
 
       - name: Determine source branch
         id: which-branch
-        uses: secondlife/viewer-build-util/which-branch@pr-branch
+        uses: secondlife/viewer-build-util/which-branch@v1
         with:
           token: ${{ github.token }}
 
-- 
cgit v1.2.3


From fee2dc981cb15c54cacd63f778f106ff93a85796 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 19 Jan 2024 23:01:06 +0200
Subject: NSException test

---
 indra/newview/llappviewer.cpp                      |  7 ++++++
 indra/newview/llappviewer.h                        |  1 +
 indra/newview/llappviewermacosx-objc.h             |  2 ++
 indra/newview/llappviewermacosx-objc.mm            |  6 +++++
 indra/newview/llappviewermacosx.cpp                |  5 +++++
 indra/newview/llappviewermacosx.h                  |  2 ++
 indra/newview/llviewermenu.cpp                     | 26 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  8 +++++++
 8 files changed, 57 insertions(+)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 08a6c20acf..30fb0be46c 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5445,6 +5445,13 @@ void LLAppViewer::forceErrorSoftwareException()
     LLTHROW(LLException("User selected Force Software Exception"));
 }
 
+void LLAppViewer::forceErrorOSSpecificException()
+{
+    // Virtual, MacOS only
+    const std::string exception_text = "User selected Force OS Exception, Not implemented on this OS";
+    throw std::runtime_error(exception_text);
+}
+
 void LLAppViewer::forceErrorDriverCrash()
 {
    	LL_WARNS() << "Forcing a deliberate driver crash" << LL_ENDL;
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 6d1496d517..c5faa67120 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -156,6 +156,7 @@ public:
     virtual void forceErrorBadMemoryAccess();
     virtual void forceErrorInfiniteLoop();
     virtual void forceErrorSoftwareException();
+    virtual void forceErrorOSSpecificException();
     virtual void forceErrorDriverCrash();
     virtual void forceErrorCoroutineCrash();
     virtual void forceErrorThreadCrash();
diff --git a/indra/newview/llappviewermacosx-objc.h b/indra/newview/llappviewermacosx-objc.h
index c6dcec8e34..3721151aba 100644
--- a/indra/newview/llappviewermacosx-objc.h
+++ b/indra/newview/llappviewermacosx-objc.h
@@ -33,4 +33,6 @@
 //Why?  Because BOOL
 void launchApplication(const std::string* app_name, const std::vector<std::string>* args);
 
+void force_ns_sxeption();
+
 #endif // LL_LLAPPVIEWERMACOSX_OBJC_H
diff --git a/indra/newview/llappviewermacosx-objc.mm b/indra/newview/llappviewermacosx-objc.mm
index 17301847e8..5d9ca24db2 100644
--- a/indra/newview/llappviewermacosx-objc.mm
+++ b/indra/newview/llappviewermacosx-objc.mm
@@ -71,3 +71,9 @@ void launchApplication(const std::string* app_name, const std::vector<std::strin
     [pool release];
 	return;
 }
+
+void force_ns_sxeption()
+{
+    NSException *exception = [NSException exceptionWithName:@"Forced NSException" reason:nullptr userInfo:nullptr];
+    @throw exception;
+}
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 8b313a321b..c42c3b3daf 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -250,6 +250,11 @@ bool LLAppViewerMacOSX::init()
     return LLAppViewer::init();
 }
 
+void LLAppViewerMacOSX::forceErrorOSSpecificException()
+{
+    force_ns_sxeption();
+}
+
 // MacOSX may add and addition command line arguement for the process serial number.
 // The option takes a form like '-psn_0_12345'. The following method should be able to recognize
 // and either ignore or return a pair of values for the option.
diff --git a/indra/newview/llappviewermacosx.h b/indra/newview/llappviewermacosx.h
index b0e325a955..15c55c44a6 100644
--- a/indra/newview/llappviewermacosx.h
+++ b/indra/newview/llappviewermacosx.h
@@ -42,6 +42,8 @@ public:
 	//
 	virtual bool init();			// Override to do application initialization
 
+    virtual void forceErrorOSSpecificException();
+
 protected:
 	virtual bool restoreErrorTrap();
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 11eed8f456..3e307c9f4e 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -292,6 +292,7 @@ void force_error_llerror(void *);
 void force_error_bad_memory_access(void *);
 void force_error_infinite_loop(void *);
 void force_error_software_exception(void *);
+void force_error_os_exception(void*);
 void force_error_driver_crash(void *);
 void force_error_coroutine_crash(void *);
 void force_error_thread_crash(void *);
@@ -2419,6 +2420,15 @@ class LLAdvancedForceErrorSoftwareException : public view_listener_t
 	}
 };
 
+class LLAdvancedForceOSException: public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        force_error_os_exception(NULL);
+        return true;
+    }
+};
+
 class LLAdvancedForceErrorSoftwareExceptionCoro : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
@@ -3200,6 +3210,15 @@ bool enable_object_select_in_pathfinding_characters()
 	return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() &&  LLSelectMgr::getInstance()->selectGetViewableCharacters();
 }
 
+bool enable_os_exception()
+{
+#if LL_DARWIN
+    return true;
+#else
+    return false;
+#endif
+}
+
 class LLSelfRemoveAllAttachments : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -8371,6 +8390,11 @@ void force_error_software_exception(void *)
     LLAppViewer::instance()->forceErrorSoftwareException();
 }
 
+void force_error_os_exception(void*)
+{
+    LLAppViewer::instance()->forceErrorOSSpecificException();
+}
+
 void force_error_driver_crash(void *)
 {
     LLAppViewer::instance()->forceErrorDriverCrash();
@@ -9598,6 +9622,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLAdvancedForceErrorBadMemoryAccessCoro(), "Advanced.ForceErrorBadMemoryAccessCoro");
 	view_listener_t::addMenu(new LLAdvancedForceErrorInfiniteLoop(), "Advanced.ForceErrorInfiniteLoop");
 	view_listener_t::addMenu(new LLAdvancedForceErrorSoftwareException(), "Advanced.ForceErrorSoftwareException");
+    view_listener_t::addMenu(new LLAdvancedForceOSException(), "Advanced.ForceErrorOSException");
 	view_listener_t::addMenu(new LLAdvancedForceErrorSoftwareExceptionCoro(), "Advanced.ForceErrorSoftwareExceptionCoro");
 	view_listener_t::addMenu(new LLAdvancedForceErrorDriverCrash(), "Advanced.ForceErrorDriverCrash");
     view_listener_t::addMenu(new LLAdvancedForceErrorCoroutineCrash(), "Advanced.ForceErrorCoroutineCrash");
@@ -9779,6 +9804,7 @@ void initialize_menus()
 	enable.add("VisibleSelectInPathfindingLinksets", boost::bind(&visible_object_select_in_pathfinding_linksets));
 	commit.add("Pathfinding.Characters.Select", boost::bind(&LLFloaterPathfindingCharacters::openCharactersWithSelectedObjects));
 	enable.add("EnableSelectInPathfindingCharacters", boost::bind(&enable_object_select_in_pathfinding_characters));
+    enable.add("Advanced.EnableErrorOSException", boost::bind(&enable_os_exception));
 
 	view_listener_t::addMenu(new LLFloaterVisible(), "FloaterVisible");
 	view_listener_t::addMenu(new LLShowSidetrayPanel(), "ShowSidetrayPanel");
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2c26296547..910c2a969c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2754,6 +2754,14 @@ function="World.EnvPreset"
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorSoftwareException" />
             </menu_item_call>
+            <menu_item_call
+             label="Force OS Exception"
+             name="Force OS Exception">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorOSException" />
+                <menu_item_call.on_visible
+                 function="Advanced.EnableErrorOSException" />
+            </menu_item_call>            
             <menu_item_call
              label="Force a Crash in a Coroutine"
              name="Force a Crash in a Coroutine">
-- 
cgit v1.2.3


From 4a34a1196627c7e9998edde725d5e839f3ef61b9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 20 Jan 2024 02:26:51 +0200
Subject: SL-18721 Shutdown fixes

1. After window closes viewer still takes some time to shut down, so
added splash screen to not confuse users (and to see if something gets
stuck)
2. Having two identical mWindowHandle caused confusion for me, so I
split them. It looks like there might have been issues with thread being
stuck because thread's handle wasn't cleaned up.
3. Made region clean mCacheMap immediately instead of spending time
making copies on shutdown
---
 indra/llcommon/threadpool.cpp    | 17 +++++++++--
 indra/llcommon/threadpool.h      | 10 +++++--
 indra/llwindow/llwindowwin32.cpp | 61 ++++++++++++++++++++--------------------
 indra/newview/llappviewer.cpp    |  8 ++++++
 indra/newview/llviewerregion.cpp | 15 +++++++---
 5 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index 3a9a5a2062..a063a01b82 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -60,12 +60,15 @@ struct sleepy_robin: public boost::fibers::algo::round_robin
 /*****************************************************************************
 *   ThreadPoolBase
 *****************************************************************************/
-LL::ThreadPoolBase::ThreadPoolBase(const std::string& name, size_t threads,
-                                   WorkQueueBase* queue):
+LL::ThreadPoolBase::ThreadPoolBase(const std::string& name,
+                                   size_t threads,
+                                   WorkQueueBase* queue,
+                                   bool auto_shutdown):
     super(name),
     mName("ThreadPool:" + name),
     mThreadCount(getConfiguredWidth(name, threads)),
-    mQueue(queue)
+    mQueue(queue),
+    mAutomaticShutdown(auto_shutdown)
 {}
 
 void LL::ThreadPoolBase::start()
@@ -79,6 +82,14 @@ void LL::ThreadPoolBase::start()
                 run(tname);
             });
     }
+
+    if (!mAutomaticShutdown)
+    {
+        // Some threads, like main window's might need to run a bit longer
+        // to wait for a proper shutdown message
+        return;
+    }
+
     // Listen on "LLApp", and when the app is shutting down, close the queue
     // and join the workers.
     LLEventPumps::instance().obtain("LLApp").listen(
diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index 60f4a0ce1b..fa16c6fe71 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -40,7 +40,7 @@ namespace LL
          * overrides this parameter.
          */
         ThreadPoolBase(const std::string& name, size_t threads,
-                       WorkQueueBase* queue);
+                       WorkQueueBase* queue, bool auto_shutdown = true);
         virtual ~ThreadPoolBase();
 
         /**
@@ -87,6 +87,7 @@ namespace LL
 
     protected:
         std::unique_ptr<WorkQueueBase> mQueue;
+        bool mAutomaticShutdown;
 
     private:
         void run(const std::string& name);
@@ -117,8 +118,11 @@ namespace LL
          * Constraining the queue can cause a submitter to block. Do not
          * constrain any ThreadPool accepting work from the main thread.
          */
-        ThreadPoolUsing(const std::string& name, size_t threads=1, size_t capacity=1024*1024):
-            ThreadPoolBase(name, threads, new queue_t(name, capacity))
+        ThreadPoolUsing(const std::string& name,
+                        size_t threads=1,
+                        size_t capacity=1024*1024,
+                        bool auto_shutdown = true):
+            ThreadPoolBase(name, threads, new queue_t(name, capacity), auto_shutdown)
         {}
         ~ThreadPoolUsing() override {}
 
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 057d7a700e..0c1ed85477 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -412,8 +412,8 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
     using FuncType = std::function<void()>;
     // call GetMessage() and pull enqueue messages for later processing
     void gatherInput();
-    HWND mWindowHandle = NULL;
-    HDC mhDC = 0;
+    HWND mWindowHandleThrd = NULL;
+    HDC mhDCThrd = 0;
 
     // *HACK: Attempt to prevent startup crashes by deferring memory accounting
     // until after some graphics setup. See SL-20177. -Cosmic,2023-09-18
@@ -987,23 +987,23 @@ void LLWindowWin32::close()
 
 	LL_DEBUGS("Window") << "Destroying Window" << LL_ENDL;
 
-    mWindowThread->post([=]()
+    mWindowThread->post([this, self = mWindowThread]()
         {
-            if (IsWindow(mWindowHandle))
+            if (IsWindow(self->mWindowHandleThrd))
             {
-                if (mhDC)
+                if (self->mhDCThrd)
                 {
-                    if (!ReleaseDC(mWindowHandle, mhDC))
+                    if (!ReleaseDC(self->mWindowHandleThrd, self->mhDCThrd))
                     {
                         LL_WARNS("Window") << "Release of ghDC failed!" << LL_ENDL;
                     }
                 }
 
                 // Make sure we don't leave a blank toolbar button.
-                ShowWindow(mWindowHandle, SW_HIDE);
+                ShowWindow(self->mWindowHandleThrd, SW_HIDE);
 
                 // This causes WM_DESTROY to be sent *immediately*
-                if (!destroy_window_handler(mWindowHandle))
+                if (!destroy_window_handler(self->mWindowHandleThrd))
                 {
                     OSMessageBox(mCallbacks->translateString("MBDestroyWinFailed"),
                         mCallbacks->translateString("MBShutdownErr"),
@@ -1015,17 +1015,18 @@ void LLWindowWin32::close()
                 // Something killed the window while we were busy destroying gl or handle somehow got broken
                 LL_WARNS("Window") << "Failed to destroy Window, invalid handle!" << LL_ENDL;
             }
-
+            self->mWindowHandleThrd = NULL;
+            self->mhDCThrd = NULL;
+            self->mGLReady = false;
         });
-    // Window thread might be waiting for a getMessage(), give it
-    // a push to enshure it will process destroy_window_handler
-    kickWindowThread();
 
-    // Even though the above lambda might not yet have run, we've already
-    // bound mWindowHandle into it by value, which should suffice for the
-    // operations we're asking. That's the last time WE should touch it.
     mhDC = NULL;
     mWindowHandle = NULL;
+
+    // Window thread might be waiting for a getMessage(), give it
+    // a push to enshure it will process destroy_window_handler
+    kickWindowThread();
+    
     mWindowThread->close();
 }
 
@@ -1777,8 +1778,8 @@ void LLWindowWin32::recreateWindow(RECT window_rect, DWORD dw_ex_style, DWORD dw
         ()
         {
             LL_DEBUGS("Window") << "recreateWindow(): window_work entry" << LL_ENDL;
-            self->mWindowHandle = 0;
-            self->mhDC = 0;
+            self->mWindowHandleThrd = 0;
+            self->mhDCThrd = 0;
 
             if (oldWindowHandle)
             {
@@ -1813,20 +1814,20 @@ void LLWindowWin32::recreateWindow(RECT window_rect, DWORD dw_ex_style, DWORD dw
             {
                 // Failed to create window: clear the variables. This
                 // assignment is valid because we're running on mWindowThread.
-                self->mWindowHandle = NULL;
-                self->mhDC = 0;
+                self->mWindowHandleThrd = NULL;
+                self->mhDCThrd = 0;
             }
             else
             {
                 // Update mWindowThread's own mWindowHandle and mhDC.
-                self->mWindowHandle = handle;
-                self->mhDC = GetDC(handle);
+                self->mWindowHandleThrd = handle;
+                self->mhDCThrd = GetDC(handle);
             }
             
             updateWindowRect();
 
             // It's important to wake up the future either way.
-            promise.set_value(std::make_pair(self->mWindowHandle, self->mhDC));
+            promise.set_value(std::make_pair(self->mWindowHandleThrd, self->mhDCThrd));
             LL_DEBUGS("Window") << "recreateWindow(): window_work done" << LL_ENDL;
         };
     // But how we pass window_work to the window thread depends on whether we
@@ -4589,7 +4590,7 @@ U32 LLWindowWin32::getAvailableVRAMMegabytes()
 #endif // LL_WINDOWS
 
 inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
-    : LL::ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE)
+    : LL::ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, false)
 {
     LL::ThreadPool::start();
 }
@@ -4745,7 +4746,7 @@ void LLWindowWin32::LLWindowWin32Thread::initD3D()
 {
     if (!mGLReady) { return; }
 
-    if (mDXGIAdapter == NULL && mD3DDevice == NULL && mWindowHandle != 0)
+    if (mDXGIAdapter == NULL && mD3DDevice == NULL && mWindowHandleThrd != 0)
     {
         mD3D = Direct3DCreate9(D3D_SDK_VERSION);
         
@@ -4755,7 +4756,7 @@ void LLWindowWin32::LLWindowWin32Thread::initD3D()
         d3dpp.Windowed = TRUE;
         d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
 
-        HRESULT res = mD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, mWindowHandle, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &mD3DDevice);
+        HRESULT res = mD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, mWindowHandleThrd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &mD3DDevice);
         
         if (FAILED(res))
         {
@@ -4861,7 +4862,7 @@ void LLWindowWin32::LLWindowWin32Thread::run()
         // lazily call initD3D inside this loop to catch when mGLReady has been set to true
         initDX();
 
-        if (mWindowHandle != 0)
+        if (mWindowHandleThrd != 0)
         {
             // lazily call initD3D inside this loop to catch when mWindowHandle has been set, and mGLReady has been set to true
             // *TODO: Shutdown if this fails when mWindowHandle exists
@@ -4869,16 +4870,16 @@ void LLWindowWin32::LLWindowWin32Thread::run()
 
             MSG msg;
             BOOL status;
-            if (mhDC == 0)
+            if (mhDCThrd == 0)
             {
                 LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("w32t - PeekMessage");
-                logger.onChange("PeekMessage(", std::hex, mWindowHandle, ")");
-                status = PeekMessage(&msg, mWindowHandle, 0, 0, PM_REMOVE);
+                logger.onChange("PeekMessage(", std::hex, mWindowHandleThrd, ")");
+                status = PeekMessage(&msg, mWindowHandleThrd, 0, 0, PM_REMOVE);
             }
             else
             {
                 LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("w32t - GetMessage");
-                logger.always("GetMessage(", std::hex, mWindowHandle, ")");
+                logger.always("GetMessage(", std::hex, mWindowHandleThrd, ")");
                 status = GetMessage(&msg, NULL, 0, 0);
             }
             if (status > 0)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 30fb0be46c..f094170ff5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1892,6 +1892,9 @@ bool LLAppViewer::cleanup()
 		LL_INFOS() << "ViewerWindow deleted" << LL_ENDL;
 	}
 
+    LLSplashScreen::show();
+    LLSplashScreen::update(LLTrans::getString("ShuttingDown"));
+
 	LL_INFOS() << "Cleaning up Keyboard & Joystick" << LL_ENDL;
 
 	// viewer UI relies on keyboard so keep it aound until viewer UI isa gone
@@ -2170,6 +2173,8 @@ bool LLAppViewer::cleanup()
 	// deleteSingleton() methods.
 	LLSingletonBase::deleteAll();
 
+    LLSplashScreen::hide();
+
     LL_INFOS() << "Goodbye!" << LL_ENDL;
 
 	removeDumpDir();
@@ -5059,6 +5064,9 @@ void LLAppViewer::idleShutdown()
 		&& gLogoutTimer.getElapsedTimeF32() < SHUTDOWN_UPLOAD_SAVE_TIME
 		&& !logoutRequestSent())
 	{
+        gViewerWindow->setShowProgress(TRUE);
+        gViewerWindow->setProgressPercent(100.f);
+        gViewerWindow->setProgressString(LLTrans::getString("LoggingOut"));
 		return;
 	}
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 6c0e25ae39..ed5b809003 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -829,10 +829,17 @@ void LLViewerRegion::saveObjectCache()
 		mCacheDirty = FALSE;
 	}
 
-	// Map of LLVOCacheEntry takes time to release, store map for cleanup on idle
-	sRegionCacheCleanup.insert(mImpl->mCacheMap.begin(), mImpl->mCacheMap.end());
-	mImpl->mCacheMap.clear();
-	// TODO - probably need to do the same for overrides cache
+    if (LLAppViewer::instance()->isQuitting())
+    {
+        mImpl->mCacheMap.clear();
+    }
+    else
+    {
+        // Map of LLVOCacheEntry takes time to release, store map for cleanup on idle
+        sRegionCacheCleanup.insert(mImpl->mCacheMap.begin(), mImpl->mCacheMap.end());
+        mImpl->mCacheMap.clear();
+        // TODO - probably need to do the same for overrides cache
+    }
 }
 
 void LLViewerRegion::sendMessage()
-- 
cgit v1.2.3


From e0b7cb8e9a8b0fdbd45a54ce2e79a66e4908fc87 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 Jan 2024 04:18:57 +0200
Subject: Issue #30 Notecard losing thumbnail data

---
 indra/llinventory/llinventory.cpp | 55 +++++++++++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 55bcc7c5b2..6334a35fd0 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -32,6 +32,7 @@
 #include "llinventorydefines.h"
 #include "llxorcipher.h"
 #include "llsd.h"
+#include "llsdserialize.h"
 #include "message.h"
 #include <boost/tokenizer.hpp>
 
@@ -217,7 +218,19 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 		}
         else if (0 == strcmp("metadata", keyword))
         {
-            LLSD metadata(valuestr);
+            LLSD metadata;
+            if (strncmp("<llsd>", valuestr, 6) == 0)
+            {
+                std::istringstream stream(valuestr);
+                LLSDSerialize::fromXML(metadata, stream);
+            }
+            else
+            {
+                // next line likely contains metadata, but at the moment is not supported
+                // can do something like:
+                // LLSDSerialize::fromNotation(metadata, input_stream, -1);
+            }
+
             if (metadata.has("thumbnail"))
             {
                 const LLSD& thumbnail = metadata["thumbnail"];
@@ -693,7 +706,19 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 		}
         else if (0 == strcmp("metadata", keyword))
         {
-            LLSD metadata(valuestr);
+            LLSD metadata;
+            if (strncmp("<llsd>", valuestr, 6) == 0)
+            {
+                std::istringstream stream(valuestr);
+                LLSDSerialize::fromXML(metadata, stream);
+            }
+            else
+            {
+                // next line likely contains metadata, but at the moment is not supported
+                // can do something like:
+                // LLSDSerialize::fromNotation(metadata, input_stream, -1);
+            }
+
             if (metadata.has("thumbnail"))
             {
                 const LLSD& thumbnail = metadata["thumbnail"];
@@ -802,9 +827,14 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
 
     if (mThumbnailUUID.notNull())
     {
+        // Max length is 255 chars, will have to export differently if it gets more data
+        // Ex: use newline and toNotation (uses {}) for unlimited size
         LLSD metadata;
         metadata["thumbnail"] = LLSD().with("asset_id", mThumbnailUUID);
-        output_stream << "\t\tmetadata\t" << metadata << "|\n";
+
+        output_stream << "\t\tmetadata\t";
+        LLSDSerialize::toXML(metadata, output_stream);
+        output_stream << "|\n";
     }
 
 	// Check for permissions to see the asset id, and if so write it
@@ -1303,7 +1333,19 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 		}
         else if (0 == strcmp("metadata", keyword))
         {
-            LLSD metadata(valuestr);
+            LLSD metadata;
+            if (strncmp("<llsd>", valuestr, 6) == 0)
+            {
+                std::istringstream stream(valuestr);
+                LLSDSerialize::fromXML(metadata, stream);
+            }
+            else
+            {
+                // next line likely contains metadata, but at the moment is not supported
+                // can do something like:
+                // LLSDSerialize::fromNotation(metadata, input_stream, -1);
+            }
+
             if (metadata.has("thumbnail"))
             {
                 const LLSD& thumbnail = metadata["thumbnail"];
@@ -1343,9 +1385,12 @@ BOOL LLInventoryCategory::exportLegacyStream(std::ostream& output_stream, BOOL)
 	output_stream << "\t\tname\t" << mName.c_str() << "|\n";
     if (mThumbnailUUID.notNull())
     {
+        // Only up to 255 chars
         LLSD metadata;
         metadata["thumbnail"] = LLSD().with("asset_id", mThumbnailUUID);
-        output_stream << "\t\tmetadata\t" << metadata << "|\n";
+        output_stream << "\t\tmetadata\t";
+        LLSDSerialize::toXML(metadata, output_stream);
+        output_stream << "|\n";
     }
 	output_stream << "\t}\n";
 	return TRUE;
-- 
cgit v1.2.3


From da48bd943923958952ea77eed858ba8372d58d9a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 Jan 2024 02:23:28 +0200
Subject: SL-18721 Shutdown fixes #2

Set DONE if decode thread is down instead of waiting for an update.
Decodes can't be canceled, so fix potential situation where we get two
responses
---
 indra/llimage/llimageworker.cpp  | 31 ++++++++++++++++++-------------
 indra/llimage/llimageworker.h    |  4 +++-
 indra/newview/lltexturefetch.cpp | 36 +++++++++++++++++++++++++++++-------
 3 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
index c1ee052997..fd59daad3d 100644
--- a/indra/llimage/llimageworker.cpp
+++ b/indra/llimage/llimageworker.cpp
@@ -35,8 +35,10 @@ class ImageRequest
 {
 public:
 	ImageRequest(const LLPointer<LLImageFormatted>& image,
-				 S32 discard, BOOL needs_aux,
-				 const LLPointer<LLImageDecodeThread::Responder>& responder);
+                 S32 discard,
+                 BOOL needs_aux,
+                 const LLPointer<LLImageDecodeThread::Responder>& responder,
+                 U32 request_id);
 	virtual ~ImageRequest();
 
 	/*virtual*/ bool processRequest();
@@ -48,6 +50,7 @@ private:
 	// input
 	LLPointer<LLImageFormatted> mFormattedImage;
 	S32 mDiscardLevel;
+    U32 mRequestId;
 	BOOL mNeedsAux;
 	// output
 	LLPointer<LLImageRaw> mDecodedImageRaw;
@@ -62,6 +65,7 @@ private:
 
 // MAIN THREAD
 LLImageDecodeThread::LLImageDecodeThread(bool /*threaded*/)
+    : mDecodeCount(0)
 {
     mThreadPool.reset(new LL::ThreadPool("ImageDecode", 8));
     mThreadPool->start();
@@ -92,9 +96,10 @@ LLImageDecodeThread::handle_t LLImageDecodeThread::decodeImage(
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
 
+    U32 decode_id = ++mDecodeCount;
     // Instantiate the ImageRequest right in the lambda, why not?
     bool posted = mThreadPool->getQueue().post(
-        [req = ImageRequest(image, discard, needs_aux, responder)]
+        [req = ImageRequest(image, discard, needs_aux, responder, decode_id)]
         () mutable
         {
             auto done = req.processRequest();
@@ -103,13 +108,10 @@ LLImageDecodeThread::handle_t LLImageDecodeThread::decodeImage(
     if (! posted)
     {
         LL_DEBUGS() << "Tried to start decoding on shutdown" << LL_ENDL;
-        // should this return 0?
+        return 0;
     }
 
-    // It's important to our consumer (LLTextureFetchWorker) that we return a
-    // nonzero handle. It is NOT important that the nonzero handle be unique:
-    // nothing is ever done with it except to compare it to zero, or zero it.
-    return 17;
+    return decode_id;
 }
 
 void LLImageDecodeThread::shutdown()
@@ -123,15 +125,18 @@ LLImageDecodeThread::Responder::~Responder()
 
 //----------------------------------------------------------------------------
 
-ImageRequest::ImageRequest(const LLPointer<LLImageFormatted>& image, 
-							S32 discard, BOOL needs_aux,
-							const LLPointer<LLImageDecodeThread::Responder>& responder)
+ImageRequest::ImageRequest(const LLPointer<LLImageFormatted>& image,
+                           S32 discard,
+                           BOOL needs_aux,
+                           const LLPointer<LLImageDecodeThread::Responder>& responder,
+                           U32 request_id)
 	: mFormattedImage(image),
 	  mDiscardLevel(discard),
 	  mNeedsAux(needs_aux),
 	  mDecodedRaw(FALSE),
 	  mDecodedAux(FALSE),
-	  mResponder(responder)
+	  mResponder(responder),
+	  mRequestId(request_id)
 {
 }
 
@@ -199,7 +204,7 @@ void ImageRequest::finishRequest(bool completed)
 	if (mResponder.notNull())
 	{
 		bool success = completed && mDecodedRaw && (!mNeedsAux || mDecodedAux);
-		mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux);
+		mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux, mRequestId);
 	}
 	// Will automatically be deleted
 }
diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h
index ca4c0d93d0..b4ab9432e6 100644
--- a/indra/llimage/llimageworker.h
+++ b/indra/llimage/llimageworker.h
@@ -39,7 +39,7 @@ public:
 	protected:
 		virtual ~Responder();
 	public:
-		virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux) = 0;
+		virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32 request_id) = 0;
 	};
 
 public:
@@ -53,6 +53,7 @@ public:
 						 const LLPointer<Responder>& responder);
 	size_t getPending();
 	size_t update(F32 max_time_ms);
+    S32 getTotalDecodeCount() { return mDecodeCount; }
 	void shutdown();
 
 private:
@@ -60,6 +61,7 @@ private:
 	// LLQueuedThread - instead this is the API by which we submit work to the
 	// "ImageDecode" ThreadPool.
 	std::unique_ptr<LL::ThreadPool> mThreadPool;
+    LLAtomicU32 mDecodeCount;
 };
 
 #endif
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 38c9b3717d..40bbe2b934 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -348,13 +348,13 @@ private:
 		}
 
 		// Threads:  Tid
-		virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux)
+		virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux, U32 request_id)
 		{
             LL_PROFILE_ZONE_SCOPED;
 			LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
 			if (worker)
 			{
- 				worker->callbackDecoded(success, raw, aux);
+ 				worker->callbackDecoded(success, raw, aux, request_id);
 			}
 		}
 	private:
@@ -398,7 +398,7 @@ public:
 	void callbackCacheWrite(bool success);
 
 	// Threads:  Tid
-	void callbackDecoded(bool success, LLImageRaw* raw, LLImageRaw* aux);
+	void callbackDecoded(bool success, LLImageRaw* raw, LLImageRaw* aux, S32 decode_id);
 	
 	// Threads:  T*
 	void setGetStatus(LLCore::HttpStatus status, const std::string& reason)
@@ -1800,8 +1800,22 @@ bool LLTextureFetchWorker::doWork(S32 param)
 		setState(DECODE_IMAGE_UPDATE);
 		LL_DEBUGS(LOG_TXT) << mID << ": Decoding. Bytes: " << mFormattedImage->getDataSize() << " Discard: " << discard
 						   << " All Data: " << mHaveAllData << LL_ENDL;
-		mDecodeHandle = LLAppViewer::getImageDecodeThread()->decodeImage(mFormattedImage, discard, mNeedsAux,
-																  new DecodeResponder(mFetcher, mID, this));
+
+        // In case worked manages to request decode, be shut down,
+        // then init and request decode again with first decode
+        // still in progress, assign a sufficiently unique id
+        mDecodeHandle = LLAppViewer::getImageDecodeThread()->decodeImage(mFormattedImage,
+                                                                       discard,
+                                                                       mNeedsAux,
+                                                                       new DecodeResponder(mFetcher, mID, this));
+        if (mDecodeHandle == 0)
+        {
+            // Abort, failed to put into queue.
+            // Happens if viewer is shutting down
+            setState(DONE);
+            LL_DEBUGS(LOG_TXT) << mID << " DECODE_IMAGE abort: failed to post for decoding" << LL_ENDL;
+            return true;
+        }
 		// fall though
 	}
 	
@@ -2305,16 +2319,24 @@ void LLTextureFetchWorker::callbackCacheWrite(bool success)
 //////////////////////////////////////////////////////////////////////////////
 
 // Threads:  Tid
-void LLTextureFetchWorker::callbackDecoded(bool success, LLImageRaw* raw, LLImageRaw* aux)
+void LLTextureFetchWorker::callbackDecoded(bool success, LLImageRaw* raw, LLImageRaw* aux, S32 decode_id)
 {
 	LLMutexLock lock(&mWorkMutex);										// +Mw
 	if (mDecodeHandle == 0)
 	{
 		return; // aborted, ignore
 	}
+    if (mDecodeHandle != decode_id)
+    {
+        // Queue doesn't support canceling old requests.
+        // This shouldn't normally happen, but in case it's possible that a worked
+        // will request decode, be aborted, reinited then start a new decode
+        LL_DEBUGS(LOG_TXT) << mID << " received obsolete decode's callback" << LL_ENDL;
+        return; // ignore
+    }
 	if (mState != DECODE_IMAGE_UPDATE)
 	{
-// 		LL_WARNS(LOG_TXT) << "Decode callback for " << mID << " with state = " << mState << LL_ENDL;
+		LL_DEBUGS(LOG_TXT) << "Decode callback for " << mID << " with state = " << mState << LL_ENDL;
 		mDecodeHandle = 0;
 		return;
 	}
-- 
cgit v1.2.3


From f6ceafee5bb26cf86d64959cabf68deefaf791a8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 22 Jan 2024 06:40:41 +0100
Subject: SL-20416 Avoid of taking focus by EmojiPicker

---
 indra/llui/llemojidictionary.cpp                   |  132 ++-
 indra/llui/llemojidictionary.h                     |    1 +
 indra/llui/llemojihelper.cpp                       |    7 +-
 indra/llui/llemojihelper.h                         |    4 +-
 indra/llui/llfloater.cpp                           |   28 +-
 indra/llui/llfloater.h                             |    5 +-
 indra/llui/lltexteditor.cpp                        |   24 +-
 indra/llui/lltexteditor.h                          |    1 +
 indra/llui/lluictrl.cpp                            |   25 +-
 indra/newview/llfloateremojipicker.cpp             | 1066 ++++++++++++--------
 indra/newview/llfloateremojipicker.h               |   66 +-
 indra/newview/llfloaterimsessiontab.cpp            |   81 +-
 indra/newview/llfloaterimsessiontab.h              |   10 +-
 .../skins/default/xui/en/floater_emoji_picker.xml  |   34 +-
 .../skins/default/xui/en/floater_im_session.xml    |    5 +-
 15 files changed, 833 insertions(+), 656 deletions(-)

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index e29f3436cf..f16c38a11a 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -41,9 +41,9 @@
 static const std::string SKINNED_EMOJI_FILENAME("emoji_characters.xml");
 static const std::string SKINNED_CATEGORY_FILENAME("emoji_categories.xml");
 static const std::string COMMON_GROUP_FILENAME("emoji_groups.xml");
-static const std::string GROUP_NAME_ALL("all");
-static const std::string GROUP_NAME_OTHERS("others");
 static const std::string GROUP_NAME_SKIP("skip");
+// https://www.compart.com/en/unicode/U+1F302
+static const S32 GROUP_OTHERS_IMAGE_INDEX = 0x1F302;
 
 // ============================================================================
 // Helper functions
@@ -143,68 +143,76 @@ LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
     return result;
 }
 
-void LLEmojiDictionary::findByShortCode(std::vector<LLEmojiSearchResult>& result, const std::string& needle) const
+// static
+bool LLEmojiDictionary::searchInShortCode(std::size_t& begin, std::size_t& end, const std::string& shortCode, const std::string& needle)
+{
+    begin = 0;
+    end = 1;
+    std::size_t index = 1;
+    // Search for begin
+    char d = tolower(needle[index++]);
+    while (end < shortCode.size())
+    {
+        char s = tolower(shortCode[end++]);
+        if (s == d)
+        {
+            begin = end - 1;
+            break;
+        }
+    }
+    if (!begin)
+        return false;
+    // Search for end
+    d = tolower(needle[index++]);
+    if (!d)
+        return true;
+    while (end < shortCode.size() && index <= needle.size())
+    {
+        char s = tolower(shortCode[end++]);
+        if (s == d)
+        {
+            if (index == needle.size())
+                return true;
+            d = tolower(needle[index++]);
+            continue;
+        }
+        switch (s)
+        {
+        case L'-':
+        case L'_':
+        case L'+':
+            continue;
+        }
+        break;
+    }
+    return false;
+}
+
+void LLEmojiDictionary::findByShortCode(
+    std::vector<LLEmojiSearchResult>& result,
+    const std::string& needle
+) const
 {
     result.clear();
 
     if (needle.empty() || needle.front() != ':')
         return;
 
-    auto search = [needle](std::size_t& begin, std::size_t& end, const std::string& shortCode) -> bool
+    std::map<llwchar, std::vector<LLEmojiSearchResult>> results;
+
+    for (const LLEmojiDescriptor& d : mEmojis)
+    {
+        if (!d.ShortCodes.empty())
         {
-            begin = 0;
-            end = 1;
-            std::size_t index = 1;
-            // Search for begin
-            char d = tolower(needle[index++]);
-            while (end < shortCode.size())
+            const std::string& shortCode = d.ShortCodes.front();
+            if (shortCode.size() >= needle.size() && shortCode.front() == needle.front())
             {
-                char s = tolower(shortCode[end++]);
-                if (s == d)
+                std::size_t begin, end;
+                if (searchInShortCode(begin, end, shortCode, needle))
                 {
-                    begin = end - 1;
-                    break;
+                    results[begin].emplace_back(d.Character, shortCode, begin, end);
                 }
             }
-            if (!begin)
-                return false;
-            // Search for end
-            d = tolower(needle[index++]);
-            while (end < shortCode.size() && index <= needle.size())
-            {
-                char s = tolower(shortCode[end++]);
-                if (s == d)
-                {
-                    if (index == needle.size())
-                        return true;
-                    d = tolower(needle[index++]);
-                    continue;
-                }
-                switch (s)
-                {
-                case L'-':
-                case L'_':
-                case L'+':
-                    continue;
-                }
-                break;
-            }
-            return false;
-        };
-
-    std::map<std::size_t, std::vector<LLEmojiSearchResult>> results;
-
-    for (const LLEmojiDescriptor& d : mEmojis)
-    {
-        if (d.ShortCodes.empty())
-            continue;
-        const std::string& shortCode = d.ShortCodes.front();
-        if (shortCode.size() < needle.size() || shortCode.front() != needle.front())
-            continue;
-        std::size_t begin, end;
-        if (search(begin, end, shortCode))
-        {
-            results[begin].emplace_back(d.Character, shortCode, begin, end);
         }
     }
 
@@ -312,27 +320,13 @@ void LLEmojiDictionary::loadGroups()
     }
 
     mGroups.clear();
-    // Add group "all"
-    mGroups.emplace_back();
-    // https://www.compart.com/en/unicode/U+1F50D
-    mGroups.front().Character = 0x1F50D;
-    // https://www.compart.com/en/unicode/U+1F302
-    llwchar iconOthers = 0x1F302;
 
     // Register all groups
     for (LLSD::array_const_iterator it = data.beginArray(), end = data.endArray(); it != end; ++it)
     {
         const LLSD& sd = *it;
         const std::string& name = sd["Name"].asStringRef();
-        if (name == GROUP_NAME_ALL)
-        {
-            mGroups.front().Character = loadIcon(sd);
-        }
-        else if (name == GROUP_NAME_OTHERS)
-        {
-            iconOthers = loadIcon(sd);
-        }
-        else if (name == GROUP_NAME_SKIP)
+        if (name == GROUP_NAME_SKIP)
         {
             mSkipCategories = loadCategories(sd);
             translateCategories(mSkipCategories);
@@ -355,7 +349,7 @@ void LLEmojiDictionary::loadGroups()
 
     // Add group "others"
     mGroups.emplace_back();
-    mGroups.back().Character = iconOthers;
+    mGroups.back().Character = GROUP_OTHERS_IMAGE_INDEX;
 }
 
 void LLEmojiDictionary::loadEmojis()
diff --git a/indra/llui/llemojidictionary.h b/indra/llui/llemojidictionary.h
index 66b564b70a..4af376df64 100644
--- a/indra/llui/llemojidictionary.h
+++ b/indra/llui/llemojidictionary.h
@@ -89,6 +89,7 @@ public:
 
     static void initClass();
     LLWString findMatchingEmojis(const std::string& needle) const;
+    static bool searchInShortCode(std::size_t& begin, std::size_t& end, const std::string& shortCode, const std::string& needle);
     void findByShortCode(std::vector<LLEmojiSearchResult>& result, const std::string& needle) const;
     const LLEmojiDescriptor* getDescriptorFromEmoji(llwchar emoji) const;
     const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 9411f7cac5..89e6ddf987 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -36,7 +36,7 @@
 // Constants
 //
 
-constexpr char DEFAULT_EMOJI_HELPER_FLOATER[] = "emoji_complete";
+constexpr char DEFAULT_EMOJI_HELPER_FLOATER[] = "emoji_picker";
 constexpr S32 HELPER_FLOATER_OFFSET_X = 0;
 constexpr S32 HELPER_FLOATER_OFFSET_Y = 0;
 
@@ -117,9 +117,10 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
 	pHelperFloater->openFloater(LLSD().with("hint", short_code));
 }
 
-void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p)
+void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p, bool strict)
 {
-	if (ctrl_p && !isActive(ctrl_p))
+	mIsHideDisabled &= !strict;
+	if (mIsHideDisabled || (ctrl_p && !isActive(ctrl_p)))
 	{
 		return;
 	}
diff --git a/indra/llui/llemojihelper.h b/indra/llui/llemojihelper.h
index 58f68d12a4..e826ff93e6 100644
--- a/indra/llui/llemojihelper.h
+++ b/indra/llui/llemojihelper.h
@@ -45,7 +45,8 @@ public:
 	bool        isActive(const LLUICtrl* ctrl_p) const;
 	static bool isCursorInEmojiCode(const LLWString& wtext, S32 cursor_pos, S32* short_code_pos_p = nullptr);
 	void        showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(llwchar)> commit_cb);
-	void        hideHelper(const LLUICtrl* ctrl_p = nullptr);
+	void        hideHelper(const LLUICtrl* ctrl_p = nullptr, bool strict = false);
+	void        setIsHideDisabled(bool disabled) { mIsHideDisabled = disabled; };
 
 	// Eventing
 	bool handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask);
@@ -61,4 +62,5 @@ private:
 	boost::signals2::connection mHostCtrlFocusLostConn;
 	boost::signals2::connection mHelperCommitConn;
 	std::function<void(llwchar)> mEmojiCommitCb;
+	bool mIsHideDisabled;
 };
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 23d3a66631..31019f6c33 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -182,6 +182,7 @@ LLFloater::Params::Params()
 	save_visibility("save_visibility", false),
 	can_dock("can_dock", false),
 	show_title("show_title", true),
+	auto_close("auto_close", false),
 	positioning("positioning", LLFloaterEnums::POSITIONING_RELATIVE),
 	header_height("header_height", 0),
 	legacy_header_height("legacy_header_height", 0),
@@ -254,6 +255,7 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
 	mCanClose(p.can_close),
 	mDragOnLeft(p.can_drag_on_left),
 	mResizable(p.can_resize),
+	mAutoClose(p.auto_close),
 	mPositioning(p.positioning),
 	mMinWidth(p.min_width),
 	mMinHeight(p.min_height),
@@ -681,7 +683,7 @@ void LLFloater::openFloater(const LLSD& key)
 	if (getHost() != NULL)
 	{
 		getHost()->setMinimized(FALSE);
-		getHost()->setVisibleAndFrontmost(mAutoFocus);
+		getHost()->setVisibleAndFrontmost(mAutoFocus && !getIsChrome());
 		getHost()->showFloater(this);
 	}
 	else
@@ -693,7 +695,7 @@ void LLFloater::openFloater(const LLSD& key)
 		}
 		applyControlsAndPosition(floater_to_stack);
 		setMinimized(FALSE);
-		setVisibleAndFrontmost(mAutoFocus);
+		setVisibleAndFrontmost(mAutoFocus && !getIsChrome());
 	}
 
 	mOpenSignal(this, key);
@@ -1551,7 +1553,7 @@ void LLFloater::addDependentFloater(LLFloater* floaterp, BOOL reposition, BOOL r
 	if (floaterp->isFrontmost())
 	{
 		// make sure to bring self and sibling floaters to front
-		gFloaterView->bringToFront(floaterp);
+		gFloaterView->bringToFront(floaterp, floaterp->getAutoFocus() && !getIsChrome());
 	}
 }
 
@@ -1696,6 +1698,7 @@ BOOL LLFloater::handleDoubleClick(S32 x, S32 y, MASK mask)
 	return was_minimized || LLPanel::handleDoubleClick(x, y, mask);
 }
 
+// virtual
 void LLFloater::bringToFront( S32 x, S32 y )
 {
 	if (getVisible() && pointInView(x, y))
@@ -1710,12 +1713,20 @@ void LLFloater::bringToFront( S32 x, S32 y )
 			LLFloaterView* parent = dynamic_cast<LLFloaterView*>( getParent() );
 			if (parent)
 			{
-				parent->bringToFront( this );
+				parent->bringToFront(this, !getIsChrome());
 			}
 		}
 	}
 }
 
+// virtual
+void LLFloater::goneFromFront()
+{
+    if (mAutoClose)
+    {
+        closeFloater();
+    }
+}
 
 // virtual
 void LLFloater::setVisibleAndFrontmost(BOOL take_focus,const LLSD& key)
@@ -2561,6 +2572,11 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 		return;
 	}
 
+	if (mFrontChild && !mFrontChild->isDead())
+	{
+		mFrontChild->goneFromFront();
+	}
+
 	mFrontChild = child;
 
 	// *TODO: make this respect floater's mAutoFocus value, instead of
@@ -3060,6 +3076,9 @@ LLFloater *LLFloaterView::getBackmost() const
 
 void LLFloaterView::syncFloaterTabOrder()
 {
+	if (mFrontChild && !mFrontChild->isDead() && mFrontChild->getIsChrome())
+		return;
+
 	// look for a visible modal dialog, starting from first
 	LLModalDialog* modal_dialog = NULL;
 	for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
@@ -3307,6 +3326,7 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
 	mDefaultRelativeY = p.rel_y;
 
 	mPositioning = p.positioning;
+	mAutoClose = p.auto_close;
 
 	mSaveRect = p.save_rect;
 	if (p.save_visibility)
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 860a6f9e2a..5f4e1a2cad 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -163,7 +163,8 @@ public:
 								save_visibility,
 								save_dock_state,
 								can_dock,
-								show_title;
+								show_title,
+								auto_close;
 		
 		Optional<LLFloaterEnums::EOpenPositioning>	positioning;
 		
@@ -390,6 +391,7 @@ protected:
 	void		 	setInstanceName(const std::string& name);
 	
 	virtual void	bringToFront(S32 x, S32 y);
+	virtual void	goneFromFront();
 	
 	void			setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized
 	const LLRect&	getExpandedRect() const { return mExpandedRect; }
@@ -488,6 +490,7 @@ private:
     bool            mFocusStealsFrontmost = true;	// FALSE if we don't want the currently focused floater to cover this floater without user interaction
 	BOOL			mDragOnLeft;
 	BOOL			mResizable;
+	BOOL			mAutoClose;
 
 	LLFloaterEnums::EOpenPositioning	mPositioning;
 	LLCoordFloater	mPosition;
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3910be1443..092739a538 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -508,7 +508,8 @@ void LLTextEditor::getSegmentsInRange(LLTextEditor::segment_vec_t& segments_out,
 	}
 }
 
-void LLTextEditor::setShowEmojiHelper(bool show) {
+void LLTextEditor::setShowEmojiHelper(bool show)
+{
 	if (!mShowEmojiHelper)
 	{
 		LLEmojiHelper::instance().hideHelper(this);
@@ -1192,6 +1193,16 @@ void LLTextEditor::addChar(llwchar wc)
 	}
 }
 
+void LLTextEditor::showEmojiHelper()
+{
+    if (mReadOnly || !mShowEmojiHelper)
+        return;
+
+    const LLRect cursorRect(getLocalRectFromDocIndex(mCursorPos));
+    auto cb = [this](llwchar emoji) { insertEmoji(emoji); };
+    LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, LLStringUtil::null, cb);
+}
+
 void LLTextEditor::tryToShowEmojiHelper()
 {
     if (mReadOnly || !mShowEmojiHelper)
@@ -1207,6 +1218,10 @@ void LLTextEditor::tryToShowEmojiHelper()
         auto cb = [this](llwchar emoji) { handleEmojiCommit(emoji); };
         LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, part, cb);
     }
+    else
+    {
+        LLEmojiHelper::instance().hideHelper();
+    }
 }
 
 void LLTextEditor::addLineBreakChar(BOOL group_together)
@@ -1911,7 +1926,12 @@ BOOL LLTextEditor::handleUnicodeCharHere(llwchar uni_char)
 	// Handle most keys only if the text editor is writeable.
 	if( !mReadOnly )
 	{
-		if( mAutoIndent && '}' == uni_char )
+        if (mShowEmojiHelper && uni_char < 0x80 && LLEmojiHelper::instance().handleKey(this, (KEY)uni_char, MASK_NONE))
+        {
+            return TRUE;
+        }
+
+        if( mAutoIndent && '}' == uni_char )
 		{
 			unindentLineBeforeCloseBrace();
 		}
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 7a96e17899..521405ec25 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -206,6 +206,7 @@ public:
 	void			setShowContextMenu(bool show) { mShowContextMenu = show; }
 	bool			getShowContextMenu() const { return mShowContextMenu; }
 
+	void			showEmojiHelper();
 	void			setShowEmojiHelper(bool show);
 	bool			getShowEmojiHelper() const { return mShowEmojiHelper; }
 
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 21afcae7c3..7eb9ae69fb 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -768,25 +768,20 @@ void LLUICtrl::setIsChrome(BOOL is_chrome)
 
 // virtual
 BOOL LLUICtrl::getIsChrome() const
-{ 
+{
+	if (mIsChrome)
+		return TRUE;
+
 	LLView* parent_ctrl = getParent();
-	while(parent_ctrl)
+	while (parent_ctrl)
 	{
-		if(parent_ctrl->isCtrl())
-		{
-			break;	
-		}
+		if (parent_ctrl->isCtrl())
+			return ((LLUICtrl*)parent_ctrl)->getIsChrome();
+
 		parent_ctrl = parent_ctrl->getParent();
 	}
-	
-	if(parent_ctrl)
-	{
-		return mIsChrome || ((LLUICtrl*)parent_ctrl)->getIsChrome();
-	}
-	else
-	{
-		return mIsChrome ; 
-	}
+
+	return FALSE; 
 }
 
 
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index ecfc4e7b41..2380fd357b 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -31,7 +31,7 @@
 #include "llbutton.h"
 #include "llcombobox.h"
 #include "llemojidictionary.h"
-#include "llfiltereditor.h"
+#include "llemojihelper.h"
 #include "llfloaterreg.h"
 #include "llkeyboard.h"
 #include "llscrollcontainer.h"
@@ -46,16 +46,25 @@ namespace {
 // The following variables and constants are used for storing the floater state
 // between different lifecycles of the floater and different sissions of the viewer
 
+// Floater constants
+static const S32 ALL_EMOJIS_GROUP_INDEX = -2;
+// https://www.compart.com/en/unicode/U+1F50D
+static const S32 ALL_EMOJIS_IMAGE_INDEX = 0x1F50D;
+static const S32 USED_EMOJIS_GROUP_INDEX = -1;
+// https://www.compart.com/en/unicode/U+23F2
+static const S32 USED_EMOJIS_IMAGE_INDEX = 0x23F2;
+// https://www.compart.com/en/unicode/U+1F6D1
+static const S32 EMPTY_LIST_IMAGE_INDEX = 0x1F6D1;
+// The following categories should follow the required alphabetic order
+static const std::string RECENTLY_USED_CATEGORY = "1 recently used";
+static const std::string FREQUENTLY_USED_CATEGORY = "2 frequently used";
+
 // Floater state related variables
-static U32 sSelectedGroupIndex = 0;
-static std::string sFilterPattern;
 static std::list<llwchar> sRecentlyUsed;
 static std::list<std::pair<llwchar, U32>> sFrequentlyUsed;
 
 // State file related values
 static std::string sStateFileName;
-static const std::string sKeySelectedGroupIndex("SelectedGroupIndex");
-static const std::string sKeyFilterPattern("FilterPattern");
 static const std::string sKeyRecentlyUsed("RecentlyUsed");
 static const std::string sKeyFrequentlyUsed("FrequentlyUsed");
 }
@@ -116,11 +125,10 @@ class LLEmojiGridIcon : public LLScrollingPanel
 public:
     LLEmojiGridIcon(
         const LLPanel::Params& panel_params
-        , const LLEmojiDescriptor* descr
-        , std::string category)
+        , const LLEmojiSearchResult& emoji)
         : LLScrollingPanel(panel_params)
-        , mDescr(descr)
-        , mText(LLWString(1, descr->Character))
+        , mData(emoji)
+        , mText(LLWString(1, emoji.Character))
     {
     }
 
@@ -145,12 +153,11 @@ public:
 
     virtual void updatePanel(BOOL allow_modify) override {}
 
-    const LLEmojiDescriptor* getDescr() const { return mDescr; }
-    llwchar getEmoji() const { return mDescr->Character; }
+    const LLEmojiSearchResult& getData() const { return mData; }
     LLWString getText() const { return mText; }
 
 private:
-    const LLEmojiDescriptor* mDescr;
+    const LLEmojiSearchResult mData;
     const LLWString mText;
 };
 
@@ -162,23 +169,31 @@ public:
     {
     }
 
-    void setEmoji(const LLEmojiDescriptor* descr)
+    void setIcon(const LLEmojiGridIcon* icon)
     {
-        mDescr = descr;
-
-        if (!mDescr)
-            return;
+        if (icon)
+        {
+            setData(icon->getData().Character, icon->getData().String, icon->getData().Begin, icon->getData().End);
+        }
+        else
+        {
+            setData(0, LLStringUtil::null, 0, 0);
+        }
+    }
 
-        mEmojiText = LLWString(1, descr->Character);
+    void setData(llwchar emoji, std::string title, size_t begin, size_t end)
+    {
+        mWStr = LLWString(1, emoji);
+        mEmoji = emoji;
+        mTitle = title;
+        mBegin = begin;
+        mEnd = end;
     }
 
     virtual void draw() override
     {
         LLPanel::draw();
 
-        if (!mDescr)
-            return;
-
         S32 clientHeight = getRect().getHeight();
         S32 clientWidth = getRect().getWidth();
         S32 iconWidth = clientHeight;
@@ -190,24 +205,14 @@ public:
         static LLColor4 defaultColor(0.75f, 0.75f, 0.75f, 1.0f);
         LLColor4 textColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", defaultColor);
         S32 max_pixels = clientWidth - iconWidth;
-        size_t count = mDescr->ShortCodes.size();
-        if (count == 1)
-        {
-            drawName(mDescr->ShortCodes.front(), iconWidth, centerY, max_pixels, textColor);
-        }
-        else if (count > 1)
-        {
-            F32 quarterY = 0.5f * centerY;
-            drawName(mDescr->ShortCodes.front(), iconWidth, centerY + quarterY, max_pixels, textColor);
-            drawName(*++mDescr->ShortCodes.begin(), iconWidth, quarterY, max_pixels, textColor);
-        }
+        drawName(iconWidth, centerY, max_pixels, textColor);
     }
 
 protected:
     void drawIcon(F32 x, F32 y, S32 max_pixels)
     {
         LLFontGL::getFontEmojiHuge()->render(
-            mEmojiText,                 // wstr
+            mWStr,                      // wstr
             0,                          // begin_offset
             x,                          // x
             y,                          // y
@@ -220,90 +225,118 @@ protected:
             max_pixels);                // max_pixels
     }
 
-    void drawName(std::string name, F32 x, F32 y, S32 max_pixels, LLColor4& color)
+    void drawName(F32 x, F32 y, S32 max_pixels, LLColor4& color)
     {
-        LLFontGL::getFontEmoji()->renderUTF8(
-            name,                       // wstr
-            0,                          // begin_offset
-            x,                          // x
-            y,                          // y
-            color,                      // color
-            LLFontGL::LEFT,             // halign
-            LLFontGL::VCENTER,          // valign
-            LLFontGL::NORMAL,           // style
-            LLFontGL::DROP_SHADOW_SOFT, // shadow
-            -1,                         // max_chars
-            max_pixels);                // max_pixels
+        F32 x0 = x;
+        F32 x1 = max_pixels;
+        LLFontGL* font = LLFontGL::getFontEmoji();
+        if (mBegin)
+        {
+            std::string text = mTitle.substr(0, mBegin);
+            font->renderUTF8(
+                text,                       // text
+                0,                          // begin_offset
+                x0,                         // x
+                y,                          // y
+                color,                      // color
+                LLFontGL::LEFT,             // halign
+                LLFontGL::VCENTER,          // valign
+                LLFontGL::NORMAL,           // style
+                LLFontGL::DROP_SHADOW_SOFT, // shadow
+                text.size(),                // max_chars
+                x1);                        // max_pixels
+            F32 dx = font->getWidthF32(text);
+            x0 += dx;
+            x1 -= dx;
+        }
+        if (x1 > 0 && mEnd > mBegin)
+        {
+            std::string text = mTitle.substr(mBegin, mEnd - mBegin);
+            font->renderUTF8(
+                text,                       // text
+                0,                          // begin_offset
+                x0,                         // x
+                y,                          // y
+                LLColor4::yellow6,          // color
+                LLFontGL::LEFT,             // halign
+                LLFontGL::VCENTER,          // valign
+                LLFontGL::NORMAL,           // style
+                LLFontGL::DROP_SHADOW_SOFT, // shadow
+                text.size(),                // max_chars
+                x1);                        // max_pixels
+            F32 dx = font->getWidthF32(text);
+            x0 += dx;
+            x1 -= dx;
+        }
+        if (x1 > 0 && mEnd < mTitle.size())
+        {
+            std::string text = mEnd ? mTitle.substr(mEnd) : mTitle;
+            font->renderUTF8(
+                text,                       // text
+                0,                          // begin_offset
+                x0,                         // x
+                y,                          // y
+                color,                      // color
+                LLFontGL::LEFT,             // halign
+                LLFontGL::VCENTER,          // valign
+                LLFontGL::NORMAL,           // style
+                LLFontGL::DROP_SHADOW_SOFT, // shadow
+                text.size(),                // max_chars
+                x1);                        // max_pixels
+        }
     }
 
 private:
-    const LLEmojiDescriptor* mDescr { nullptr };
-    LLWString mEmojiText;
+    llwchar mEmoji;
+    LLWString mWStr;
+    std::string mTitle;
+    size_t mBegin;
+    size_t mEnd;
 };
 
-LLFloaterEmojiPicker* LLFloaterEmojiPicker::getInstance()
-{
-    LLFloaterEmojiPicker* floater = LLFloaterReg::getTypedInstance<LLFloaterEmojiPicker>("emoji_picker");
-    if (!floater)
-        LL_ERRS() << "Cannot instantiate emoji picker" << LL_ENDL;
-    return floater;
-}
-
-LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_callback, close_callback_t close_callback)
-{
-    LLFloaterEmojiPicker* floater = getInstance();
-    floater->show(pick_callback, close_callback);
-    return floater;
-}
-
-void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t close_callback)
-{
-    mEmojiPickCallback = pick_callback;
-    mFloaterCloseCallback = close_callback;
-    openFloater(mKey);
-    setFocus(TRUE);
-}
-
 LLFloaterEmojiPicker::LLFloaterEmojiPicker(const LLSD& key)
 : super(key)
 {
+    // This floater should hover on top of our dependent (with the dependent having the focus)
+    setFocusStealsFrontmost(FALSE);
+    setBackgroundVisible(FALSE);
+    setAutoFocus(FALSE);
+
     loadState();
 }
 
 BOOL LLFloaterEmojiPicker::postBuild()
 {
-    // Should be initialized first
+    mGroups = getChild<LLPanel>("Groups");
+    mBadge = getChild<LLPanel>("Badge");
+    mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
+    mEmojiGrid = getChild<LLScrollingPanelList>("EmojiGrid");
+    mDummy = getChild<LLTextBox>("Dummy");
+
     mPreview = new LLEmojiPreviewPanel();
     mPreview->setVisible(FALSE);
     addChild(mPreview);
 
-    mDummy = getChild<LLTextBox>("Dummy");
-
-    mGroups = getChild<LLPanel>("Groups");
-    mBadge = getChild<LLPanel>("Badge");
-
-    mFilter = getChild<LLFilterEditor>("Filter");
-    mFilter->setKeystrokeCallback([this](LLUICtrl*, const LLSD&) { onFilterChanged(); });
-    mFilter->setTextChangedCallback([this](LLUICtrl*, const LLSD&) { onFilterChanged(); });
-    mFilter->setText(sFilterPattern);
+    return LLFloater::postBuild();
+}
 
-    mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
-    mEmojiScroll->setMouseEnterCallback([this](LLUICtrl*, const LLSD&) { onGridMouseEnter(); });
-    mEmojiScroll->setMouseLeaveCallback([this](LLUICtrl*, const LLSD&) { onGridMouseLeave(); });
+void LLFloaterEmojiPicker::onOpen(const LLSD& key)
+{
+    mHint = key["hint"].asString();
 
-    mEmojiGrid = getChild<LLScrollingPanelList>("EmojiGrid");
+    LLEmojiHelper::instance().setIsHideDisabled(mHint.empty());
+    mFilterPattern = mHint;
 
-    fillGroups();
-    fillEmojis();
+    initialize();
 
-    return TRUE;
+    gFloaterView->adjustToFitScreen(this, FALSE);
 }
 
 void LLFloaterEmojiPicker::dirtyRect()
 {
     super::dirtyRect();
 
-    if (!mFilter)
+    if (!mPreview)
         return;
 
     const S32 HPADDING = 4;
@@ -314,20 +347,81 @@ void LLFloaterEmojiPicker::dirtyRect()
         mPreview->setRect(rect);
     }
 
-    if (mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
+    if (mEmojiScroll && mEmojiGrid)
     {
-        moveGroups();
-        fillEmojis(true);
+        S32 outer_width = mEmojiScroll->getRect().getWidth();
+        S32 inner_width = mEmojiGrid->getRect().getWidth();
+        if (outer_width != inner_width)
+        {
+            resizeGroupButtons();
+            fillEmojis(true);
+        }
     }
 }
 
-LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
+void LLFloaterEmojiPicker::initialize()
 {
-    gFocusMgr.releaseFocusIfNeeded( this );
+    S32 groupIndex = mSelectedGroupIndex && mSelectedGroupIndex <= mFilteredEmojiGroups.size() ?
+        mFilteredEmojiGroups[mSelectedGroupIndex - 1] : ALL_EMOJIS_GROUP_INDEX;
+
+    fillGroups();
+
+    if (mFilteredEmojis.empty())
+    {
+        if (!mHint.empty())
+        {
+            hideFloater();
+            return;
+        }
+
+        mGroups->setVisible(FALSE);
+        mFocusedIconRow = -1;
+        mFocusedIconCol = -1;
+        mFocusedIcon = nullptr;
+        mHoveredIcon = nullptr;
+        mEmojiScroll->goToTop();
+        mEmojiGrid->clearPanels();
+
+        if (mFilterPattern.empty())
+        {
+            showPreview(false);
+        }
+        else
+        {
+            const std::string prompt("No emoji found for ");
+            std::string title(prompt + '"' + mFilterPattern.substr(1) + '"');
+            mPreview->setData(EMPTY_LIST_IMAGE_INDEX, title, prompt.size() + 1, title.size() - 1);
+            showPreview(true);
+        }
+        return;
+    }
+
+    mGroups->setVisible(TRUE);
+    mPreview->setIcon(nullptr);
+    showPreview(true);
+
+    mSelectedGroupIndex = groupIndex == ALL_EMOJIS_GROUP_INDEX ? 0 :
+        (1 + std::distance(mFilteredEmojiGroups.begin(),
+            std::find(mFilteredEmojiGroups.begin(), mFilteredEmojiGroups.end(), groupIndex))) %
+        (1 + mFilteredEmojiGroups.size());
+
+    mGroupButtons[mSelectedGroupIndex]->setToggleState(TRUE);
+    mGroupButtons[mSelectedGroupIndex]->setUseFontColor(TRUE);
+
+    fillEmojis();
 }
 
 void LLFloaterEmojiPicker::fillGroups()
 {
+    // Do not use deleteAllChildren() because mBadge shouldn't be removed
+    for (LLButton* button : mGroupButtons)
+    {
+        mGroups->removeChild(button);
+    }
+    mFilteredEmojiGroups.clear();
+    mFilteredEmojis.clear();
+    mGroupButtons.clear();
+
     LLButton::Params params;
     params.font = LLFontGL::getFontEmoji();
 
@@ -335,277 +429,426 @@ void LLFloaterEmojiPicker::fillGroups()
     rect.mTop = mGroups->getRect().getHeight();
     rect.mBottom = mBadge->getRect().getHeight();
 
+    // Create button for "All categories"
+    createGroupButton(params, rect, ALL_EMOJIS_IMAGE_INDEX);
+
+    // Create group and button for "Recently used" and/or "Frequently used"
+    if (!sRecentlyUsed.empty() || !sFrequentlyUsed.empty())
+    {
+        std::map<std::string, std::vector<LLEmojiSearchResult>> cats;
+        fillCategoryRecentlyUsed(cats);
+        fillCategoryFrequentlyUsed(cats);
+
+        if (!cats.empty())
+        {
+            mFilteredEmojiGroups.push_back(USED_EMOJIS_GROUP_INDEX);
+            mFilteredEmojis.emplace_back(cats);
+            createGroupButton(params, rect, USED_EMOJIS_IMAGE_INDEX);
+        }
+    }
+
     const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
-    for (const LLEmojiGroup& group : groups)
+
+    // List all categories in the dictionary
+    for (U32 i = 0; i < groups.size(); ++i)
     {
-        LLButton* button = LLUICtrlFactory::create<LLButton>(params);
-        button->setClickedCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonClick(ctrl); });
-        button->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseEnter(ctrl); });
-        button->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseLeave(ctrl); });
+        std::map<std::string, std::vector<LLEmojiSearchResult>> cats;
 
-        button->setRect(rect);
-        button->setLabel(LLUIString(LLWString(1, group.Character)));
+        fillGroupEmojis(cats, i);
 
-        if (mGroupButtons.size() == sSelectedGroupIndex)
+        if (!cats.empty())
         {
-            button->setToggleState(TRUE);
-            button->setUseFontColor(TRUE);
+            mFilteredEmojiGroups.push_back(i);
+            mFilteredEmojis.emplace_back(cats);
+            createGroupButton(params, rect, groups[i].Character);
         }
+    }
+
+    resizeGroupButtons();
+}
+
+void LLFloaterEmojiPicker::fillCategoryRecentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats)
+{
+    if (sRecentlyUsed.empty())
+        return;
 
-        mGroupButtons.push_back(button);
-        mGroups->addChild(button);
+    std::vector<LLEmojiSearchResult> emojis;
+
+    // In case of empty mFilterPattern we'd use sRecentlyUsed directly
+    if (!mFilterPattern.empty())
+    {
+        // List all emojis in "Recently used"
+        const LLEmojiDictionary::emoji2descr_map_t& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
+        std::size_t begin, end;
+        for (llwchar emoji : sRecentlyUsed)
+        {
+            auto e2d = emoji2descr.find(emoji);
+            if (e2d != emoji2descr.end() && !e2d->second->ShortCodes.empty())
+            {
+                const std::string shortcode(e2d->second->ShortCodes.front());
+                if (LLEmojiDictionary::searchInShortCode(begin, end, shortcode, mFilterPattern))
+                {
+                    emojis.emplace_back(emoji, shortcode, begin, end);
+                }
+            }
+        }
+        if (emojis.empty())
+            return;
     }
 
-    moveGroups();
+    cats.emplace(std::make_pair(RECENTLY_USED_CATEGORY, emojis));
 }
 
-void LLFloaterEmojiPicker::moveGroups()
+void LLFloaterEmojiPicker::fillCategoryFrequentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats)
 {
-    const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
-    if (groups.empty())
+    if (sFrequentlyUsed.empty())
         return;
 
-    int badgeWidth = mGroups->getRect().getWidth() / groups.size();
-    if (badgeWidth == mRecentBadgeWidth)
+    std::vector<LLEmojiSearchResult> emojis;
+
+    // In case of empty mFilterPattern we'd use sFrequentlyUsed directly
+    if (!mFilterPattern.empty())
+    {
+        // List all emojis in "Frequently used"
+        const LLEmojiDictionary::emoji2descr_map_t& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
+        std::size_t begin, end;
+        for (const auto& emoji : sFrequentlyUsed)
+        {
+            auto e2d = emoji2descr.find(emoji.first);
+            if (e2d != emoji2descr.end() && !e2d->second->ShortCodes.empty())
+            {
+                const std::string shortcode(e2d->second->ShortCodes.front());
+                if (LLEmojiDictionary::searchInShortCode(begin, end, shortcode, mFilterPattern))
+                {
+                    emojis.emplace_back(emoji.first, shortcode, begin, end);
+                }
+            }
+        }
+        if (emojis.empty())
+            return;
+    }
+
+    cats.emplace(std::make_pair(FREQUENTLY_USED_CATEGORY, emojis));
+}
+
+void LLFloaterEmojiPicker::fillGroupEmojis(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats, U32 index)
+{
+    const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
+    const LLEmojiDictionary::cat2descrs_map_t& category2Descr = LLEmojiDictionary::instance().getCategory2Descrs();
+
+    for (const std::string& category : groups[index].Categories)
+    {
+        const LLEmojiDictionary::cat2descrs_map_t::const_iterator& c2d = category2Descr.find(category);
+        if (c2d == category2Descr.end())
+            continue;
+
+        std::vector<LLEmojiSearchResult> emojis;
+
+        // In case of empty mFilterPattern we'd use category2Descr directly
+        if (!mFilterPattern.empty())
+        {
+            // List all emojis in category
+            std::size_t begin, end;
+            for (const LLEmojiDescriptor* descr : c2d->second)
+            {
+                if (!descr->ShortCodes.empty())
+                {
+                    const std::string shortcode(descr->ShortCodes.front());
+                    if (LLEmojiDictionary::searchInShortCode(begin, end, shortcode, mFilterPattern))
+                    {
+                        emojis.emplace_back(descr->Character, shortcode, begin, end);
+                    }
+                }
+            }
+            if (emojis.empty())
+                continue;
+        }
+
+        cats.emplace(std::make_pair(category, emojis));
+    }
+}
+
+void LLFloaterEmojiPicker::createGroupButton(LLButton::Params& params, const LLRect& rect, llwchar emoji)
+{
+    LLButton* button = LLUICtrlFactory::create<LLButton>(params);
+    button->setClickedCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonClick(ctrl); });
+    button->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseEnter(ctrl); });
+    button->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseLeave(ctrl); });
+
+    button->setRect(rect);
+    button->setTabStop(FALSE);
+    button->setLabel(LLUIString(LLWString(1, emoji)));
+    button->setUseFontColor(FALSE);
+
+    mGroupButtons.push_back(button);
+    mGroups->addChild(button);
+}
+
+void LLFloaterEmojiPicker::resizeGroupButtons()
+{
+    U32 groupCount = (U32)mGroupButtons.size();
+    if (!groupCount)
         return;
 
-    mRecentBadgeWidth = badgeWidth;
+    S32 totalWidth = mGroups->getRect().getWidth();
+    S32 badgeWidth = totalWidth / groupCount;
+    S32 leftOffset = (totalWidth - badgeWidth * groupCount) / 2;
 
-    for (int i = 0; i < mGroupButtons.size(); ++i)
+    for (U32 i = 0; i < groupCount; ++i)
     {
         LLRect rect = mGroupButtons[i]->getRect();
-        rect.mLeft = badgeWidth * i;
+        rect.mLeft = leftOffset + badgeWidth * i;
         rect.mRight = rect.mLeft + badgeWidth;
         mGroupButtons[i]->setRect(rect);
     }
 
     LLRect rect = mBadge->getRect();
-    rect.mLeft = badgeWidth * sSelectedGroupIndex;
+    rect.mLeft = leftOffset + badgeWidth * mSelectedGroupIndex;
     rect.mRight = rect.mLeft + badgeWidth;
     mBadge->setRect(rect);
 }
 
-void LLFloaterEmojiPicker::showPreview(bool show)
+void LLFloaterEmojiPicker::selectEmojiGroup(U32 index)
 {
-    mPreview->setEmoji(nullptr);
-    mDummy->setVisible(show ? FALSE : TRUE);
-    mPreview->setVisible(show ? TRUE : FALSE);
+    if (index == mSelectedGroupIndex || index >= mGroupButtons.size())
+        return;
+
+    if (mSelectedGroupIndex < mGroupButtons.size())
+    {
+        mGroupButtons[mSelectedGroupIndex]->setUseFontColor(FALSE);
+        mGroupButtons[mSelectedGroupIndex]->setToggleState(FALSE);
+    }
+
+    mSelectedGroupIndex = index;
+    mGroupButtons[mSelectedGroupIndex]->setToggleState(TRUE);
+    mGroupButtons[mSelectedGroupIndex]->setUseFontColor(TRUE);
+
+    LLButton* button = mGroupButtons[mSelectedGroupIndex];
+    LLRect rect = mBadge->getRect();
+    rect.mLeft = button->getRect().mLeft;
+    rect.mRight = button->getRect().mRight;
+    mBadge->setRect(rect);
+
+    fillEmojis();
 }
 
 void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
 {
-    mRecentGridWidth = mEmojiScroll->getRect().getWidth();
-
-    S32 scrollbarSize = mEmojiScroll->getSize();
-    if (scrollbarSize < 0)
+    S32 scrollbar_size = mEmojiScroll->getSize();
+    if (scrollbar_size < 0)
     {
         static LLUICachedControl<S32> scrollbar_size_control("UIScrollbarSize", 0);
-        scrollbarSize = scrollbar_size_control;
+        scrollbar_size = scrollbar_size_control;
     }
 
-    const S32 clientWidth = mRecentGridWidth - scrollbarSize - mEmojiScroll->getBorderWidth() * 2;
-    const S32 gridPadding = mEmojiGrid->getPadding();
-    const S32 iconSpacing = mEmojiGrid->getSpacing();
-    const S32 rowWidth = clientWidth - gridPadding * 2;
-    const S32 iconSize = 28; // icon width and height
-    const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
+    const S32 scroll_width = mEmojiScroll->getRect().getWidth();
+    const S32 client_width = scroll_width - scrollbar_size - mEmojiScroll->getBorderWidth() * 2;
+    const S32 grid_padding = mEmojiGrid->getPadding();
+    const S32 icon_spacing = mEmojiGrid->getSpacing();
+    const S32 row_width = client_width - grid_padding * 2;
+    const S32 icon_size = 28; // icon width and height
+    const S32 max_icons = llmax(1, (row_width + icon_spacing) / (icon_size + icon_spacing));
 
     // Optimization: don't rearrange for different widths with the same maxIcons
-    if (fromResize && (maxIcons == mRecentMaxIcons))
+    if (fromResize && (max_icons == mRecentMaxIcons))
         return;
 
-    mRecentMaxIcons = maxIcons;
+    mRecentMaxIcons = max_icons;
 
     mFocusedIconRow = 0;
     mFocusedIconCol = 0;
     mFocusedIcon = nullptr;
     mHoveredIcon = nullptr;
+    mEmojiScroll->goToTop();
     mEmojiGrid->clearPanels();
-    mPreview->setEmoji(nullptr);
+    mPreview->setIcon(nullptr);
 
-    if (mEmojiGrid->getRect().getWidth() != clientWidth)
+    if (mEmojiGrid->getRect().getWidth() != client_width)
     {
         LLRect rect = mEmojiGrid->getRect();
-        rect.mRight = rect.mLeft + clientWidth;
+        rect.mRight = rect.mLeft + client_width;
         mEmojiGrid->setRect(rect);
     }
 
     LLPanel::Params row_panel_params;
-    row_panel_params.rect = LLRect(0, iconSize, rowWidth, 0);
+    row_panel_params.rect = LLRect(0, icon_size, row_width, 0);
 
     LLScrollingPanelList::Params row_list_params;
     row_list_params.rect = row_panel_params.rect;
     row_list_params.is_horizontal = TRUE;
     row_list_params.padding = 0;
-    row_list_params.spacing = iconSpacing;
+    row_list_params.spacing = icon_spacing;
 
     LLPanel::Params icon_params;
-    LLRect icon_rect(0, iconSize, iconSize, 0);
+    LLRect icon_rect(0, icon_size, icon_size, 0);
 
-    static LLColor4 defaultColor(0.75f, 0.75f, 0.75f, 1.0f);
-    LLColor4 bgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", defaultColor);
+    static LLColor4 default_color(0.75f, 0.75f, 0.75f, 1.0f);
+    LLColor4 bg_color = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", default_color);
 
-    auto matchesPattern = [](const LLEmojiDescriptor* descr) -> bool
+    if (!mSelectedGroupIndex)
     {
-        for (const std::string& shortCode : descr->ShortCodes)
-            if (shortCode.find(sFilterPattern) != std::string::npos)
-                return true;
-        return false;
-    };
-
-    auto listCategory = [&](std::string category, const std::vector<const LLEmojiDescriptor*>& emojis, int maxRows = 0)
+        // List all groups
+        for (const auto& group : mFilteredEmojis)
+        {
+            // List all categories in the group
+            for (const auto& category : group)
+            {
+                // List all emojis in the category
+                fillEmojisCategory(category.second, category.first, row_panel_params,
+                    row_list_params, icon_params, icon_rect, max_icons, bg_color);
+            }
+        }
+    }
+    else
     {
-        int rowCount = 0;
-        int iconIndex = 0;
-        bool showDivider = true;
-        bool mixedFolder = maxRows;
-        LLEmojiGridRow* row = nullptr;
-        if (!mixedFolder && !isupper(category.front()))
+        // List all categories in the selected group
+        const auto& group = mFilteredEmojis[mSelectedGroupIndex - 1];
+        for (const auto& category : group)
         {
-            LLStringUtil::capitalize(category);
+            // List all emojis in the category
+            fillEmojisCategory(category.second, category.first, row_panel_params,
+                row_list_params, icon_params, icon_rect, max_icons, bg_color);
         }
+    }
 
-        for (const LLEmojiDescriptor* descr : emojis)
+    if (mEmojiGrid->getPanelList().empty())
+    {
+        showPreview(false);
+        mFocusedIconRow = -1;
+        mFocusedIconCol = -1;
+        if (!mHint.empty())
         {
-            if (sFilterPattern.empty() || matchesPattern(descr))
-            {
-                // Place a category title if needed
-                if (showDivider)
-                {
-                    LLEmojiGridDivider* div = new LLEmojiGridDivider(row_panel_params, category);
-                    mEmojiGrid->addPanel(div, true);
-                    showDivider = false;
-                }
-
-                // Place a new row each (maxIcons) icons
-                if (!(iconIndex % maxIcons))
-                {
-                    if (maxRows && ++rowCount > maxRows)
-                        break;
-                    row = new LLEmojiGridRow(row_panel_params, row_list_params);
-                    mEmojiGrid->addPanel(row, true);
-                }
-
-                // Place a new icon to the current row
-                LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, descr, mixedFolder ? LLStringUtil::capitalize(descr->Category) : category);
-                icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
-                icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
-                icon->setMouseDownCallback([this](LLUICtrl* ctrl, S32, S32, MASK) { onEmojiMouseDown(ctrl); });
-                icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK) { onEmojiMouseUp(ctrl); });
-                icon->setBackgroundColor(bgColor);
-                icon->setBackgroundOpaque(1);
-                icon->setRect(icon_rect);
-                row->mList->addPanel(icon, true);
-
-                iconIndex++;
-            }
+            hideFloater();
         }
-    };
+    }
+    else
+    {
+        showPreview(true);
+        mFocusedIconRow = 0;
+        mFocusedIconCol = 0;
+        moveFocusedIconNext();
+    }
+}
 
-    const std::vector<LLEmojiGroup>& groups = LLEmojiDictionary::instance().getGroups();
-    const LLEmojiDictionary::emoji2descr_map_t& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
-    const LLEmojiDictionary::cat2descrs_map_t& category2Descr = LLEmojiDictionary::instance().getCategory2Descrs();
-    if (!sSelectedGroupIndex)
+void LLFloaterEmojiPicker::fillEmojisCategory(const std::vector<LLEmojiSearchResult>& emojis,
+    const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,
+    const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg)
+{
+    // Place the category title
+    std::string title =
+        category == RECENTLY_USED_CATEGORY ? getString("title_for_recently_used") :
+        category == FREQUENTLY_USED_CATEGORY ? getString("title_for_frequently_used") :
+        isupper(category.front()) ? category : LLStringUtil::capitalize(category);
+    LLEmojiGridDivider* div = new LLEmojiGridDivider(row_panel_params, title);
+    mEmojiGrid->addPanel(div, true);
+
+    int icon_index = 0;
+    LLEmojiGridRow* row = nullptr;
+
+    if (mFilterPattern.empty())
     {
-        std::vector<const LLEmojiDescriptor*> recentlyUsed;
-        for (llwchar emoji : sRecentlyUsed)
+        const LLEmojiDictionary::emoji2descr_map_t& emoji2descr = LLEmojiDictionary::instance().getEmoji2Descr();
+        LLEmojiSearchResult emoji { 0, "", 0, 0 };
+        if (category == RECENTLY_USED_CATEGORY)
         {
-            auto it = emoji2descr.find(emoji);
-            if (it != emoji2descr.end())
+            for (llwchar code : sRecentlyUsed)
             {
-                recentlyUsed.push_back(it->second);
+                const LLEmojiDictionary::emoji2descr_map_t::const_iterator& e2d = emoji2descr.find(code);
+                if (e2d != emoji2descr.end() && !e2d->second->ShortCodes.empty())
+                {
+                    emoji.Character = code;
+                    emoji.String = e2d->second->ShortCodes.front();
+                    createEmojiIcon(emoji, category, row_panel_params, row_list_params, icon_params,
+                        icon_rect, max_icons, bg, row, icon_index);
+                }
             }
         }
-        listCategory(getString("title_for_recently_used"), recentlyUsed, 1);
-
-        std::vector<const LLEmojiDescriptor*> frequentlyUsed;
-        for (auto& emoji : sFrequentlyUsed)
+        else if (category == FREQUENTLY_USED_CATEGORY)
         {
-            auto it = emoji2descr.find(emoji.first);
-            if (it != emoji2descr.end())
+            for (const auto& code : sFrequentlyUsed)
             {
-                frequentlyUsed.push_back(it->second);
+                const LLEmojiDictionary::emoji2descr_map_t::const_iterator& e2d = emoji2descr.find(code.first);
+                if (e2d != emoji2descr.end() && !e2d->second->ShortCodes.empty())
+                {
+                    emoji.Character = code.first;
+                    emoji.String = e2d->second->ShortCodes.front();
+                    createEmojiIcon(emoji, category, row_panel_params, row_list_params, icon_params,
+                        icon_rect, max_icons, bg, row, icon_index);
+                }
             }
         }
-        listCategory(getString("title_for_frequently_used"), frequentlyUsed, 1);
-
-        // List all groups
-        for (const LLEmojiGroup& group : groups)
+        else
         {
-            // List all categories in group
-            for (const std::string& category : group.Categories)
+            const LLEmojiDictionary::cat2descrs_map_t& category2Descr = LLEmojiDictionary::instance().getCategory2Descrs();
+            const LLEmojiDictionary::cat2descrs_map_t::const_iterator& c2d = category2Descr.find(category);
+            if (c2d != category2Descr.end())
             {
-                // List all emojis in category
-                const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
-                if (item != category2Descr.end())
+                for (const LLEmojiDescriptor* descr : c2d->second)
                 {
-                    listCategory(category, item->second);
+                    emoji.Character = descr->Character;
+                    emoji.String = descr->ShortCodes.front();
+                    createEmojiIcon(emoji, category, row_panel_params, row_list_params, icon_params,
+                        icon_rect, max_icons, bg, row, icon_index);
                 }
             }
         }
     }
     else
     {
-        // List all categories in the selected group
-        for (const std::string& category : groups[sSelectedGroupIndex].Categories)
+        for (const LLEmojiSearchResult& emoji : emojis)
         {
-            // List all emojis in category
-            const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
-            if (item != category2Descr.end())
-            {
-                listCategory(category, item->second);
-            }
+            createEmojiIcon(emoji, category, row_panel_params, row_list_params, icon_params,
+                icon_rect, max_icons, bg, row, icon_index);
         }
     }
 }
 
-void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
+void LLFloaterEmojiPicker::createEmojiIcon(const LLEmojiSearchResult& emoji,
+    const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,
+    const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg,
+    LLEmojiGridRow*& row, int& icon_index)
 {
-    if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
+    // Place a new row each (max_icons) icons
+    if (!(icon_index % max_icons))
     {
-        mFilter->setFocus(TRUE);
-
-        if (button == mGroupButtons[sSelectedGroupIndex] || button->getToggleState())
-            return;
-
-        auto it = std::find(mGroupButtons.begin(), mGroupButtons.end(), button);
-        if (it == mGroupButtons.end())
-            return;
-
-        mGroupButtons[sSelectedGroupIndex]->setUseFontColor(FALSE);
-        mGroupButtons[sSelectedGroupIndex]->setToggleState(FALSE);
-        sSelectedGroupIndex = it - mGroupButtons.begin();
-        mGroupButtons[sSelectedGroupIndex]->setToggleState(TRUE);
-        mGroupButtons[sSelectedGroupIndex]->setUseFontColor(TRUE);
-
-        LLRect rect = mBadge->getRect();
-        rect.mLeft = button->getRect().mLeft;
-        rect.mRight = button->getRect().mRight;
-        mBadge->setRect(rect);
-
-        fillEmojis();
+        row = new LLEmojiGridRow(row_panel_params, *(const LLScrollingPanelList::Params*)&row_list_params);
+        mEmojiGrid->addPanel(row, true);
     }
+
+    // Place a new icon to the current row
+    LLEmojiGridIcon* icon = new LLEmojiGridIcon(icon_params, emoji);
+    icon->setMouseEnterCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseEnter(ctrl); });
+    icon->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onEmojiMouseLeave(ctrl); });
+    icon->setMouseDownCallback([this](LLUICtrl* ctrl, S32, S32, MASK) { onEmojiMouseDown(ctrl); });
+    icon->setMouseUpCallback([this](LLUICtrl* ctrl, S32, S32, MASK) { onEmojiMouseUp(ctrl); });
+    icon->setBackgroundColor(bg);
+    icon->setBackgroundOpaque(1);
+    icon->setRect(icon_rect);
+    row->mList->addPanel(icon, true);
+
+    icon_index++;
 }
 
-void LLFloaterEmojiPicker::onFilterChanged()
+void LLFloaterEmojiPicker::showPreview(bool show)
 {
-    sFilterPattern = mFilter->getText();
-    fillEmojis();
+    //mPreview->setIcon(nullptr);
+    mDummy->setVisible(show ? FALSE : TRUE);
+    mPreview->setVisible(show ? TRUE : FALSE);
 }
 
-void LLFloaterEmojiPicker::onGridMouseEnter()
+void LLFloaterEmojiPicker::onGroupButtonClick(LLUICtrl* ctrl)
 {
-    LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
-    if (focus == mEmojiGrid)
+    if (LLButton* button = dynamic_cast<LLButton*>(ctrl))
     {
-        exitArrowMode();
-    }
-    showPreview(true);
-}
+        if (button == mGroupButtons[mSelectedGroupIndex] || button->getToggleState())
+            return;
 
-void LLFloaterEmojiPicker::onGridMouseLeave()
-{
-    showPreview(false);
+        auto it = std::find(mGroupButtons.begin(), mGroupButtons.end(), button);
+        if (it == mGroupButtons.end())
+            return;
+
+        selectEmojiGroup(it - mGroupButtons.begin());
+    }
 }
 
 void LLFloaterEmojiPicker::onGroupButtonMouseEnter(LLUICtrl* ctrl)
@@ -626,33 +869,40 @@ void LLFloaterEmojiPicker::onGroupButtonMouseLeave(LLUICtrl* ctrl)
 
 void LLFloaterEmojiPicker::onEmojiMouseEnter(LLUICtrl* ctrl)
 {
-    if (ctrl)
+    if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
     {
-        LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
-        if (focus == mEmojiGrid)
+        if (mFocusedIcon && mFocusedIcon != icon && mFocusedIcon->isBackgroundVisible())
         {
-            exitArrowMode();
-            showPreview(true);
+            unselectGridIcon(mFocusedIcon);
         }
 
-        if (mHoveredIcon && mHoveredIcon != ctrl)
+        if (mHoveredIcon && mHoveredIcon != icon)
         {
             unselectGridIcon(mHoveredIcon);
         }
 
-        selectGridIcon(ctrl);
+        selectGridIcon(icon);
 
-        mHoveredIcon = ctrl;
+        mHoveredIcon = icon;
     }
 }
 
 void LLFloaterEmojiPicker::onEmojiMouseLeave(LLUICtrl* ctrl)
 {
-    if (ctrl)
+    if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
     {
-        if (ctrl == mHoveredIcon)
+        if (icon == mHoveredIcon)
         {
-            unselectGridIcon(ctrl);
+            if (icon != mFocusedIcon)
+            {
+                unselectGridIcon(icon);
+            }
+            mHoveredIcon = nullptr;
+        }
+
+        if (!mHoveredIcon && mFocusedIcon && !mFocusedIcon->isBackgroundVisible())
+        {
+            selectGridIcon(mFocusedIcon);
         }
     }
 }
@@ -672,195 +922,176 @@ void LLFloaterEmojiPicker::onEmojiMouseUp(LLUICtrl* ctrl)
         make_ui_sound("UISndClickRelease");
     }
 
-    if (mEmojiPickCallback)
+    if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
     {
-        if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
-        {
-            if (mEmojiPickCallback)
-            {
-                mEmojiPickCallback(icon->getEmoji());
-            }
-        }
-    }
-}
+        LLSD value(wstring_to_utf8str(icon->getText()));
+        setValue(value);
 
-bool LLFloaterEmojiPicker::enterArrowMode()
-{
-    S32 rowCount = mEmojiGrid->getPanelList().size();
-    if (rowCount)
-    {
-        mFocusedIconRow = -1;
-        mFocusedIconCol = 0;
-        if (moveFocusedIconDown())
+        onCommit();
+
+        if (!mHint.empty() || !(gKeyboard->currentMask(TRUE) & MASK_SHIFT))
         {
-            showPreview(true);
-            mEmojiScroll->goToTop();
-            mEmojiGrid->setFocus(TRUE);
-            return true;
+            hideFloater();
         }
     }
-    return false;
 }
 
-void LLFloaterEmojiPicker::exitArrowMode()
+void LLFloaterEmojiPicker::selectFocusedIcon()
 {
-    if (mFocusedIcon)
+    if (mFocusedIcon && mFocusedIcon != mHoveredIcon)
     {
         unselectGridIcon(mFocusedIcon);
-        mFocusedIcon = nullptr;
     }
 
-    showPreview(false);
-    mEmojiScroll->goToTop();
-    mFocusedIconRow = mFocusedIconCol = 0;
-    mFilter->setFocus(TRUE);
+    // Both mFocusedIconRow and mFocusedIconCol should be already verified
+    LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(mEmojiGrid->getPanelList()[mFocusedIconRow]);
+    mFocusedIcon = row ? dynamic_cast<LLEmojiGridIcon*>(row->mList->getPanelList()[mFocusedIconCol]) : nullptr;
+
+    if (mFocusedIcon && !mHoveredIcon)
+    {
+        selectGridIcon(mFocusedIcon);
+    }
 }
 
-void LLFloaterEmojiPicker::selectFocusedIcon()
+bool LLFloaterEmojiPicker::moveFocusedIconPrev()
 {
     if (mHoveredIcon)
-    {
-        unselectGridIcon(mHoveredIcon);
-    }
+        return false;
 
-    if (mFocusedIcon)
+    if (mFocusedIconCol > 0)
     {
-        unselectGridIcon(mFocusedIcon);
+        mFocusedIconCol--;
+        selectFocusedIcon();
+        return true;
     }
 
-    // Both mFocusedIconRow and mFocusedIconCol should be already verified
-    LLEmojiGridRow* row = (LLEmojiGridRow*)mEmojiGrid->getPanelList()[mFocusedIconRow];
-    mFocusedIcon = row->mList->getPanelList()[mFocusedIconCol];
-    selectGridIcon(mFocusedIcon);
-}
-
-bool LLFloaterEmojiPicker::moveFocusedIconUp()
-{
     for (S32 i = mFocusedIconRow - 1; i >= 0; --i)
     {
         LLScrollingPanel* panel = mEmojiGrid->getPanelList()[i];
         LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
-        if (row && row->mList->getPanelList().size() > mFocusedIconCol)
+        if (row && row->mList->getPanelList().size())
         {
             mEmojiScroll->scrollToShowRect(row->getBoundingRect());
+            mFocusedIconCol = row->mList->getPanelList().size() - 1;
             mFocusedIconRow = i;
             selectFocusedIcon();
             return true;
         }
     }
+
     return false;
 }
 
-bool LLFloaterEmojiPicker::moveFocusedIconDown()
+bool LLFloaterEmojiPicker::moveFocusedIconNext()
 {
+    if (mHoveredIcon)
+        return false;
+
+    LLScrollingPanel* panel = mEmojiGrid->getPanelList()[mFocusedIconRow];
+    LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
+    S32 colCount = row ? row->mList->getPanelList().size() : 0;
+    if (mFocusedIconCol < colCount - 1)
+    {
+        mFocusedIconCol++;
+        selectFocusedIcon();
+        return true;
+    }
+
     S32 rowCount = mEmojiGrid->getPanelList().size();
     for (S32 i = mFocusedIconRow + 1; i < rowCount; ++i)
     {
         LLScrollingPanel* panel = mEmojiGrid->getPanelList()[i];
         LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
-        if (row && row->mList->getPanelList().size() > mFocusedIconCol)
+        if (row && row->mList->getPanelList().size())
         {
             mEmojiScroll->scrollToShowRect(row->getBoundingRect());
+            mFocusedIconCol = 0;
             mFocusedIconRow = i;
             selectFocusedIcon();
             return true;
         }
     }
+
     return false;
 }
 
-bool LLFloaterEmojiPicker::moveFocusedIconLeft()
+void LLFloaterEmojiPicker::selectGridIcon(LLEmojiGridIcon* icon)
 {
-    if (mFocusedIconCol <= 0)
-        return false;
-
-    mFocusedIconCol--;
-    selectFocusedIcon();
-    return true;
+    icon->setBackgroundVisible(TRUE);
+    mPreview->setIcon(icon);
 }
 
-bool LLFloaterEmojiPicker::moveFocusedIconRight()
+void LLFloaterEmojiPicker::unselectGridIcon(LLEmojiGridIcon* icon)
 {
-    LLEmojiGridRow* row = (LLEmojiGridRow*)mEmojiGrid->getPanelList()[mFocusedIconRow];
-    S32 colCount = row->mList->getPanelList().size();
-    if (mFocusedIconCol >= colCount - 1)
-        return false;
-
-    mFocusedIconCol++;
-    selectFocusedIcon();
-    return true;
+    icon->setBackgroundVisible(FALSE);
+    mPreview->setIcon(nullptr);
 }
 
-void LLFloaterEmojiPicker::selectGridIcon(LLUICtrl* ctrl)
+// virtual
+BOOL LLFloaterEmojiPicker::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-    if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+    if (mask == MASK_NONE)
     {
-        icon->setBackgroundVisible(TRUE);
-        mPreview->setEmoji(icon->getDescr());
+        switch (key)
+        {
+        case KEY_LEFT:
+            selectEmojiGroup((mSelectedGroupIndex + mFilteredEmojis.size()) % mGroupButtons.size());
+            return TRUE;
+        case KEY_RIGHT:
+            selectEmojiGroup((mSelectedGroupIndex + 1) % mGroupButtons.size());
+            return TRUE;
+        case KEY_UP:
+            moveFocusedIconPrev();
+            return TRUE;
+        case KEY_DOWN:
+            moveFocusedIconNext();
+            return TRUE;
+        case KEY_ESCAPE:
+            hideFloater();
+            return TRUE;
+        }
     }
-}
 
-void LLFloaterEmojiPicker::unselectGridIcon(LLUICtrl* ctrl)
-{
-    if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
+    if (key == KEY_RETURN)
     {
-        icon->setBackgroundVisible(FALSE);
-        mPreview->setEmoji(nullptr);
+        U64 time = totalTime();
+        // <Shift+Return> comes twice for unknown reason
+        if (mFocusedIcon && (time - mRecentReturnPressedMs > 100000)) // Min interval 0.1 sec.
+        {
+            onEmojiMouseDown(mFocusedIcon);
+            onEmojiMouseUp(mFocusedIcon);
+        }
+        mRecentReturnPressedMs = time;
+        return TRUE;
     }
-}
 
-// virtual
-BOOL LLFloaterEmojiPicker::handleKey(KEY key, MASK mask, BOOL called_from_parent)
-{
-    if (mask == MASK_NONE)
+    if (mHint.empty())
     {
-        LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
-        if (focus == mEmojiGrid)
+        if (key >= 0x20 && key < 0x80)
         {
-            if (key == KEY_RETURN)
+            if (!mEmojiGrid->getPanelList().empty())
             {
-                if (mFocusedIcon)
+                if (mFilterPattern.empty())
                 {
-                    onEmojiMouseDown(mFocusedIcon);
-                    onEmojiMouseUp(mFocusedIcon);
-                    closeFloater();
-                    return TRUE;
+                    mFilterPattern = ":";
                 }
+                mFilterPattern += (char)key;
+                initialize();
             }
-            else if (key == KEY_TAB)
-            {
-                exitArrowMode();
-                return TRUE;
-            }
-            else if (key == KEY_UP)
-            {
-                if (!moveFocusedIconUp())
-                    exitArrowMode();
-                return TRUE;
-            }
-            else if (key == KEY_DOWN)
-            {
-                if (moveFocusedIconDown())
-                    return TRUE;
-            }
-            else if (key == KEY_LEFT)
-            {
-                if (moveFocusedIconLeft())
-                    return TRUE;
-            }
-            else if (key == KEY_RIGHT)
-            {
-                if (moveFocusedIconRight())
-                    return TRUE;
-            }
+            return TRUE;
         }
-        else // if (focus != mEmojiGrid)
+        else if (key == KEY_BACKSPACE)
         {
-            if (key == KEY_DOWN)
+            if (!mFilterPattern.empty())
             {
-                if (enterArrowMode())
-                    return TRUE;
+                mFilterPattern.pop_back();
+                if (mFilterPattern == ":")
+                {
+                    mFilterPattern.clear();
+                }
+                initialize();
             }
+            return TRUE;
         }
     }
 
@@ -868,30 +1099,14 @@ BOOL LLFloaterEmojiPicker::handleKey(KEY key, MASK mask, BOOL called_from_parent
 }
 
 // virtual
-BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
+void LLFloaterEmojiPicker::goneFromFront()
 {
-    if (mask == MASK_NONE)
-    {
-        switch (key)
-        {
-        case KEY_ESCAPE:
-            closeFloater();
-            return TRUE;
-        }
-    }
-
-    return super::handleKeyHere(key, mask);
+    hideFloater();
 }
 
-// virtual
-void LLFloaterEmojiPicker::closeFloater(bool app_quitting)
+void LLFloaterEmojiPicker::hideFloater() const
 {
-    saveState();
-    super::closeFloater(app_quitting);
-    if (mFloaterCloseCallback)
-    {
-        mFloaterCloseCallback();
-    }
+    LLEmojiHelper::instance().hideHelper(nullptr, true);
 }
 
 // static
@@ -938,18 +1153,17 @@ void LLFloaterEmojiPicker::onEmojiUsed(llwchar emoji)
     }
     // Append new if not found
     if (itf == sFrequentlyUsed.end())
-        sFrequentlyUsed.push_back(std::make_pair(emoji, 1));
-}
-
-// static
-void LLFloaterEmojiPicker::onRecentlyUsedChanged()
-{
-    if (sSelectedGroupIndex)
-        return;
-
-    if (LLFloaterEmojiPicker* picker = getInstance())
     {
-        picker->fillEmojis();
+        // Insert before others with count == 1
+        while (itf != sFrequentlyUsed.begin())
+        {
+            auto prior = itf;
+            prior--;
+            if (prior->second > 1)
+                break;
+            itf = prior;
+        }
+        sFrequentlyUsed.insert(itf, std::make_pair(emoji, 1));
     }
 }
 
@@ -977,10 +1191,6 @@ void LLFloaterEmojiPicker::loadState()
         return;
     }
 
-    sSelectedGroupIndex = state[sKeySelectedGroupIndex].asInteger();
-
-    sFilterPattern = state[sKeyFilterPattern].asString();
-
     // Load and parse sRecentlyUsed
     std::string recentlyUsed = state[sKeyRecentlyUsed];
     std::vector<std::string> rtokens = LLStringUtil::getTokens(recentlyUsed, ",");
@@ -1028,7 +1238,7 @@ void LLFloaterEmojiPicker::loadState()
     // Normalize by minimum
     if (!sFrequentlyUsed.empty())
     {
-        U32 delta = sFrequentlyUsed.back().second;
+        U32 delta = sFrequentlyUsed.back().second - 1;
         for (auto& it : sFrequentlyUsed)
         {
             it.second = std::max((U32)0, it.second - delta);
@@ -1047,16 +1257,6 @@ void LLFloaterEmojiPicker::saveState()
 
     LLSD state = LLSD::emptyMap();
 
-    if (sSelectedGroupIndex)
-    {
-        state[sKeySelectedGroupIndex] = (int)sSelectedGroupIndex;
-    }
-
-    if (!sFilterPattern.empty())
-    {
-        state[sKeyFilterPattern] = sFilterPattern;
-    }
-
     if (!sRecentlyUsed.empty())
     {
         U32 maxCount = 20;
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 48f66d7950..f169d67a4e 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -29,7 +29,10 @@
 
 #include "llfloater.h"
 
+class LLEmojiGridRow;
+class LLEmojiGridIcon;
 struct LLEmojiDescriptor;
+struct LLEmojiSearchResult;
 
 class LLFloaterEmojiPicker : public LLFloater
 {
@@ -40,36 +43,40 @@ public:
     typedef boost::function<void (llwchar)> pick_callback_t;
     typedef boost::function<void ()> close_callback_t;
 
-    // Call this to select an emoji.
-    static LLFloaterEmojiPicker* getInstance();
-    static LLFloaterEmojiPicker* showInstance(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
-
     LLFloaterEmojiPicker(const LLSD& key);
-    virtual ~LLFloaterEmojiPicker();
 
     virtual	BOOL postBuild() override;
     virtual void dirtyRect() override;
+    virtual void goneFromFront() override;
 
-    void show(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr);
-
-    virtual void closeFloater(bool app_quitting = false) override;
+    void hideFloater() const;
 
     static std::list<llwchar>& getRecentlyUsed();
     static void onEmojiUsed(llwchar emoji);
-    static void onRecentlyUsedChanged();
+
     static void loadState();
     static void saveState();
 
 private:
+    void initialize();
     void fillGroups();
-    void moveGroups();
-    void showPreview(bool show);
+    void fillCategoryRecentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats);
+    void fillCategoryFrequentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats);
+    void fillGroupEmojis(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats, U32 index);
+    void createGroupButton(LLButton::Params& params, const LLRect& rect, llwchar emoji);
+    void resizeGroupButtons();
+    void selectEmojiGroup(U32 index);
     void fillEmojis(bool fromResize = false);
+    void fillEmojisCategory(const std::vector<LLEmojiSearchResult>& emojis,
+        const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,
+        const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg);
+    void createEmojiIcon(const LLEmojiSearchResult& emoji,
+        const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,
+        const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg,
+        LLEmojiGridRow*& row, int& icon_index);
+    void showPreview(bool show);
 
     void onGroupButtonClick(LLUICtrl* ctrl);
-    void onFilterChanged();
-    void onGridMouseEnter();
-    void onGridMouseLeave();
     void onGroupButtonMouseEnter(LLUICtrl* ctrl);
     void onGroupButtonMouseLeave(LLUICtrl* ctrl);
     void onEmojiMouseEnter(LLUICtrl* ctrl);
@@ -77,40 +84,37 @@ private:
     void onEmojiMouseDown(LLUICtrl* ctrl);
     void onEmojiMouseUp(LLUICtrl* ctrl);
 
-    bool enterArrowMode();
-    void exitArrowMode();
     void selectFocusedIcon();
-    bool moveFocusedIconUp();
-    bool moveFocusedIconDown();
-    bool moveFocusedIconLeft();
-    bool moveFocusedIconRight();
+    bool moveFocusedIconPrev();
+    bool moveFocusedIconNext();
 
-    void selectGridIcon(LLUICtrl* ctrl);
-    void unselectGridIcon(LLUICtrl* ctrl);
+    void selectGridIcon(LLEmojiGridIcon* icon);
+    void unselectGridIcon(LLEmojiGridIcon* icon);
 
+    void onOpen(const LLSD& key) override;
     virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
-    virtual BOOL handleKeyHere(KEY key, MASK mask) override;
 
     class LLPanel* mGroups { nullptr };
     class LLPanel* mBadge { nullptr };
-    class LLFilterEditor* mFilter { nullptr };
     class LLScrollContainer* mEmojiScroll { nullptr };
     class LLScrollingPanelList* mEmojiGrid { nullptr };
     class LLEmojiPreviewPanel* mPreview { nullptr };
     class LLTextBox* mDummy { nullptr };
 
-    pick_callback_t mEmojiPickCallback;
-    close_callback_t mFloaterCloseCallback;
-
+    std::vector<S32> mFilteredEmojiGroups;
+    std::vector<std::map<std::string, std::vector<LLEmojiSearchResult>>> mFilteredEmojis;
     std::vector<class LLButton*> mGroupButtons;
 
-    S32 mRecentBadgeWidth { 0 };
-    S32 mRecentGridWidth { 0 };
+    std::string mHint;
+    std::string mFilterPattern;
+    U32 mSelectedGroupIndex { 0 };
     S32 mRecentMaxIcons { 0 };
     S32 mFocusedIconRow { 0 };
     S32 mFocusedIconCol { 0 };
-    LLUICtrl* mFocusedIcon { nullptr };
-    LLUICtrl* mHoveredIcon { nullptr };
+    LLEmojiGridIcon* mFocusedIcon { nullptr };
+    LLEmojiGridIcon* mHoveredIcon { nullptr };
+
+    U64 mRecentReturnPressedMs { 0 };
 };
 
 #endif
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 35b2af7b84..1e0540c88a 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -259,7 +259,7 @@ BOOL LLFloaterIMSessionTab::postBuild()
 
 	mEmojiRecentPanelToggleBtn = getChild<LLButton>("emoji_recent_panel_toggle_btn");
 	mEmojiRecentPanelToggleBtn->setLabel(LLUIString(LLWString(1, 128512)));
-	mEmojiRecentPanelToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiRecentPanelToggleBtnClicked(this); });
+	mEmojiRecentPanelToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiRecentPanelToggleBtnClicked(); });
 
 	mEmojiRecentPanel = getChild<LLLayoutPanel>("emoji_recent_layout_panel");
 	mEmojiRecentPanel->setVisible(false);
@@ -272,8 +272,8 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mEmojiRecentIconsCtrl->setCommitCallback([this](LLUICtrl*, const LLSD& value) { onRecentEmojiPicked(value); });
 	mEmojiRecentIconsCtrl->setVisible(false);
 
-	mEmojiPickerToggleBtn = getChild<LLButton>("emoji_picker_toggle_btn");
-	mEmojiPickerToggleBtn->setClickedCallback([](LLUICtrl*, const LLSD&) { onEmojiPickerToggleBtnClicked(); });
+	mEmojiPickerShowBtn = getChild<LLButton>("emoji_picker_show_btn");
+	mEmojiPickerShowBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerShowBtnClicked(); });
 
 	mGearBtn = getChild<LLButton>("gear_btn");
 	mAddBtn = getChild<LLButton>("add_btn");
@@ -452,56 +452,30 @@ void LLFloaterIMSessionTab::onInputEditorClicked()
 	gToolBarView->flashCommand(LLCommandId("chat"), false);
 }
 
-void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self)
+void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked()
 {
-    bool show = !self->mEmojiRecentPanel->getVisible();
-    bool restore_focus = !show || (gFocusMgr.getLastKeyboardFocus() == self->mInputEditor);
-
+    BOOL show = mEmojiRecentPanel->getVisible() ? FALSE : TRUE;
     if (show)
     {
-        self->initEmojiRecentPanel(!restore_focus);
+        initEmojiRecentPanel();
     }
 
-    self->mEmojiRecentPanel->setVisible(show ? TRUE : FALSE);
-
-    if (restore_focus)
-    {
-        self->mInputEditor->setFocus(true);
-    }
+    mEmojiRecentPanel->setVisible(show);
+    mInputEditor->setFocus(TRUE);
 }
 
-void LLFloaterIMSessionTab::onEmojiPickerToggleBtnClicked()
+void LLFloaterIMSessionTab::onEmojiPickerShowBtnClicked()
 {
-	if (LLFloaterEmojiPicker* picker = LLFloaterEmojiPicker::getInstance())
-	{
-		if (!picker->isShown())
-		{
-			picker->show(
-				[](llwchar emoji) { onEmojiPicked(emoji); },
-				[]() { onEmojiPickerClosed(); });
-			if (LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance())
-			{
-				im_box->addDependentFloater(picker, TRUE, TRUE);
-			}
-		}
-		else
-		{
-			picker->closeFloater();
-		}
-	}
+    mInputEditor->showEmojiHelper();
 }
 
-void LLFloaterIMSessionTab::initEmojiRecentPanel(bool moveFocus)
+void LLFloaterIMSessionTab::initEmojiRecentPanel()
 {
     std::list<llwchar>& recentlyUsed = LLFloaterEmojiPicker::getRecentlyUsed();
     if (recentlyUsed.empty())
     {
         mEmojiRecentEmptyText->setVisible(TRUE);
         mEmojiRecentIconsCtrl->setVisible(FALSE);
-        if (moveFocus)
-        {
-            mEmojiPickerToggleBtn->setFocus(TRUE);
-        }
     }
     else
     {
@@ -513,10 +487,6 @@ void LLFloaterIMSessionTab::initEmojiRecentPanel(bool moveFocus)
         mEmojiRecentIconsCtrl->setEmojis(emojis);
         mEmojiRecentEmptyText->setVisible(FALSE);
         mEmojiRecentIconsCtrl->setVisible(TRUE);
-        if (moveFocus)
-        {
-            mEmojiRecentIconsCtrl->setFocus(TRUE);
-        }
     }
 }
 
@@ -534,31 +504,6 @@ void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
 	}
 }
 
-// static
-void LLFloaterIMSessionTab::onEmojiPicked(llwchar emoji)
-{
-    if (LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance())
-    {
-        if (LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(im_box->getSelectedSession()))
-        {
-            session_floater->mInputEditor->insertEmoji(emoji);
-            session_floater->mInputEditor->setFocus(TRUE);
-        }
-    }
-}
-
-// static
-void LLFloaterIMSessionTab::onEmojiPickerClosed()
-{
-    if (LLFloaterIMContainer* im_box = LLFloaterIMContainer::findInstance())
-    {
-        if (LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(im_box->getSelectedSession()))
-        {
-            session_floater->mInputEditor->setFocus(TRUE);
-        }
-    }
-}
-
 void LLFloaterIMSessionTab::closeFloater(bool app_quitting)
 {
 	LLFloaterEmojiPicker::saveState();
@@ -624,11 +569,11 @@ void LLFloaterIMSessionTab::updateUsedEmojis(LLWString text)
     if (!emojiSent)
         return;
 
-    LLFloaterEmojiPicker::onRecentlyUsedChanged();
+    LLFloaterEmojiPicker::saveState();
 
     if (mEmojiRecentPanel->getVisible())
     {
-        initEmojiRecentPanel(false);
+        initEmojiRecentPanel();
     }
 }
 
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index ddffed57a3..cc985b2753 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -189,7 +189,7 @@ protected:
 	LLButton* mExpandCollapseBtn;
 	LLButton* mTearOffBtn;
 	LLButton* mEmojiRecentPanelToggleBtn;
-	LLButton* mEmojiPickerToggleBtn;
+	LLButton* mEmojiPickerShowBtn;
 	LLButton* mCloseBtn;
 	LLButton* mGearBtn;
 	LLButton* mAddBtn;
@@ -215,12 +215,10 @@ private:
 
 	void onInputEditorClicked();
 
-	static void onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self);
-	static void onEmojiPickerToggleBtnClicked();
-	void initEmojiRecentPanel(bool moveFocus);
+	void onEmojiRecentPanelToggleBtnClicked();
+	void onEmojiPickerShowBtnClicked();
+	void initEmojiRecentPanel();
 	void onRecentEmojiPicked(const LLSD& value);
-	static void onEmojiPicked(llwchar emoji);
-	static void onEmojiPickerClosed();
 
 	bool checkIfTornOff();
 	bool mIsHostAttached;
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index a89d97d8e9..d21f8c82bc 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -3,33 +3,26 @@
     name="emojipicker"
     title="CHOOSE EMOJI"
     help_topic="emojipicker"
-    positioning="cascading"
-    legacy_header_height="0"
+    single_instance="true"
+    can_minimize="false"
+    can_tear_off="false"
     can_resize="true"
+    auto_close="true"
     layout="topleft"
     min_width="250"
-    height="400"
-    width="250">
+    chrome="true"
+    height="350"
+    width="304">
   <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
-  <filter_editor
-      name="Filter"
-      label="Start typing to filter"
-      layout="topleft"
-      follows="top|left|right"
-      top="27"
-      left="10"
-      height="23"
-      width="230" />
   <scroll_container
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
       ignore_arrow_keys="true"
-      top="50"
+      top="25"
       left="0"
-      height="300"
-      width="250">
+      height="275">
     <scrolling_panel_list
         name="EmojiGrid"
         layout="topleft"
@@ -37,8 +30,7 @@
         padding="4"
         spacing="0"
         top="0"
-        left="0"
-        width="250"/>
+        left="0"/>
   </scroll_container>
   <panel
       name="Groups"
@@ -46,8 +38,7 @@
       follows="top|left|right"
       top="0"
       left="0"
-      height="25"
-      width="250">
+      height="25">
     <panel
       name="Badge"
       layout="bottomleft"
@@ -70,6 +61,5 @@
       valign="center"
       bottom="14"
       left="10"
-      height="23"
-      width="230">No emoji selected</text>
+      height="25">No emoji selected</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index eb5d88bba6..94400f6501 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -306,6 +306,7 @@
                          follows="right|bottom"
                          use_font_color="true"
                          font="EmojiLarge"
+                         tab_stop="false"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
@@ -353,17 +354,19 @@
                  name="emoji_recent_icons_ctrl"
                  follows="top|left|right"
                  layout="topleft"
+                 tab_stop="false"
                  max_visible="20"
                  top="0"
                  left="1"
                  right="-65"
                  height="30"/>
                 <button
-                 name="emoji_picker_toggle_btn"
+                 name="emoji_picker_show_btn"
                  label="More"
                  tool_tip="Shows/hides emoji picker"
                  follows="right|bottom"
                  layout="topleft"
+                 tab_stop="false"
                  bottom="-5"
                  right="-3"
                  height="20"
-- 
cgit v1.2.3


From 79f5231db23dfa22d8981940864d1f3a450e3e02 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Tue, 23 Jan 2024 15:45:33 -0600
Subject: Create test plan for optimizeAwayAlpha (#663)

---
 doc/testplans/optimize_away_alpha.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/testplans/optimize_away_alpha.md

diff --git a/doc/testplans/optimize_away_alpha.md b/doc/testplans/optimize_away_alpha.md
new file mode 100644
index 0000000000..f0c8d1e8d6
--- /dev/null
+++ b/doc/testplans/optimize_away_alpha.md
@@ -0,0 +1,5 @@
+Textures imported via Build->Upload->Material that have an all opaque (255) alpha channel should have their alpha channel removed before upload.
+
+1. Make 4 images that have different colors but all 255 alpha channels
+2. Upload them all using Build->Upload->Material, with one in each of the material texture slots
+3. Verify that using the textures as a blinn-phong diffuse map does not make the corresponding face render in the alpha pass (face should stay visible after disabling alpha pass by unchecking Advanced->Render Types->Alpha).
-- 
cgit v1.2.3


From fea01389c94002ffce639cab164280b3e558147c Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 23 Jan 2024 23:13:00 +0100
Subject: SL-20416 Fix Crash Report 1409376

---
 indra/llui/llfloater.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 31019f6c33..fb90cebd39 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2572,7 +2572,7 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 		return;
 	}
 
-	if (mFrontChild && !mFrontChild->isDead())
+	if (mFrontChild && !mFrontChild->isDead() && mFrontChild->getVisible())
 	{
 		mFrontChild->goneFromFront();
 	}
-- 
cgit v1.2.3


From dd09848d4b99a38f74485a75b333725e4956a640 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 19 Jan 2024 00:24:25 +0200
Subject: Fix profile's pick hiding wrong panel

And cleanup after a contribution
---
 indra/newview/skins/default/xui/en/floater_about_land.xml    |  2 +-
 indra/newview/skins/default/xui/en/floater_beacons.xml       |  2 +-
 .../skins/default/xui/en/floater_scene_load_stats.xml        |  2 +-
 .../skins/default/xui/en/floater_translation_settings.xml    |  4 ++--
 indra/newview/skins/default/xui/en/floater_world_map.xml     |  4 ++--
 indra/newview/skins/default/xui/en/mime_types.xml            |  2 +-
 indra/newview/skins/default/xui/en/notifications.xml         |  8 --------
 .../skins/default/xui/en/panel_performance_preferences.xml   |  4 ++--
 .../skins/default/xui/en/panel_preferences_advanced.xml      |  2 +-
 .../newview/skins/default/xui/en/panel_preferences_sound.xml | 12 ++++++------
 indra/newview/skins/default/xui/en/panel_profile_pick.xml    |  6 +++---
 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml | 12 ++++++------
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml   |  2 +-
 13 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 8641c43d66..508aba6ae1 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -290,7 +290,7 @@
      image_pressed="Info_Press"
      image_unselected="Info_Over"
      left_pad="3"
-     name="info_btn1"
+     name="info_btn"
      top_delta="-2"
      width="16" />
             <button
diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
index bfe1f7fc3a..6248829500 100644
--- a/indra/newview/skins/default/xui/en/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
@@ -157,7 +157,7 @@
          font="SansSerif"
          left="0"
          top_pad="7"
-         name="label_objects1"
+         name="label_direction"
          text_color="White"
          type="string">
            Show direction to:
diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index be43283a52..a73af968af 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -119,7 +119,7 @@
                     tick_spacing="100"
                     show_history="true"
                     show_bar="false"/>
-          <stat_bar name="texture_decode_latency1"
+          <stat_bar name="texture_write_latency"
                     label="Cache Write Latency"
                     orientation="horizontal"
                     unit_label="sec"
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index ab1a241025..22dbd80cda 100644
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
@@ -161,7 +161,7 @@
    layout="topleft"
    left="185"
    length="1"
-   name="google_links_text"
+   name="azure_links_text"
    top_pad="-262"
    type="string"
    width="100">
@@ -302,7 +302,7 @@
   layout="topleft"
   left="185"
   length="1"
-  name="google_links_text1"
+  name="google_links_text"
   top_delta="-23"
   type="string"
   width="100">
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index d13ab35d6d..7efa81d263 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -241,7 +241,7 @@
      image_name="legend.tga"
      layout="topleft"
      mouse_opaque="true"
-     name="square2"
+     name="square2_auction"
      left="20"
      top_pad="2"
      width="16" />
@@ -264,7 +264,7 @@
      image_name="legend.tga"
      layout="topleft"
      mouse_opaque="true"
-     name="square21"
+     name="square2_owner"
      left="20"
      top_pad="-5"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index 0f06b239b5..238c7d380b 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -496,7 +496,7 @@
             media_plugin_libvlc
         </impl>
     </mimetype>
-  <mimetype name="application/octet-stream1">
+  <mimetype name="application/octet-stream">
     <label name="video/octet-stream">
       Movie
     </label>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1703e17060..3ca284b0fa 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6473,14 +6473,6 @@ Your inventory is experiencing issues. Please, contact support.
   <tag>fail</tag>
   </notification>
 
-  <notification
-   icon="notifytip.tga"
-   name="InventoryLimitReachedAIS1"
-   type="notifytip">
-Your inventory is experiencing issues. Please, contact support.
-  <tag>fail</tag>
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="ConfirmClearBrowserCache"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index 5dc84fd83f..7ba7b1d579 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -156,7 +156,7 @@
    layout="topleft"
    left_pad="10"
    top_delta="1"
-   name="quality_lbl1"
+   name="best_quality_lbl"
    width="70">
     Best quality
   </text>
@@ -416,7 +416,7 @@
    layout="topleft"
    top_delta="3"
    left_pad="10"
-   name="photo_desc1"
+   name="photo_dist_det_desc"
    width="180">
       (Enter value between 0.0 and 4.0)
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index bcf79b083f..8051ffa8ec 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -166,7 +166,7 @@
    left_pad="0"
    max_val="2.0"
    min_val="1.0"
-   name="ui_scale_slider1"
+   name="hud_scale_slider"
    top_pad="-14"
    width="250" />
     <check_box
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index c2b2404a95..7eaaaee536 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -107,7 +107,7 @@
 		is_toggle="true"
 		layout="topleft"
 		left_pad="5"
-		name="mute_audio1"
+		name="mute_audio_ui"
 		tab_stop="false"
 		width="16" />
     <slider
@@ -141,7 +141,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio2"
+     name="mute_audio_ambient"
      tab_stop="false"
      width="16" />
     <slider
@@ -175,7 +175,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio3"
+     name="mute_audio_sounds"
      tab_stop="false"
      width="16">
       <button.commit_callback
@@ -212,7 +212,7 @@
      is_toggle="true"
      layout="topleft"
 	   left_pad="5"
-     name="mute_audio4"
+     name="mute_audio_music"
      tab_stop="false"
 	 width="16" />
 	<check_box
@@ -258,7 +258,7 @@
 		is_toggle="true"
 		layout="topleft"
 		left_pad="5"
-		name="mute_audio5"
+		name="mute_audio_media"
 		tab_stop="false"
 		width="16" />
 	<check_box
@@ -306,7 +306,7 @@
 		is_toggle="true"
 		layout="topleft"
 		left_pad="5"
-		name="mute_audio6"
+		name="mute_audio_voice"
 		tab_stop="false"
 		width="16" />
 	<check_box
diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index 7a30a82ed6..024120931f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -138,11 +138,11 @@
     <layout_panel
      follows="all"
      layout="bottomleft"
-     name="save_changes_lp"
+     name="util_buttons_lp"
      auto_resize="false"
      height="25">
       <layout_stack
-       name="save_changes_stack"
+       name="util_buttons_stack"
        left="1"
        right="-1"
        top="0"
@@ -212,7 +212,7 @@
     <layout_panel
      follows="all"
      layout="bottomleft"
-     name="save_changes_lp1"
+     name="save_changes_lp"
      auto_resize="false"
      height="41">
       <view_border
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 5f4562e02d..75e76f599b 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -74,7 +74,7 @@
         is_toggle="true"
         layout="topleft"
         left_pad="5"
-        name="mute_audio1"
+        name="mute_audio_ui"
         tab_stop="false"
         width="16" />
     <slider
@@ -107,7 +107,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio2"
+     name="mute_audio_ambient"
      tab_stop="false"
      width="16" />
     <slider
@@ -140,7 +140,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio3"
+     name="mute_audio_sounds"
      tab_stop="false"
      width="16">
       <button.commit_callback
@@ -186,7 +186,7 @@
      is_toggle="true"
      layout="topleft"
      left_pad="5"
-     name="mute_audio4"
+     name="mute_audio_music"
      tab_stop="false"
      width="16" />
     <check_box
@@ -232,7 +232,7 @@
         is_toggle="true"
         layout="topleft"
         left_pad="5"
-        name="mute_audio5"
+        name="mute_audio_media"
         tab_stop="false"
         width="16" />
     <check_box
@@ -280,7 +280,7 @@
         is_toggle="true"
         layout="topleft"
         left_pad="5"
-        name="mute_audio6"
+        name="mute_audio_voice"
         tab_stop="false"
         width="16" />
     <check_box
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index d5261126cf..bdb4b545c1 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -288,7 +288,7 @@ TestString PleaseIgnore
         height="15"
         follows="left|top"
         layout="topleft"
-        name="perm_modify1"
+        name="you_perm_modify"
         width="200">
         You can:
       </text>
-- 
cgit v1.2.3


From 869712e273caa0a655f7b6a1f189a8bc6399f51d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 17 Jan 2024 20:06:56 +0200
Subject: SL-20669 Move constants out of settings.xml

UIImgInvisibleUUID doesn't exist
Default normal for material is 'null'
---
 indra/llcommon/indra_constants.cpp           |  6 +++
 indra/llcommon/indra_constants.h             |  5 +++
 indra/newview/app_settings/settings.xml      | 55 ----------------------------
 indra/newview/llfloaterenvironmentadjust.cpp |  2 +-
 indra/newview/llmaterialeditor.cpp           |  4 +-
 indra/newview/llpaneleditwater.cpp           |  2 +-
 indra/newview/llpanelface.cpp                | 10 ++---
 indra/newview/lltexturectrl.cpp              | 11 +++---
 8 files changed, 25 insertions(+), 70 deletions(-)

diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp
index 1b48e4daf3..473b3ebdc9 100644
--- a/indra/llcommon/indra_constants.cpp
+++ b/indra/llcommon/indra_constants.cpp
@@ -50,6 +50,7 @@ const LLUUID IMG_FIRE			("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver
 const LLUUID IMG_FACE_SELECT    ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector
 const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver
 const LLUUID IMG_INVISIBLE		("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver
+const LLUUID IMG_WHITE          ("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver
 
 const LLUUID IMG_EXPLOSION				("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver
 const LLUUID IMG_EXPLOSION_2			("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver
@@ -71,6 +72,11 @@ const LLUUID TERRAIN_ROCK_DETAIL		("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // V
 
 const LLUUID DEFAULT_WATER_NORMAL		("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
 
+const LLUUID DEFAULT_OBJECT_TEXTURE     ("89556747-24cb-43ed-920b-47caed15465f"); // On dataserver
+const LLUUID DEFAULT_OBJECT_SPECULAR    ("87e0e8f7-8729-1ea8-cfc9-8915773009db"); // On dataserver
+const LLUUID DEFAULT_OBJECT_NORMAL      ("85f28839-7a1c-b4e3-d71d-967792970a7b"); // On dataserver
+const LLUUID BLANK_OBJECT_NORMAL        ("5b53359e-59dd-d8a2-04c3-9e65134da47a"); // VIEWER (has a verion on dataserver, but with compression artifacts)
+
 const LLUUID IMG_USE_BAKED_HEAD  ("5a9f4a74-30f2-821c-b88d-70499d3e7183");
 const LLUUID IMG_USE_BAKED_UPPER ("ae2de45c-d252-50b8-5c6e-19f39ce79317");
 const LLUUID IMG_USE_BAKED_LOWER ("24daea5f-0539-cfcf-047f-fbc40b2786ba");
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index 679f79039b..a16cfac2b9 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -197,6 +197,7 @@ LL_COMMON_API extern const LLUUID IMG_FIRE;
 LL_COMMON_API extern const LLUUID IMG_FACE_SELECT;
 LL_COMMON_API extern const LLUUID IMG_DEFAULT_AVATAR;
 LL_COMMON_API extern const LLUUID IMG_INVISIBLE;
+LL_COMMON_API extern const LLUUID IMG_WHITE;
 
 LL_COMMON_API extern const LLUUID IMG_EXPLOSION;
 LL_COMMON_API extern const LLUUID IMG_EXPLOSION_2;
@@ -230,6 +231,10 @@ LL_COMMON_API extern const LLUUID IMG_USE_BAKED_AUX3;
 
 LL_COMMON_API extern const LLUUID DEFAULT_WATER_NORMAL;
 
+LL_COMMON_API extern const LLUUID DEFAULT_OBJECT_TEXTURE;
+LL_COMMON_API extern const LLUUID DEFAULT_OBJECT_SPECULAR;
+LL_COMMON_API extern const LLUUID DEFAULT_OBJECT_NORMAL;
+LL_COMMON_API extern const LLUUID BLANK_OBJECT_NORMAL;
 
 // radius within which a chat message is fully audible
 const F32 CHAT_NORMAL_RADIUS = 20.f;
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 77ca52a7f7..3d43a20c21 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3244,17 +3244,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-  <key>DefaultBlankNormalTexture</key>
-  <map>
-    <key>Comment</key>
-    <string>Texture used as 'Blank' in texture picker for normal maps. (UUID texture reference)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>String</string>
-    <key>Value</key>
-    <string>5b53359e-59dd-d8a2-04c3-9e65134da47a</string>
-  </map>
 	<key>DefaultFemaleAvatar</key>
 	<map>
 	  <key>Comment</key>
@@ -3288,39 +3277,6 @@
 	  <key>Value</key>
 	  <string>Male Shape &amp; Outfit</string>
 	</map>
-  <key>DefaultObjectNormalTexture</key>
-  <map>
-    <key>Comment</key>
-    <string>Texture used as 'Default' in texture picker for normal map. (UUID texture reference)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>String</string>
-    <key>Value</key>
-    <string>85f28839-7a1c-b4e3-d71d-967792970a7b</string>
-  </map>
-  <key>DefaultObjectSpecularTexture</key>
-  <map>
-    <key>Comment</key>
-    <string>Texture used as 'Default' in texture picker for specular map. (UUID texture reference)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>String</string>
-    <key>Value</key>
-    <string>87e0e8f7-8729-1ea8-cfc9-8915773009db</string>
-  </map>
-  <key>DefaultObjectTexture</key>
-    <map>
-      <key>Comment</key>
-      <string>Texture used as 'Default' in texture picker. (UUID texture reference)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>89556747-24cb-43ed-920b-47caed15465f</string>
-    </map>
     <key>DefaultUploadCost</key>
     <map>
       <key>Comment</key>
@@ -13620,17 +13576,6 @@
       <key>Value</key>
       <string>F3E07BC8-A973-476D-8C7F-F3B7293975D1</string>
     </map>
-    <key>UIImgWhiteUUID</key>
-    <map>
-      <key>Comment</key>
-      <string />
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
-    </map>
     <key>UILineEditorCursorThickness</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaterenvironmentadjust.cpp b/indra/newview/llfloaterenvironmentadjust.cpp
index c64ee5a69c..c98afefa65 100644
--- a/indra/newview/llfloaterenvironmentadjust.cpp
+++ b/indra/newview/llfloaterenvironmentadjust.cpp
@@ -116,7 +116,7 @@ BOOL LLFloaterEnvironmentAdjust::postBuild()
     getChild<LLTextureCtrl>(FIELD_SKY_CLOUD_MAP)->setAllowNoTexture(TRUE);
 
     getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setDefaultImageAssetID(LLSettingsWater::GetDefaultWaterNormalAssetId());
-    getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setBlankImageAssetID(LLUUID(gSavedSettings.getString("DefaultBlankNormalTexture")));
+    getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setBlankImageAssetID(BLANK_OBJECT_NORMAL);
     getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onWaterMapChanged(); });
 
     getChild<LLUICtrl>(FIELD_REFLECTION_PROBE_AMBIANCE)->setCommitCallback([this](LLUICtrl*, const LLSD&) { onReflectionProbeAmbianceChanged(); });
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 34f2f77d25..b7828db3a9 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -449,9 +449,7 @@ BOOL LLMaterialEditor::postBuild()
     mEmissiveTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_EMISIVE_TEX_DIRTY));
     mNormalTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitTexture, this, _1, _2, MATERIAL_NORMAL_TEX_DIRTY));
 
-    // should match normal textures from mBumpyTextureCtrl
-    mNormalTextureCtrl->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("DefaultObjectNormalTexture")));
-    mNormalTextureCtrl->setBlankImageAssetID(LLUUID(gSavedSettings.getString("DefaultBlankNormalTexture")));
+    mNormalTextureCtrl->setBlankImageAssetID(BLANK_OBJECT_NORMAL);
 
     if (mIsOverride)
     {
diff --git a/indra/newview/llpaneleditwater.cpp b/indra/newview/llpaneleditwater.cpp
index a09964e17d..cf536dd87e 100644
--- a/indra/newview/llpaneleditwater.cpp
+++ b/indra/newview/llpaneleditwater.cpp
@@ -89,7 +89,7 @@ BOOL LLPanelSettingsWaterMainTab::postBuild()
     getChild<LLUICtrl>(FIELD_WATER_UNDERWATER_MOD)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogUnderWaterChanged(); });
 
     mTxtNormalMap->setDefaultImageAssetID(LLSettingsWater::GetDefaultWaterNormalAssetId());
-    mTxtNormalMap->setBlankImageAssetID(LLUUID( gSavedSettings.getString( "DefaultBlankNormalTexture" )));
+    mTxtNormalMap->setBlankImageAssetID(BLANK_OBJECT_NORMAL);
     mTxtNormalMap->setCommitCallback([this](LLUICtrl *, const LLSD &) { onNormalMapChanged(); });
 
     getChild<LLUICtrl>(FIELD_WATER_WAVE2_XY)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onSmallWaveChanged(); });
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 269ae23eb8..7979261bae 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -353,7 +353,7 @@ BOOL	LLPanelFace::postBuild()
 	mShinyTextureCtrl = getChild<LLTextureCtrl>("shinytexture control");
 	if(mShinyTextureCtrl)
 	{
-		mShinyTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectSpecularTexture" )));
+		mShinyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_SPECULAR);
 		mShinyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitSpecularTexture, this, _2) );
 		mShinyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelSpecularTexture, this, _2) );
 		mShinyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectSpecularTexture, this, _2) );
@@ -370,8 +370,8 @@ BOOL	LLPanelFace::postBuild()
 	mBumpyTextureCtrl = getChild<LLTextureCtrl>("bumpytexture control");
 	if(mBumpyTextureCtrl)
 	{
-		mBumpyTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectNormalTexture" )));
-		mBumpyTextureCtrl->setBlankImageAssetID(LLUUID( gSavedSettings.getString( "DefaultBlankNormalTexture" )));
+		mBumpyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_NORMAL);
+		mBumpyTextureCtrl->setBlankImageAssetID(BLANK_OBJECT_NORMAL);
 		mBumpyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitNormalTexture, this, _2) );
 		mBumpyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelNormalTexture, this, _2) );
 		mBumpyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectNormalTexture, this, _2) );
@@ -4413,7 +4413,7 @@ void LLPanelFace::onCopyTexture()
                         LLUUID id = mat_data["NormMap"].asUUID();
                         if (id.notNull() && !get_can_copy_texture(id))
                         {
-                            mat_data["NormMap"] = LLUUID(gSavedSettings.getString("DefaultObjectTexture"));
+                            mat_data["NormMap"] = DEFAULT_OBJECT_TEXTURE;
                             mat_data["NormMapNoCopy"] = true;
                         }
 
@@ -4423,7 +4423,7 @@ void LLPanelFace::onCopyTexture()
                         LLUUID id = mat_data["SpecMap"].asUUID();
                         if (id.notNull() && !get_can_copy_texture(id))
                         {
-                            mat_data["SpecMap"] = LLUUID(gSavedSettings.getString("DefaultObjectTexture"));
+                            mat_data["SpecMap"] = DEFAULT_OBJECT_TEXTURE;
                             mat_data["SpecMapNoCopy"] = true;
                         }
 
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 233b864fba..62d3fa28bf 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -82,9 +82,11 @@
 //static
 bool get_is_predefined_texture(LLUUID asset_id)
 {
-    if (asset_id == LLUUID(gSavedSettings.getString("DefaultObjectTexture"))
-        || asset_id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID"))
-        || asset_id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID"))
+    if (asset_id == DEFAULT_OBJECT_TEXTURE
+        || asset_id == DEFAULT_OBJECT_SPECULAR
+        || asset_id == DEFAULT_OBJECT_NORMAL
+        || asset_id == BLANK_OBJECT_NORMAL
+        || asset_id == IMG_WHITE
         || asset_id == LLUUID(SCULPT_DEFAULT_TEXTURE))
     {
         return true;
@@ -1646,8 +1648,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
 
 	// Default of defaults is white image for diff tex
 	//
-	LLUUID whiteImage( gSavedSettings.getString( "UIImgWhiteUUID" ) );
-	setBlankImageAssetID( whiteImage );
+	setBlankImageAssetID(IMG_WHITE);
 
 	setAllowNoTexture(p.allow_no_texture);
 	setCanApplyImmediately(p.can_apply_immediately);
-- 
cgit v1.2.3


From ea4dc1f35d9515cc8e130e4246eb08f7558c421b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 17 Jan 2024 20:08:14 +0200
Subject: SL-20669 Force blank normal id into a local blank normal texture

Dataserver's version has compression artifacts
---
 indra/newview/llviewertexturelist.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 9a6d40ab0a..ebf03ae988 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -121,8 +121,17 @@ void LLViewerTextureList::doPreloadImages()
 	LLTexUnit::sWhiteTexture = LLViewerFetchedTexture::sWhiteImagep->getTexName();
 	LLUIImageList* image_list = LLUIImageList::getInstance();
 
-	// Set the default flat normal map
-	LLViewerFetchedTexture::sFlatNormalImagep = LLViewerTextureManager::getFetchedTextureFromFile("flatnormal.tga", FTT_LOCAL_FILE, MIPMAP_NO, LLViewerFetchedTexture::BOOST_BUMP);
+    // Set the default flat normal map
+    // BLANK_OBJECT_NORMAL has a version on dataserver, but it has compression artifacts
+    LLViewerFetchedTexture::sFlatNormalImagep =
+        LLViewerTextureManager::getFetchedTextureFromFile("flatnormal.tga",
+                                                          FTT_LOCAL_FILE,
+                                                          MIPMAP_NO,
+                                                          LLViewerFetchedTexture::BOOST_BUMP,
+                                                          LLViewerTexture::FETCHED_TEXTURE,
+                                                          0,
+                                                          0,
+                                                          BLANK_OBJECT_NORMAL);
 
 	// PBR: irradiance
 	LLViewerFetchedTexture::sDefaultIrradiancePBRp = LLViewerTextureManager::getFetchedTextureFromFile("default_irradiance.png", FTT_LOCAL_FILE, MIPMAP_YES, LLViewerFetchedTexture::BOOST_UI);
-- 
cgit v1.2.3


From c5f4eb32a97457e77cd178fc7769b1eb951e0ff3 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 24 Jan 2024 17:50:19 +0100
Subject: SL-20416 Use image from file for emoji_recent_panel_toggle_btn

---
 indra/newview/llfloaterimsessiontab.cpp                   |   1 -
 .../skins/default/textures/icons/emoji_picker_icon.png    | Bin 0 -> 921 bytes
 indra/newview/skins/default/textures/textures.xml         |   1 +
 indra/newview/skins/default/xui/en/floater_im_session.xml |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/emoji_picker_icon.png

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 1e0540c88a..2cb2ea0553 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -258,7 +258,6 @@ BOOL LLFloaterIMSessionTab::postBuild()
 	mTearOffBtn->setCommitCallback(boost::bind(&LLFloaterIMSessionTab::onTearOffClicked, this));
 
 	mEmojiRecentPanelToggleBtn = getChild<LLButton>("emoji_recent_panel_toggle_btn");
-	mEmojiRecentPanelToggleBtn->setLabel(LLUIString(LLWString(1, 128512)));
 	mEmojiRecentPanelToggleBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiRecentPanelToggleBtnClicked(); });
 
 	mEmojiRecentPanel = getChild<LLLayoutPanel>("emoji_recent_layout_panel");
diff --git a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png
new file mode 100644
index 0000000000..ad4f3fa63c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f9a1c76689..1a49ec7e24 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -206,6 +206,7 @@ with the same filename but different name
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
 
+  <texture name="Emoji_Picker_Icon" file_name="icons/emoji_picker_icon.png" preload="true" />
   <texture name="ExternalBrowser_Off" file_name="icons/ExternalBrowser_Off.png" preload="false" />
   <texture name="Edit_Wrench" file_name="icons/Edit_Wrench.png" preload="false" />
 
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 94400f6501..c3e002e97d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -304,12 +304,12 @@
                          name="emoji_recent_panel_toggle_btn"
                          tool_tip="Shows/hides recent emojis"
                          follows="right|bottom"
-                         use_font_color="true"
                          font="EmojiLarge"
                          tab_stop="false"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
+                         image_overlay="Emoji_Picker_Icon"
                          bottom="-2"
                          right="-1"
                          height="25"
-- 
cgit v1.2.3


From cc43f42e6b7401c2cdd3204a16f757f5169bd95b Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 24 Jan 2024 18:24:41 +0100
Subject: SL-20416 Fix Crash Report 1409376 (update)

---
 indra/llui/llfloater.cpp | 11 ++++++++++-
 indra/llui/llfloater.h   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index fb90cebd39..de3de53569 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -506,6 +506,7 @@ void LLFloater::enableResizeCtrls(bool enable, bool width, bool height)
 
 void LLFloater::destroy()
 {
+	gFloaterView->onDestroyFloater(this);
 	// LLFloaterReg should be synchronized with "dead" floater to avoid returning dead instance before
 	// it was deleted via LLMortician::updateClass(). See EXT-8458.
 	LLFloaterReg::removeInstance(mInstanceName, mKey);
@@ -2572,7 +2573,7 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 		return;
 	}
 
-	if (mFrontChild && !mFrontChild->isDead() && mFrontChild->getVisible())
+	if (mFrontChild)
 	{
 		mFrontChild->goneFromFront();
 	}
@@ -3234,6 +3235,14 @@ void LLFloaterView::setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LL
 	}
 }
 
+void LLFloaterView::onDestroyFloater(LLFloater* floater)
+{
+    if (mFrontChild == floater)
+    {
+        mFrontChild = nullptr;
+    }
+}
+
 void LLFloater::setInstanceName(const std::string& name)
 {
 	if (name != mInstanceName)
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 5f4e1a2cad..88f9e77777 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -607,6 +607,7 @@ public:
 	LLFloater* getFrontmostClosableFloater(); 
 
 	void setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LLRect& toolbar_rect);
+	void onDestroyFloater(LLFloater* floater);
 
 private:
 	void hiddenFloaterClosed(LLFloater* floater);
-- 
cgit v1.2.3


From 3b9a1a44b352b655ace39194317a3250bab4c6c9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 26 Jan 2024 00:37:13 +0200
Subject: SL-20669 Fix missed uuid

---
 indra/newview/llpanelface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 7979261bae..f936739fde 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -336,7 +336,7 @@ BOOL	LLPanelFace::postBuild()
 	mTextureCtrl = getChild<LLTextureCtrl>("texture control");
 	if(mTextureCtrl)
 	{
-		mTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectTexture" )));
+		mTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_TEXTURE);
 		mTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitTexture, this, _2) );
 		mTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelTexture, this, _2) );
 		mTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectTexture, this, _2) );
-- 
cgit v1.2.3


From ee7c3ea792d889b8e852bfa07395848f0d893ebb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 27 Jan 2024 02:10:46 +0200
Subject: SL-18721 Shutdown fixes #3

Fix dialog box being blank in task bar
---
 indra/llwindow/llwindowwin32.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 0c1ed85477..4b72ade469 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -3657,6 +3657,9 @@ void LLSplashScreenWin32::showImpl()
 		NULL,	// no parent
 		(DLGPROC) LLSplashScreenWin32::windowProc); 
 	ShowWindow(mWindow, SW_SHOW);
+
+    // Should set taskbar text without creating a header for the window (caption)
+    SetWindowTextA(mWindow, "Second Life");
 }
 
 
-- 
cgit v1.2.3


From a5a4fd0c1026a994dd81ea6b703bcabcd8ed9501 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 29 Jan 2024 21:21:08 +0200
Subject: Issue #696 RenderResolutionDivisor no longer works

resizeScreenTexture works if gResizeScreenTexture is true or render
target was resized
---
 indra/newview/llviewerdisplay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index a936012781..e1d6f71cce 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -730,8 +730,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("display - 2")
 			if (gResizeScreenTexture)
 			{
-				gResizeScreenTexture = FALSE;
 				gPipeline.resizeScreenTexture();
+                gResizeScreenTexture = FALSE;
 			}
 
 			gGL.setColorMask(true, true);
-- 
cgit v1.2.3


From d5c69290ff425178636990f027a8d554f7dc31f8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 31 Jan 2024 02:35:07 +0200
Subject: Issue #24 GLTF material disappears from object playing media

Check texture type, if media is stopped, it won't be a MEDIA_TEXTURE
---
 indra/newview/llvovolume.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ec2f490742..716a65dbcf 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5262,8 +5262,9 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
 
 	//drawable->getVObj()->setDebugText(llformat("%d", drawable->isState(LLDrawable::ANIMATED_CHILD)));
 
-	U8 bump = (type == LLRenderPass::PASS_BUMP || type == LLRenderPass::PASS_POST_BUMP) ? facep->getTextureEntry()->getBumpmap() : 0;
-	U8 shiny = facep->getTextureEntry()->getShiny();
+    const LLTextureEntry* te = facep->getTextureEntry();
+	U8 bump = (type == LLRenderPass::PASS_BUMP || type == LLRenderPass::PASS_POST_BUMP) ? te->getBumpmap() : 0;
+	U8 shiny = te->getShiny();
 	
 	LLViewerTexture* tex = facep->getTexture();
 
@@ -5273,22 +5274,22 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
     
     LLUUID mat_id;
 
-    auto* gltf_mat = (LLFetchedGLTFMaterial*) facep->getTextureEntry()->getGLTFRenderMaterial();
-    llassert(gltf_mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(facep->getTextureEntry()->getGLTFRenderMaterial()) != nullptr);
+    auto* gltf_mat = (LLFetchedGLTFMaterial*)te->getGLTFRenderMaterial();
+    llassert(gltf_mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(te->getGLTFRenderMaterial()) != nullptr);
     if (gltf_mat != nullptr)
     {
         mat_id = gltf_mat->getHash(); // TODO: cache this hash
-        if (!facep->hasMedia())
+        if (!facep->hasMedia() || (tex && tex->getType() != LLViewerTexture::MEDIA_TEXTURE))
         { // no media texture, face texture will be unused
             tex = nullptr;
         }
     }
     else
     {
-        mat = facep->getTextureEntry()->getMaterialParams().get();
+        mat = te->getMaterialParams().get();
         if (mat)
         {
-            mat_id = facep->getTextureEntry()->getMaterialParams()->getHash();
+            mat_id = te->getMaterialParams()->getHash();
         }
     }
 
@@ -5298,7 +5299,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
 
 	if (mat)
 	{
-		BOOL is_alpha = (facep->getPoolType() == LLDrawPool::POOL_ALPHA) || (facep->getTextureEntry()->getColor().mV[3] < 0.999f) ? TRUE : FALSE;
+		BOOL is_alpha = (facep->getPoolType() == LLDrawPool::POOL_ALPHA) || (te->getColor().mV[3] < 0.999f) ? TRUE : FALSE;
 		if (type == LLRenderPass::PASS_ALPHA)
 		{
 			shader_mask = mat->getShaderMask(LLMaterial::DIFFUSE_ALPHA_MODE_BLEND, is_alpha);
-- 
cgit v1.2.3


From 39aefc63d10de298fb484f771b0dc6f09bbd8db7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 1 Feb 2024 20:46:59 +0200
Subject: Issue #716 Update Fmod Studio to version 2.02.20

---
 autobuild.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 6a2a2f27b6..55d02deffc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -548,11 +548,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>fb6797ff93b6e881b060d2a8b396d8d7477834ee</string>
+              <string>a2074b67de7ad4c04b5ca8f8f161506add9697b2</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908444</string>
+              <string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207589</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -564,11 +564,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>a378bd1604aa97ca763140911f9f4e463ced85c0</string>
+              <string>8c1b701648c077220dbc576c3d9aefbef47f8324</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908446</string>
+              <string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207592</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -580,11 +580,11 @@
               <key>creds</key>
               <string>github</string>
               <key>hash</key>
-              <string>72304491d86bd797b840999b255358f195b06609</string>
+              <string>7e0c3d50e8b99d8735c6c9596a72ded9ee2bc1c8</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908456</string>
+              <string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207594</string>
             </map>
             <key>name</key>
             <string>windows64</string>
@@ -597,7 +597,7 @@
         <key>copyright</key>
         <string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
         <key>version</key>
-        <string>2.02.13.578928</string>
+        <string>2.02.20.c78ef55</string>
         <key>name</key>
         <string>fmodstudio</string>
         <key>description</key>
-- 
cgit v1.2.3


From ea916ad950061a1ff46cbf8e8b005b9706dc0343 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 1 Feb 2024 22:10:36 +0200
Subject: DRTVWR-594 Update llca to version 202402012004.0

---
 autobuild.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 55d02deffc..ef1b840bfc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1477,6 +1477,15 @@
       </map>
       <key>llca</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
+      </string>
+        <key>license</key>
+        <string>mit</string>
+        <key>license_file</key>
+        <string>LICENSES/ca-license.txt</string>
+        <key>name</key>
+        <string>llca</string>
         <key>platforms</key>
         <map>
           <key>common</key>
@@ -1484,27 +1493,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d3c1f7f947a2d8e89a98af816be2492afb42dfbc</string>
+              <string>a9503e1b4e1d9790cf29d18a3d9ab39e6a515679</string>
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/llca/releases/download/v202311020117.0-0f5d9c3/llca-202311012318.0-common-0f5d9c3.tar.zst</string>
+              <string>https://github.com/secondlife/llca/releases/download/v202402012004.0-0f5d9c3/llca-202402012004.0-common-0f5d9c3.tar.zst</string>
             </map>
             <key>name</key>
             <string>common</string>
           </map>
         </map>
-        <key>license</key>
-        <string>mit</string>
-        <key>license_file</key>
-        <string>LICENSES/ca-license.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
-      </string>
         <key>version</key>
-        <string>202310121530.0</string>
-        <key>name</key>
-        <string>llca</string>
+        <string>202402012004.0</string>
       </map>
       <key>llphysicsextensions_source</key>
       <map>
-- 
cgit v1.2.3


From 8075cf04c4d55b5978a6a19efbf329d332fd85a0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 2 Feb 2024 23:51:56 +0200
Subject: Issue #26 Support texture drop onto PBR materials

---
 indra/newview/llpanelface.cpp       |  15 ++-
 indra/newview/llpanelface.h         |   1 +
 indra/newview/llselectmgr.cpp       |   3 +-
 indra/newview/lltooldraganddrop.cpp | 220 +++++++++++++++++++++++++++---------
 indra/newview/lltooldraganddrop.h   |   5 +-
 5 files changed, 188 insertions(+), 56 deletions(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index f936739fde..a527ebe47f 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -227,6 +227,17 @@ LLRender::eTexIndex LLPanelFace::getTextureDropChannel()
     return LLRender::eTexIndex(MATTYPE_DIFFUSE);
 }
 
+LLGLTFMaterial::TextureInfo LLPanelFace::getPBRDropChannel()
+{
+    if (mComboMatMedia && mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR)
+    {
+        LLRadioGroup* radio_pbr_type = getChild<LLRadioGroup>("radio_pbr_type");
+        return texture_info_from_pbrtype(radio_pbr_type->getSelectedIndex());
+    }
+
+    return texture_info_from_pbrtype(PBRTYPE_BASE_COLOR);
+}
+
 // Things the UI provides...
 //
 LLUUID	LLPanelFace::getCurrentNormalMap()			{ return getChild<LLTextureCtrl>("bumpytexture control")->getImageAssetID();	}
@@ -4653,7 +4664,8 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
                         LLToolDragAndDrop::dropTextureAllFaces(objectp,
                             itemp_res,
                             from_library ? LLToolDragAndDrop::SOURCE_LIBRARY : LLToolDragAndDrop::SOURCE_AGENT,
-                            LLUUID::null);
+                            LLUUID::null,
+                            false);
                     }
                     else // one face
                     {
@@ -4662,6 +4674,7 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
                             itemp_res,
                             from_library ? LLToolDragAndDrop::SOURCE_LIBRARY : LLToolDragAndDrop::SOURCE_AGENT,
                             LLUUID::null,
+                            false,
                             0);
                     }
                 }
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 5ca6a95699..a64b85815f 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -126,6 +126,7 @@ public:
 
 	LLRender::eTexIndex getTextureChannelToEdit();
     LLRender::eTexIndex getTextureDropChannel();
+    LLGLTFMaterial::TextureInfo getPBRDropChannel();
 
 protected:
     void			navigateToTitleMedia(const std::string url);
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index c2e3857af0..30e12faca5 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1879,7 +1879,8 @@ bool LLSelectMgr::selectionSetImage(const LLUUID& imageid)
                                                       te,
                                                       mItem,
                                                       LLToolDragAndDrop::SOURCE_AGENT,
-                                                      LLUUID::null);
+                                                      LLUUID::null,
+                                                      false);
 			}
 			else // not an inventory item
 			{
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index e7f96239fd..bfa9386cd4 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1071,10 +1071,64 @@ BOOL LLToolDragAndDrop::handleDropMaterialProtections(LLViewerObject* hit_obj,
 	return TRUE;
 }
 
+void set_texture_to_material(LLViewerObject* hit_obj,
+                             S32 hit_face,
+                             const LLUUID& asset_id,
+                             LLGLTFMaterial::TextureInfo drop_channel)
+{
+    LLTextureEntry* te = hit_obj->getTE(hit_face);
+    if (te)
+    {
+        LLPointer<LLGLTFMaterial> material = te->getGLTFMaterialOverride();
+
+        // make a copy to not invalidate existing
+        // material for multiple objects
+        if (material.isNull())
+        {
+            // Start with a material override which does not make any changes
+            material = new LLGLTFMaterial();
+        }
+        else
+        {
+            material = new LLGLTFMaterial(*material);
+        }
+
+        switch (drop_channel)
+        {
+            case LLGLTFMaterial::GLTF_TEXTURE_INFO_BASE_COLOR:
+            default:
+                {
+                    material->setBaseColorId(asset_id);
+                }
+                break;
+
+            case LLGLTFMaterial::GLTF_TEXTURE_INFO_METALLIC_ROUGHNESS:
+                {
+                    material->setOcclusionRoughnessMetallicId(asset_id);
+                }
+                break;
+
+            case LLGLTFMaterial::GLTF_TEXTURE_INFO_EMISSIVE:
+                {
+                    material->setEmissiveId(asset_id);
+                }
+                break;
+
+            case LLGLTFMaterial::GLTF_TEXTURE_INFO_NORMAL:
+                {
+                    material->setNormalId(asset_id);
+                }
+                break;
+        }
+        LLGLTFMaterialList::queueModify(hit_obj, hit_face, material);
+    }
+}
+
 void LLToolDragAndDrop::dropTextureAllFaces(LLViewerObject* hit_obj,
 											LLInventoryItem* item,
 											LLToolDragAndDrop::ESource source,
-											const LLUUID& src_id)
+											const LLUUID& src_id,
+                                            bool remove_pbr)
 {
 	if (!item)
 	{
@@ -1091,28 +1145,46 @@ void LLToolDragAndDrop::dropTextureAllFaces(LLViewerObject* hit_obj,
             break;
         }
     }
-    if (!has_non_pbr_faces)
+
+    if (has_non_pbr_faces || remove_pbr)
     {
-        return;
+        BOOL res = handleDropMaterialProtections(hit_obj, item, source, src_id);
+        if (!res)
+        {
+            return;
+        }
     }
 	LLUUID asset_id = item->getAssetUUID();
-	BOOL success = handleDropMaterialProtections(hit_obj, item, source, src_id);
-	if (!success)
-	{
-		return;
-	}
+
+    // Overrides require textures to be copy and transfer free
+    LLPermissions item_permissions = item->getPermissions();
+    bool allow_adding_to_override = item_permissions.allowOperationBy(PERM_COPY, gAgent.getID());
+    allow_adding_to_override &= item_permissions.allowOperationBy(PERM_TRANSFER, gAgent.getID());
+
 	LLViewerTexture* image = LLViewerTextureManager::getFetchedTexture(asset_id);
 	add(LLStatViewer::EDIT_TEXTURE, 1);
 	for( S32 face = 0; face < num_faces; face++ )
 	{
-        if (hit_obj->getRenderMaterialID(face).isNull())
+        if (remove_pbr)
+        {
+            hit_obj->setRenderMaterialID(face, LLUUID::null);
+            hit_obj->setTEImage(face, image);
+            dialog_refresh_all();
+        }
+        else if (hit_obj->getRenderMaterialID(face).isNull())
         {
-            // update viewer side image in anticipation of update from simulator
+            // update viewer side
             hit_obj->setTEImage(face, image);
             dialog_refresh_all();
         }
+        else if (allow_adding_to_override)
+        {
+            set_texture_to_material(hit_obj, face, asset_id, LLGLTFMaterial::GLTF_TEXTURE_INFO_BASE_COLOR);
+        }
 	}
+
 	// send the update to the simulator
+    LLGLTFMaterialList::flushUpdates(nullptr);
 	hit_obj->sendTEUpdate();
 }
 
@@ -1260,21 +1332,13 @@ void LLToolDragAndDrop::dropMesh(LLViewerObject* hit_obj,
 	dialog_refresh_all();
 }
 
-/*
-void LLToolDragAndDrop::dropTextureOneFaceAvatar(LLVOAvatar* avatar, S32 hit_face, LLInventoryItem* item)
-{
-	if (hit_face == -1) return;
-	LLViewerTexture* image = LLViewerTextureManager::getFetchedTexture(item->getAssetUUID());
-	
-	avatar->userSetOptionalTE( hit_face, image);
-}
-*/
 void LLToolDragAndDrop::dropTexture(LLViewerObject* hit_obj,
                                     S32 hit_face,
                                     LLInventoryItem* item,
                                     ESource source,
                                     const LLUUID& src_id,
                                     bool all_faces,
+                                    bool remove_pbr,
                                     S32 tex_channel)
 {
     LLSelectNode* nodep = nullptr;
@@ -1286,13 +1350,15 @@ void LLToolDragAndDrop::dropTexture(LLViewerObject* hit_obj,
 
     if (all_faces)
     {
-        dropTextureAllFaces(hit_obj, item, source, src_id);
+        dropTextureAllFaces(hit_obj, item, source, src_id, remove_pbr);
 
         // If user dropped a texture onto face it implies
         // applying texture now without cancel, save to selection
         if (nodep)
         {
             uuid_vec_t texture_ids;
+            uuid_vec_t material_ids;
+            gltf_materials_vec_t override_materials;
             S32 num_faces = hit_obj->getNumTEs();
             for (S32 face = 0; face < num_faces; face++)
             {
@@ -1305,13 +1371,35 @@ void LLToolDragAndDrop::dropTexture(LLViewerObject* hit_obj,
                 {
                     texture_ids.push_back(LLUUID::null);
                 }
+
+                // either removed or modified materials
+                if (remove_pbr)
+                {
+                    material_ids.push_back(LLUUID::null);
+                }
+                else
+                {
+                    material_ids.push_back(hit_obj->getRenderMaterialID(face));
+                }
+
+                LLTextureEntry* te = hit_obj->getTE(hit_face);
+                if (te && !remove_pbr)
+                {
+                    override_materials.push_back(te->getGLTFMaterialOverride());
+                }
+                else
+                {
+                    override_materials.push_back(nullptr);
+                }
             }
+
             nodep->saveTextures(texture_ids);
+            nodep->saveGLTFMaterials(material_ids, override_materials);
         }
     }
     else
     {
-        dropTextureOneFace(hit_obj, hit_face, item, source, src_id);
+        dropTextureOneFace(hit_obj, hit_face, item, source, src_id, remove_pbr, tex_channel);
 
         // If user dropped a texture onto face it implies
         // applying texture now without cancel, save to selection
@@ -1331,6 +1419,16 @@ void LLToolDragAndDrop::dropTexture(LLViewerObject* hit_obj,
             {
                 nodep->mSavedTextures[hit_face] = LLUUID::null;
             }
+
+            LLTextureEntry* te = hit_obj->getTE(hit_face);
+            if (te && !remove_pbr)
+            {
+                nodep->mSavedGLTFOverrideMaterials[hit_face] = te->getGLTFMaterialOverride();
+            }
+            else
+            {
+                nodep->mSavedGLTFOverrideMaterials[hit_face] = nullptr;
+            }
         }
     }
 }
@@ -1340,6 +1438,7 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
 										   LLInventoryItem* item,
 										   LLToolDragAndDrop::ESource source,
 										   const LLUUID& src_id,
+                                           bool remove_pbr,
                                            S32 tex_channel)
 {
 	if (hit_face == -1) return;
@@ -1348,21 +1447,44 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
 		LL_WARNS() << "LLToolDragAndDrop::dropTextureOneFace no texture item." << LL_ENDL;
 		return;
 	}
-    if (hit_obj->getRenderMaterialID(hit_face).notNull())
+
+    LLUUID asset_id = item->getAssetUUID();
+
+    if (hit_obj->getRenderMaterialID(hit_face).notNull() && !remove_pbr)
     {
+        // Overrides require textures to be copy and transfer free
+        LLPermissions item_permissions = item->getPermissions();
+        bool allow_adding_to_override = item_permissions.allowOperationBy(PERM_COPY, gAgent.getID());
+        allow_adding_to_override &= item_permissions.allowOperationBy(PERM_TRANSFER, gAgent.getID());
+
+        if (allow_adding_to_override)
+        {
+            LLGLTFMaterial::TextureInfo drop_channel = LLGLTFMaterial::GLTF_TEXTURE_INFO_BASE_COLOR;
+            LLPanelFace* panel_face = gFloaterTools->getPanelFace();
+            if (gFloaterTools->getVisible() && panel_face)
+            {
+                drop_channel = panel_face->getPBRDropChannel();
+            }
+            set_texture_to_material(hit_obj, hit_face, asset_id, drop_channel);
+            LLGLTFMaterialList::flushUpdates(nullptr);
+        }
         return;
     }
-	LLUUID asset_id = item->getAssetUUID();
 	BOOL success = handleDropMaterialProtections(hit_obj, item, source, src_id);
 	if (!success)
 	{
 		return;
 	}
+    if (remove_pbr)
+    {
+        hit_obj->setRenderMaterialID(hit_face, LLUUID::null);
+    }
+
 	// update viewer side image in anticipation of update from simulator
 	LLViewerTexture* image = LLViewerTextureManager::getFetchedTexture(asset_id);
 	add(LLStatViewer::EDIT_TEXTURE, 1);
 
-	LLTextureEntry* tep = hit_obj ? (hit_obj->getTE(hit_face)) : NULL;
+	LLTextureEntry* tep = hit_obj->getTE(hit_face);
 
 	LLPanelFace* panel_face = gFloaterTools->getPanelFace();
 
@@ -1380,6 +1502,7 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
 			break;
 
 		case 1:
+            if (tep)
 			{
 				LLMaterialPtr old_mat = tep->getMaterialParams();
 				LLMaterialPtr new_mat = panel_face->createDefaultMaterial(old_mat);
@@ -1391,6 +1514,7 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
 			break;
 
 		case 2:
+            if (tep)
 			{
 				LLMaterialPtr old_mat = tep->getMaterialParams();
 				LLMaterialPtr new_mat = panel_face->createDefaultMaterial(old_mat);
@@ -2200,6 +2324,7 @@ EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
 	LLViewerInventoryCategory* cat;
 	locateInventory(item, cat);
 	if (!item || !item->isFinished()) return ACCEPT_NO;
+    LLPermissions item_permissions = item->getPermissions();
 	EAcceptance rv = willObjectAcceptInventory(obj, item);
 	if((mask & MASK_CONTROL))
 	{
@@ -2214,12 +2339,12 @@ EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
 		return ACCEPT_NO_LOCKED;
 	}
 
-    if (cargo_type == DAD_TEXTURE)
+    if (cargo_type == DAD_TEXTURE && (mask & MASK_ALT) == 0)
     {
+        bool has_non_pbr_faces = false;
         if ((mask & MASK_SHIFT))
         {
             S32 num_faces = obj->getNumTEs();
-            bool has_non_pbr_faces = false;
             for (S32 face = 0; face < num_faces; face++)
             {
                 if (obj->getRenderMaterialID(face).isNull())
@@ -2228,14 +2353,19 @@ EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
                     break;
                 }
             }
-            if (!has_non_pbr_faces)
-            {
-                return ACCEPT_NO;
-            }
         }
-        else if (obj->getRenderMaterialID(face).notNull())
+        else
+        {
+            has_non_pbr_faces = obj->getRenderMaterialID(face).isNull();
+        }
+
+        if (!has_non_pbr_faces)
         {
-            return ACCEPT_NO;
+            // Only pbr faces selected, texture will be added to an override
+            // Overrides require textures to be copy and transfer free
+            bool allow_adding_to_override = item_permissions.allowOperationBy(PERM_COPY, gAgent.getID());
+            allow_adding_to_override &= item_permissions.allowOperationBy(PERM_TRANSFER, gAgent.getID());
+            if (!allow_adding_to_override) return ACCEPT_NO;
         }
     }
 
@@ -2244,15 +2374,16 @@ EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
 		if (cargo_type == DAD_TEXTURE)
 		{
             bool all_faces = mask & MASK_SHIFT;
-            if (item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
+            bool remove_pbr = mask & MASK_ALT;
+            if (item_permissions.allowOperationBy(PERM_COPY, gAgent.getID()))
             {
-                dropTexture(obj, face, item, mSource, mSourceID, all_faces);
+                dropTexture(obj, face, item, mSource, mSourceID, all_faces, remove_pbr);
             }
             else
             {
                 ESource source = mSource;
                 LLUUID source_id = mSourceID;
-                LLNotificationsUtil::add("ApplyInventoryToObject", LLSD(), LLSD(), [obj, face, item, source, source_id, all_faces](const LLSD& notification, const LLSD& response)
+                LLNotificationsUtil::add("ApplyInventoryToObject", LLSD(), LLSD(), [obj, face, item, source, source_id, all_faces, remove_pbr](const LLSD& notification, const LLSD& response)
                                          {
                                              S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
                                              // if Cancel pressed
@@ -2260,7 +2391,7 @@ EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
                                              {
                                                  return;
                                              }
-                                             dropTexture(obj, face, item, source, source_id, all_faces);
+                                             dropTexture(obj, face, item, source, source_id, all_faces, remove_pbr);
                                          });
             }
 		}
@@ -2327,23 +2458,6 @@ EAcceptance LLToolDragAndDrop::dad3dMeshObject(
 	return dad3dApplyToObject(obj, face, mask, drop, DAD_MESH);
 }
 
-
-/*
-EAcceptance LLToolDragAndDrop::dad3dTextureSelf(
-	LLViewerObject* obj, S32 face, MASK mask, BOOL drop)
-{
-	LL_DEBUGS() << "LLToolDragAndDrop::dad3dTextureAvatar()" << LL_ENDL;
-	if(drop)
-	{
-		if( !(mask & MASK_SHIFT) )
-		{
-			dropTextureOneFaceAvatar( (LLVOAvatar*)obj, face, (LLInventoryItem*)mCargoData);
-		}
-	}
-	return (mask & MASK_SHIFT) ? ACCEPT_NO : ACCEPT_YES_SINGLE;
-}
-*/
-
 EAcceptance LLToolDragAndDrop::dad3dWearItem(
 	LLViewerObject* obj, S32 face, MASK mask, BOOL drop)
 {
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h
index 7bdd2d1a49..db2fe87f20 100644
--- a/indra/newview/lltooldraganddrop.h
+++ b/indra/newview/lltooldraganddrop.h
@@ -249,17 +249,20 @@ public:
                             ESource source,
                             const LLUUID& src_id,
                             bool all_faces,
+                            bool replace_pbr,
                             S32 tex_channel = -1);
 	static void dropTextureOneFace(LLViewerObject* hit_obj,
                                    S32 hit_face,
 								   LLInventoryItem* item,
 								   ESource source,
 								   const LLUUID& src_id,
+                                   bool remove_pbr,
                                    S32 tex_channel = -1);
 	static void dropTextureAllFaces(LLViewerObject* hit_obj,
 									LLInventoryItem* item,
 									ESource source,
-									const LLUUID& src_id);
+									const LLUUID& src_id,
+                                    bool remove_pbr);
     static void dropMaterial(LLViewerObject* hit_obj,
                              S32 hit_face,
                              LLInventoryItem* item,
-- 
cgit v1.2.3


From 23aa975cf0b516bc7de9f767967c52c5fd08dd12 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 5 Feb 2024 16:05:51 +0200
Subject: SL-20669 Fix white uuid

---
 indra/llcommon/indra_constants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/indra_constants.cpp b/indra/llcommon/indra_constants.cpp
index 473b3ebdc9..9a0c565b06 100644
--- a/indra/llcommon/indra_constants.cpp
+++ b/indra/llcommon/indra_constants.cpp
@@ -50,7 +50,7 @@ const LLUUID IMG_FIRE			("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver
 const LLUUID IMG_FACE_SELECT    ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector
 const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver
 const LLUUID IMG_INVISIBLE		("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver
-const LLUUID IMG_WHITE          ("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver
+const LLUUID IMG_WHITE          ("5748decc-f629-461c-9a36-a35a221fe21f"); // dataserver
 
 const LLUUID IMG_EXPLOSION				("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver
 const LLUUID IMG_EXPLOSION_2			("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver
-- 
cgit v1.2.3


From b348366d107a03fcc01397c1b2e9e2a22de48034 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Feb 2024 00:29:05 +0200
Subject: Issue #56 Redirect Help>Report Bug to Canny instead of Jira

---
 indra/newview/app_settings/settings.xml            |  2 +-
 indra/newview/llviewermenu.cpp                     | 19 ++-----------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 +-
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 00b59f9a4d..bd38527462 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11255,7 +11255,7 @@
 			<key>Type</key>
 			<string>String</string>
 			<key>Value</key>
-			<string>https://jira.secondlife.com/secure/CreateIssueDetails!init.jspa?pid=10610&amp;issuetype=1&amp;environment=[ENVIRONMENT]&amp;customfield_10253=[LOCATION]</string>
+			<string>https://feedback.secondlife.com/</string>
 		</map>
 	<key>RevokePermsOnStopAnimation</key>
     <map>
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 69edb54997..8419555445 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8509,23 +8509,8 @@ void handle_show_url(const LLSD& param)
 
 void handle_report_bug(const LLSD& param)
 {
-	LLUIString url(param.asString());
-	
-	LLStringUtil::format_map_t replace;
-	std::string environment = LLAppViewer::instance()->getViewerInfoString(true);
-	boost::regex regex;
-	regex.assign("</?nolink>");
-	std::string stripped_env = boost::regex_replace(environment, regex, "");
-
-	replace["[ENVIRONMENT]"] = LLURI::escape(stripped_env);
-	LLSLURL location_url;
-	LLAgentUI::buildSLURL(location_url);
-	replace["[LOCATION]"] = LLURI::escape(location_url.getSLURLString());
-
-	LLUIString file_bug_url = gSavedSettings.getString("ReportBugURL");
-	file_bug_url.setArgs(replace);
-
-	LLWeb::loadURLExternal(file_bug_url.getString());
+    std::string url = gSavedSettings.getString("ReportBugURL");
+    LLWeb::loadURLExternal(url);
 }
 
 void handle_buy_currency_test(void*)
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 446a4f0994..171c0f4f6d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -4417,7 +4417,7 @@ function="World.EnvPreset"
                     <menu_item_call.on_click
                      function="PromptShowURL"
                      name="PublicIssueTracker_url"
-                     parameter="WebLaunchPublicIssue,http://jira.secondlife.com" />
+                     parameter="WebLaunchPublicIssue,https://feedback.secondlife.com/" />
                 </menu_item_call>
                 <menu_item_call
                  label="Public Issue Tracker Help"
-- 
cgit v1.2.3


From 2e5b105dffc41695d0a64c5b55eef7c28da49246 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 7 Feb 2024 22:50:28 +0200
Subject: SL-18721 Shutdown fixes #4

---
 indra/llcommon/threadpool.h      |  2 +-
 indra/llwindow/llwindowwin32.cpp | 42 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index fa16c6fe71..b8be7bb81a 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -87,6 +87,7 @@ namespace LL
 
     protected:
         std::unique_ptr<WorkQueueBase> mQueue;
+        std::vector<std::pair<std::string, std::thread>> mThreads;
         bool mAutomaticShutdown;
 
     private:
@@ -94,7 +95,6 @@ namespace LL
 
         std::string mName;
         size_t mThreadCount;
-        std::vector<std::pair<std::string, std::thread>> mThreads;
     };
 
     /**
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 4b72ade469..8cc8f9c408 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -352,6 +352,9 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
 
     void run() override;
 
+    // closes queue, wakes thread, waits until thread closes
+    void wakeAndClose();
+
     void glReady()
     {
         mGLReady = true;
@@ -1022,12 +1025,8 @@ void LLWindowWin32::close()
 
     mhDC = NULL;
     mWindowHandle = NULL;
-
-    // Window thread might be waiting for a getMessage(), give it
-    // a push to enshure it will process destroy_window_handler
-    kickWindowThread();
     
-    mWindowThread->close();
+    mWindowThread->wakeAndClose();
 }
 
 BOOL LLWindowWin32::isValid()
@@ -4940,6 +4939,39 @@ void LLWindowWin32::LLWindowWin32Thread::run()
 
 }
 
+void LLWindowWin32::LLWindowWin32Thread::wakeAndClose()
+{
+    if (!mQueue->isClosed())
+    {
+        LL_DEBUGS("Window") << "closing pool queue" << LL_ENDL;
+        mQueue->close();
+
+        // Post a nonsense user message to wake up the thred in
+        // case it is waiting for a getMessage()
+        // 
+        // Note that mWindowHandleThrd can change at any moment and isn't thread safe
+        // but since we aren't writing it, should be safe to use even if value is obsolete
+        // worst case dead handle gets reused and some new window ignores the message
+        HWND old_handle = mWindowHandleThrd;
+        if (old_handle)
+        {
+            WPARAM wparam{ 0xB0B0 };
+            LL_DEBUGS("Window") << "PostMessage(" << std::hex << old_handle
+                << ", " << WM_DUMMY_
+                << ", " << wparam << ")" << std::dec << LL_ENDL;
+            PostMessage(old_handle, WM_DUMMY_, wparam, 0x1337);
+        }
+
+        // now wait for our one thread to die.
+        for (auto& pair : mThreads)
+        {
+            LL_DEBUGS("Window") << "waiting on pool's thread " << pair.first << LL_ENDL;
+            pair.second.join();
+        }
+        LL_DEBUGS("Window") << "thread pool shutdown complete" << LL_ENDL;
+    }
+}
+
 void LLWindowWin32::post(const std::function<void()>& func)
 {
     mFunctionQueue.pushFront(func);
-- 
cgit v1.2.3


From 7075717b7c4a57d6bef60697ee506096a7c1b1ab Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 7 Feb 2024 21:26:57 +0100
Subject: SL-20363 Add Advanced option 'Debug Unicode'

---
 indra/llcommon/llstring.cpp                        |  49 +++++++++
 indra/llcommon/llstring.h                          |   1 +
 indra/llui/lllineeditor.cpp                        |  14 +++
 indra/llui/lllineeditor.h                          | 112 +++++++++++----------
 indra/llui/lltextbase.cpp                          |  24 +++++
 indra/llui/lltextbase.h                            |  66 ++++++------
 indra/llui/llview.cpp                              |   1 +
 indra/llui/llview.h                                |   3 +
 indra/newview/llviewermenu.cpp                     |  26 +++++
 .../skins/default/xui/en/floater_im_session.xml    |   2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |   8 ++
 11 files changed, 218 insertions(+), 88 deletions(-)

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 17d69351ec..ab34262515 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -623,6 +623,7 @@ std::string mbcsstring_makeASCII(const std::string& wstr)
 	}
 	return out_str;
 }
+
 std::string utf8str_removeCRLF(const std::string& utf8str)
 {
 	if (0 == utf8str.length())
@@ -644,6 +645,54 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
 	return out;
 }
 
+std::string utf8str_showBytesUTF8(const std::string& utf8str)
+{
+    std::string result;
+
+    bool in_sequence = false;
+    for (U8 byte : utf8str)
+    {
+        if (byte >= 0x80) // Part of an UTF-8 sequence
+        {
+            if (!in_sequence) // Start new UTF-8 sequence
+            {
+                if (!result.empty() && result.back() != ' ')
+                    result += ' '; // Use space as separator between ASCII and UTF-8
+                result += '[';
+            }
+            else if (byte >= 0xC0) // Start another UTF-8 sequence
+            {
+                result += "] ["; // Use space as separator between UTF-8 and UTF-8
+            }
+            else // Continue the same UTF-8 sequence
+            {
+                result += '.';
+            }
+            result += llformat("%02X", byte); // The byte is represented in hexadecimal form
+            in_sequence = true;
+        }
+        else // ASCII symbol is represented as a character
+        {
+            if (in_sequence) // End of UTF-8 sequence
+            {
+                result += ']';
+                if (byte != ' ')
+                {
+                    result += ' '; // Use space as separator between UTF-8 and ASCII
+                }
+            }
+            result += byte;
+            in_sequence = false;
+        }
+    }
+    if (in_sequence) // End of UTF-8 sequence
+    {
+        result += ']';
+    }
+
+    return result;
+}
+
 #if LL_WINDOWS
 unsigned int ll_wstring_default_code_page()
 {
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 8def59ed7f..38b9c3e23c 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -743,6 +743,7 @@ LL_COMMON_API std::string mbcsstring_makeASCII(const std::string& str);
 
 LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str);
 
+LL_COMMON_API std::string utf8str_showBytesUTF8(const std::string& utf8str);
 
 #if LL_WINDOWS
 /* @name Windows string helpers
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index e032b4b8c2..453fa29e7c 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -1739,6 +1739,20 @@ void LLLineEditor::drawBackground()
 	}
 }
 
+//virtual 
+const std::string LLLineEditor::getToolTip() const
+{
+    if (sDebugUnicode)
+    {
+        std::string text = getText();
+        std::string tooltip = utf8str_showBytesUTF8(text);
+        return tooltip;
+    }
+
+    return LLUICtrl::getToolTip();
+}
+
+//virtual 
 void LLLineEditor::draw()
 {
 	F32 alpha = getDrawContext().mAlpha;
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 69eb0792e1..5794b3c35a 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -119,54 +119,55 @@ protected:
 	friend class LLUICtrlFactory;
 	friend class LLFloaterEditUI;
 	void showContextMenu(S32 x, S32 y);
+
 public:
 	virtual ~LLLineEditor();
 
 	// mousehandler overrides
-	/*virtual*/ BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL	handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL	handleDoubleClick(S32 x,S32 y,MASK mask);
-	/*virtual*/ BOOL	handleMiddleMouseDown(S32 x,S32 y,MASK mask);
-	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL	handleKeyHere(KEY key, MASK mask );
-	/*virtual*/ BOOL	handleUnicodeCharHere(llwchar uni_char);
-	/*virtual*/ void	onMouseCaptureLost();
+	/*virtual*/ BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL	handleHover(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL	handleDoubleClick(S32 x,S32 y,MASK mask) override;
+	/*virtual*/ BOOL	handleMiddleMouseDown(S32 x,S32 y,MASK mask) override;
+	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL	handleKeyHere(KEY key, MASK mask) override;
+	/*virtual*/ BOOL	handleUnicodeCharHere(llwchar uni_char) override;
+	/*virtual*/ void	onMouseCaptureLost() override;
 
 	// LLEditMenuHandler overrides
-	virtual void	cut();
-	virtual BOOL	canCut() const;
-	virtual void	copy();
-	virtual BOOL	canCopy() const;
-	virtual void	paste();
-	virtual BOOL	canPaste() const;
+	/*virtual*/ void	cut() override;
+	/*virtual*/ BOOL	canCut() const override;
+	/*virtual*/ void	copy() override;
+	/*virtual*/ BOOL	canCopy() const override;
+	/*virtual*/ void	paste() override;
+	/*virtual*/ BOOL	canPaste() const override;
 
 	virtual void	updatePrimary();
 	virtual void	copyPrimary();
  	virtual void	pastePrimary();
 	virtual BOOL	canPastePrimary() const;
 
-	virtual void	doDelete();
-	virtual BOOL	canDoDelete() const;
+	/*virtual*/ void	doDelete() override;
+	/*virtual*/ BOOL	canDoDelete() const override;
 
-	virtual void	selectAll();
-	virtual BOOL	canSelectAll() const;
+	/*virtual*/ void	selectAll() override;
+	/*virtual*/ BOOL	canSelectAll() const override;
 
-	virtual void	deselect();
-	virtual BOOL	canDeselect() const;
+	/*virtual*/ void	deselect() override;
+	/*virtual*/ BOOL	canDeselect() const override;
 
 	// LLSpellCheckMenuHandler overrides
-	/*virtual*/ bool	getSpellCheck() const;
+	/*virtual*/ bool	getSpellCheck() const override;
 
-	/*virtual*/ const std::string& getSuggestion(U32 index) const;
-	/*virtual*/ U32		getSuggestionCount() const;
-	/*virtual*/ void	replaceWithSuggestion(U32 index);
+	/*virtual*/ const std::string& getSuggestion(U32 index) const override;
+	/*virtual*/ U32		getSuggestionCount() const override;
+	/*virtual*/ void	replaceWithSuggestion(U32 index) override;
 
-	/*virtual*/ void	addToDictionary();
-	/*virtual*/ bool	canAddToDictionary() const;
+	/*virtual*/ void	addToDictionary() override;
+	/*virtual*/ bool	canAddToDictionary() const override;
 
-	/*virtual*/ void	addToIgnore();
-	/*virtual*/ bool	canAddToIgnore() const;
+	/*virtual*/ void	addToIgnore() override;
+	/*virtual*/ bool	canAddToIgnore() const override;
 
 	// Spell checking helper functions
 	std::string			getMisspelledWord(U32 pos) const;
@@ -174,27 +175,28 @@ public:
 	void				onSpellCheckSettingsChange();
 
 	// view overrides
-	virtual void	draw();
-	virtual void	reshape(S32 width,S32 height,BOOL called_from_parent=TRUE);
-	virtual void	onFocusReceived();
-	virtual void	onFocusLost();
-	virtual void	setEnabled(BOOL enabled);
+	/*virtual*/ const std::string getToolTip() const override;
+	/*virtual*/ void	draw() override;
+	/*virtual*/ void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override;
+	/*virtual*/ void	onFocusReceived() override;
+	/*virtual*/ void	onFocusLost() override;
+	/*virtual*/ void	setEnabled(BOOL enabled) override;
 
 	// UI control overrides
-	virtual void	clear();
-	virtual void	onTabInto();
-	virtual void	setFocus( BOOL b );
-	virtual void 	setRect(const LLRect& rect);
-	virtual BOOL	acceptsTextInput() const;
-	virtual void	onCommit();
-	virtual BOOL	isDirty() const;	// Returns TRUE if user changed value at all
-	virtual void	resetDirty();		// Clear dirty state
+	/*virtual*/ void	clear() override;
+	/*virtual*/ void	onTabInto() override;
+	/*virtual*/ void	setFocus(BOOL b) override;
+	/*virtual*/ void 	setRect(const LLRect& rect) override;
+	/*virtual*/ BOOL	acceptsTextInput() const override;
+	/*virtual*/ void	onCommit() override;
+	/*virtual*/ BOOL	isDirty() const override;	// Returns TRUE if user changed value at all
+	/*virtual*/ void	resetDirty() override;		// Clear dirty state
 
 	// assumes UTF8 text
-	virtual void	setValue(const LLSD& value );
-	virtual LLSD	getValue() const;
-	virtual BOOL	setTextArg( const std::string& key, const LLStringExplicit& text );
-	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
+	/*virtual*/ void	setValue(const LLSD& value) override;
+	/*virtual*/ LLSD	getValue() const override;
+	/*virtual*/ BOOL	setTextArg(const std::string& key, const LLStringExplicit& text) override;
+	/*virtual*/ BOOL	setLabelArg(const std::string& key, const LLStringExplicit& text) override;
 
 	void			setLabel(const LLStringExplicit &new_label) { mLabel = new_label; }
 	const std::string& 	getLabel()	{ return mLabel.getString(); }
@@ -216,7 +218,7 @@ public:
 
 	// Selects characters 'start' to 'end'.
 	void			setSelection(S32 start, S32 end);
-	virtual void	getSelectionRange(S32 *position, S32 *length) const;
+	/*virtual*/ void	getSelectionRange(S32 *position, S32 *length) const override;
 	
 	void			setCommitOnFocusLost( BOOL b )	{ mCommitOnFocusLost = b; }
 	void			setRevertOnEsc( BOOL b )		{ mRevertOnEsc = b; }
@@ -315,14 +317,14 @@ public:
 	void			updateAllowingLanguageInput();
 	BOOL			hasPreeditString() const;
 	// Implementation (overrides) of LLPreeditor
-	virtual void	resetPreedit();
-	virtual void	updatePreedit(const LLWString &preedit_string,
-						const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position);
-	virtual void	markAsPreedit(S32 position, S32 length);
-	virtual void	getPreeditRange(S32 *position, S32 *length) const;
-	virtual BOOL	getPreeditLocation(S32 query_position, LLCoordGL *coord, LLRect *bounds, LLRect *control) const;
-	virtual S32		getPreeditFontSize() const;
-	virtual LLWString getPreeditString() const { return getWText(); }
+	/*virtual*/ void	resetPreedit() override;
+	/*virtual*/ void	updatePreedit(const LLWString &preedit_string,
+						const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position) override;
+	/*virtual*/ void	markAsPreedit(S32 position, S32 length) override;
+	/*virtual*/ void	getPreeditRange(S32 *position, S32 *length) const override;
+	/*virtual*/ BOOL	getPreeditLocation(S32 query_position, LLCoordGL *coord, LLRect *bounds, LLRect *control) const override;
+	/*virtual*/ S32		getPreeditFontSize() const override;
+	/*virtual*/ LLWString getPreeditString() const override { return getWText(); }
 
     void			setText(const LLStringExplicit &new_text, bool use_size_limit);
 
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 8f628b4818..7ccf025a19 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1107,6 +1107,7 @@ void LLTextBase::insertSegment(LLTextSegmentPtr segment_to_insert)
 	needsReflow(reflow_start_index);
 }
 
+//virtual 
 BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	// handle triple click
@@ -1161,6 +1162,7 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleMouseDown(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1180,6 +1182,7 @@ BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleMouseUp(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1191,6 +1194,7 @@ BOOL LLTextBase::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleMiddleMouseDown(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1202,6 +1206,7 @@ BOOL LLTextBase::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleMiddleMouseUp(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1213,6 +1218,7 @@ BOOL LLTextBase::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleRightMouseDown(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1224,6 +1230,7 @@ BOOL LLTextBase::handleRightMouseUp(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleRightMouseUp(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
 	//Don't start triple click timer if user have clicked on scrollbar
@@ -1243,6 +1250,7 @@ BOOL LLTextBase::handleDoubleClick(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleDoubleClick(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleHover(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1254,6 +1262,7 @@ BOOL LLTextBase::handleHover(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleHover(x, y, mask);
 }
 
+//virtual 
 BOOL LLTextBase::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1265,6 +1274,7 @@ BOOL LLTextBase::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return LLUICtrl::handleScrollWheel(x, y, clicks);
 }
 
+//virtual 
 BOOL LLTextBase::handleToolTip(S32 x, S32 y, MASK mask)
 {
 	LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
@@ -1276,7 +1286,20 @@ BOOL LLTextBase::handleToolTip(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleToolTip(x, y, mask);
 }
 
+//virtual 
+const std::string LLTextBase::getToolTip() const
+{
+    if (sDebugUnicode)
+    {
+        std::string text = getText();
+        std::string tooltip = utf8str_showBytesUTF8(text);
+        return tooltip;
+    }
 
+    return LLUICtrl::getToolTip();
+}
+
+//virtual 
 void LLTextBase::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
 	if (width != getRect().getWidth() || height != getRect().getHeight() || LLView::sForceReshape)
@@ -1303,6 +1326,7 @@ void LLTextBase::reshape(S32 width, S32 height, BOOL called_from_parent)
 	}
 }
 
+//virtual 
 void LLTextBase::draw()
 {
 	// reflow if needed, on demand
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 37ab798a1d..9d3c54fbee 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -285,7 +285,7 @@ typedef LLPointer<LLTextSegment> LLTextSegmentPtr;
 /// as LLTextEditor and LLTextBox. It implements shared functionality
 /// such as Url highlighting and opening.
 ///
-class LLTextBase 
+class LLTextBase
 :	public LLUICtrl,
 	protected LLEditMenuHandler,
 	public LLSpellCheckMenuHandler,
@@ -354,51 +354,52 @@ public:
 	};
 
 	// LLMouseHandler interface
-	/*virtual*/ BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleMiddleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleMiddleMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleRightMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleRightMouseUp(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL		handleScrollWheel(S32 x, S32 y, S32 clicks);
-	/*virtual*/ BOOL		handleToolTip(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL		handleMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleMouseUp(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleMiddleMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleMiddleMouseUp(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleRightMouseUp(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleDoubleClick(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleHover(S32 x, S32 y, MASK mask) override;
+	/*virtual*/ BOOL		handleScrollWheel(S32 x, S32 y, S32 clicks) override;
+	/*virtual*/ BOOL		handleToolTip(S32 x, S32 y, MASK mask) override;
 
 	// LLView interface
-	/*virtual*/ void		reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-	/*virtual*/ void		draw();
+	/*virtual*/ const std::string getToolTip() const override;
+	/*virtual*/ void		reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override;
+	/*virtual*/ void		draw() override;
 
 	// LLUICtrl interface
-	/*virtual*/ BOOL		acceptsTextInput() const { return !mReadOnly; }
-	/*virtual*/ void		setColor( const LLColor4& c );
+	/*virtual*/ BOOL		acceptsTextInput() const override { return !mReadOnly; }
+	/*virtual*/ void		setColor(const LLColor4& c) override;
 	virtual     void 		setReadOnlyColor(const LLColor4 &c);
-	virtual	    void		onVisibilityChange( BOOL new_visibility );
+	/*virtual*/ void		onVisibilityChange(BOOL new_visibility) override;
 
-	/*virtual*/ void		setValue(const LLSD& value );
-	/*virtual*/ LLTextViewModel* getViewModel() const;
+	/*virtual*/ void		setValue(const LLSD& value) override;
+	/*virtual*/ LLTextViewModel* getViewModel() const override;
 
 	// LLEditMenuHandler interface
-	/*virtual*/ BOOL		canDeselect() const;
-	/*virtual*/ void		deselect();
+	/*virtual*/ BOOL		canDeselect() const override;
+	/*virtual*/ void		deselect() override;
 
-	virtual void	onFocusReceived();
-	virtual void	onFocusLost();
+	virtual void	onFocusReceived() override;
+	virtual void	onFocusLost() override;
 
     void        setParseHTML(bool parse_html) { mParseHTML = parse_html; }
 
 	// LLSpellCheckMenuHandler overrides
-	/*virtual*/ bool		getSpellCheck() const;
+	/*virtual*/ bool		getSpellCheck() const override;
 
-	/*virtual*/ const std::string& getSuggestion(U32 index) const;
-	/*virtual*/ U32			getSuggestionCount() const;
-	/*virtual*/ void		replaceWithSuggestion(U32 index);
+	/*virtual*/ const std::string& getSuggestion(U32 index) const override;
+	/*virtual*/ U32			getSuggestionCount() const override;
+	/*virtual*/ void		replaceWithSuggestion(U32 index) override;
 
-	/*virtual*/ void		addToDictionary();
-	/*virtual*/ bool		canAddToDictionary() const;
+	/*virtual*/ void		addToDictionary() override;
+	/*virtual*/ bool		canAddToDictionary() const override;
 
-	/*virtual*/ void		addToIgnore();
-	/*virtual*/ bool		canAddToIgnore() const;
+	/*virtual*/ void		addToIgnore() override;
+	/*virtual*/ bool		canAddToIgnore() const override;
 
 	// Spell checking helper functions
 	std::string				getMisspelledWord(U32 pos) const;
@@ -432,7 +433,7 @@ public:
 	void					appendText(const std::string &new_text, bool prepend_newline, const LLStyle::Params& input_params = LLStyle::Params());
 
 	void					setLabel(const LLStringExplicit& label);
-	virtual BOOL			setLabelArg(const std::string& key, const LLStringExplicit& text );
+	/*virtual*/ BOOL		setLabelArg(const std::string& key, const LLStringExplicit& text) override;
 
 	const	std::string& 	getLabel()	{ return mLabel.getString(); }
 	const	LLWString&		getWlabel() { return mLabel.getWString();}
@@ -649,7 +650,8 @@ protected:
 	S32 normalizeUri(std::string& uri);
 	
 protected:
-	virtual std::string _getSearchText() const
+	// virtual
+	std::string _getSearchText() const override
 	{
 		return mLabel.getString() + getToolTip();
 	}
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 0afccef735..139eb17efa 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -60,6 +60,7 @@ static const S32 LINE_HEIGHT = 15;
 
 S32		LLView::sDepth = 0;
 bool	LLView::sDebugRects = false;
+bool	LLView::sDebugUnicode = false;
 bool	LLView::sIsRectDirty = false;
 LLRect	LLView::sDirtyRect;
 bool	LLView::sDebugRectsShowNames = true;
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index b498451dce..6e16d41cba 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -659,6 +659,9 @@ public:
 	// Draw debug rectangles around widgets to help with alignment and spacing
 	static bool	sDebugRects;
 
+	// Show hexadecimal byte values of unicode symbols in a tooltip
+	static bool	sDebugUnicode;
+
 	static bool sIsRectDirty;
 	static LLRect sDirtyRect;
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8419555445..2cf341f87f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1437,6 +1437,30 @@ class LLAdvancedCheckDebugViews : public view_listener_t
 
 
 
+///////////////////
+// DEBUG UNICODE //
+///////////////////
+
+
+class LLAdvancedToggleDebugUnicode : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLView::sDebugUnicode = !(LLView::sDebugUnicode);
+		return true;
+	}
+};
+
+class LLAdvancedCheckDebugUnicode : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		return LLView::sDebugUnicode;
+	}
+};
+
+
+
 ///////////////////////
 // XUI NAME TOOLTIPS //
 ///////////////////////
@@ -9509,6 +9533,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLAdvancedCheckDebugClicks(), "Advanced.CheckDebugClicks");
 	view_listener_t::addMenu(new LLAdvancedCheckDebugViews(), "Advanced.CheckDebugViews");
 	view_listener_t::addMenu(new LLAdvancedToggleDebugViews(), "Advanced.ToggleDebugViews");
+	view_listener_t::addMenu(new LLAdvancedCheckDebugUnicode(), "Advanced.CheckDebugUnicode");
+	view_listener_t::addMenu(new LLAdvancedToggleDebugUnicode(), "Advanced.ToggleDebugUnicode");
 	view_listener_t::addMenu(new LLAdvancedToggleXUINameTooltips(), "Advanced.ToggleXUINameTooltips");
 	view_listener_t::addMenu(new LLAdvancedCheckXUINameTooltips(), "Advanced.CheckXUINameTooltips");
 	view_listener_t::addMenu(new LLAdvancedToggleDebugMouseEvents(), "Advanced.ToggleDebugMouseEvents");
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index c3e002e97d..1b6bc7025a 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -288,7 +288,7 @@
                          expand_lines_count="5"
                          follows="left|right|bottom"
                          font="SansSerifSmall"
-                         height="20"    
+                         height="20"
                          is_expandable="true"
                          text_tentative_color="TextFgTentativeColor"
                          bg_writeable_color="ScriptBackground"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 171c0f4f6d..38763cd9a8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3610,6 +3610,14 @@ function="World.EnvPreset"
                 <menu_item_check.on_click
                  function="Advanced.ToggleDebugViews" />
             </menu_item_check>
+            <menu_item_check
+             label="Debug Unicode"
+             name="Debug Unicode">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugUnicode" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugUnicode" />
+            </menu_item_check>
             <menu_item_check
              label="Debug Name Tooltips"
              name="Debug Name Tooltips">
-- 
cgit v1.2.3


From a2552a555669490dc2ca173a48989d1b30e62c56 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 8 Feb 2024 21:03:59 +0100
Subject: Build fix for Visual Studio patch

---
 indra/llcommon/llbase64.cpp            | 4 ++--
 indra/llcommon/llrand.cpp              | 2 +-
 indra/llcommon/llsd.h                  | 4 ++--
 indra/llcommon/llsdserialize.cpp       | 2 +-
 indra/llcommon/llsdserialize_xml.cpp   | 4 ++--
 indra/llcommon/llsys.cpp               | 2 +-
 indra/llcommon/lltrace.cpp             | 2 +-
 indra/llcommon/lltraceaccumulators.cpp | 2 +-
 indra/llcorehttp/bufferarray.cpp       | 2 +-
 indra/newview/llmaterialeditor.cpp     | 8 ++++----
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/indra/llcommon/llbase64.cpp b/indra/llcommon/llbase64.cpp
index bb85fe32a3..433b54f6f8 100644
--- a/indra/llcommon/llbase64.cpp
+++ b/indra/llcommon/llbase64.cpp
@@ -42,7 +42,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size)
 		&& input_size > 0)
 	{
 		// Yes, it returns int.
-		int b64_buffer_length = apr_base64_encode_len(narrow(input_size));
+		int b64_buffer_length = apr_base64_encode_len(narrow<size_t>(input_size));
 		char* b64_buffer = new char[b64_buffer_length];
 		
 		// This is faster than apr_base64_encode() if you know
@@ -52,7 +52,7 @@ std::string LLBase64::encode(const U8* input, size_t input_size)
 		b64_buffer_length = apr_base64_encode_binary(
 			b64_buffer,
 			input,
-			narrow(input_size));
+			narrow<size_t>(input_size));
 		output.assign(b64_buffer);
 		delete[] b64_buffer;
 	}
diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp
index e4065e23bf..0192111574 100644
--- a/indra/llcommon/llrand.cpp
+++ b/indra/llcommon/llrand.cpp
@@ -85,7 +85,7 @@ inline F32 ll_internal_random<F32>()
 	// Per Monty, it's important to clamp using the correct fmodf() rather
 	// than expanding to F64 for fmod() and then truncating back to F32. Prior
 	// to this change, we were getting sporadic ll_frand() == 1.0 results.
-	F32 rv{ narrow(gRandomGenerator()) };
+	F32 rv{ narrow<F32>(gRandomGenerator()) };
 	if(!((rv >= 0.0f) && (rv < 1.0f))) return fmodf(rv, 1.0f);
 	return rv;
 }
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index cdb9a7ed8a..8ed254919c 100644
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -197,12 +197,12 @@ public:
 				  typename std::enable_if<std::is_integral<VALUE>::value &&
 										  ! std::is_same<VALUE, Boolean>::value,
 										  bool>::type = true>
-		LLSD(VALUE v): LLSD(Integer(narrow(v))) {}
+		LLSD(VALUE v): LLSD(Integer(narrow<VALUE>(v))) {}
 		// support construction from F32 et al.
 		template <typename VALUE,
 				  typename std::enable_if<std::is_floating_point<VALUE>::value,
 										  bool>::type = true>
-		LLSD(VALUE v): LLSD(Real(narrow(v))) {}
+		LLSD(VALUE v): LLSD(Real(narrow<VALUE>(v))) {}
 	//@}
 	
 	/** @name Scalar Assignment */
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index a475be6293..76171f2dfd 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -2174,7 +2174,7 @@ std::string zip_llsd(LLSD& data)
 
 	U8 out[CHUNK];
 
-	strm.avail_in = narrow(source.size());
+	strm.avail_in = narrow<size_t>(source.size());
 	strm.next_in = (U8*) source.data();
 	U8* output = NULL;
 
diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index 38b11eb32b..1511983596 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -196,12 +196,12 @@ S32 LLSDXMLFormatter::format_impl(const LLSD& data, std::ostream& ostr,
 			// *FIX: memory inefficient.
 			// *TODO: convert to use LLBase64
 			ostr << pre << "<binary encoding=\"base64\">";
-			int b64_buffer_length = apr_base64_encode_len(narrow(buffer.size()));
+			int b64_buffer_length = apr_base64_encode_len(narrow<size_t>(buffer.size()));
 			char* b64_buffer = new char[b64_buffer_length];
 			b64_buffer_length = apr_base64_encode_binary(
 				b64_buffer,
 				&buffer[0],
-				narrow(buffer.size()));
+				narrow<size_t>(buffer.size()));
 			ostr.write(b64_buffer, b64_buffer_length - 1);
 			delete[] b64_buffer;
 			ostr << "</binary>" << post;
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 938685bae6..2bf12fb0eb 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -917,7 +917,7 @@ void LLMemoryInfo::stream(std::ostream& s) const
 	// Now stream stats
 	BOOST_FOREACH(const MapEntry& pair, inMap(mStatsMap))
 	{
-		s << pfx << std::setw(narrow(key_width+1)) << (pair.first + ':') << ' ';
+		s << pfx << std::setw(narrow<size_t>(key_width+1)) << (pair.first + ':') << ' ';
 		LLSD value(pair.second);
 		if (value.isInteger())
 			s << std::setw(12) << value.asInteger();
diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp
index bce186054f..87457ad907 100644
--- a/indra/llcommon/lltrace.cpp
+++ b/indra/llcommon/lltrace.cpp
@@ -63,7 +63,7 @@ void TimeBlockTreeNode::setParent( BlockTimerStatHandle* parent )
 	llassert_always(parent != mBlock);
 	llassert_always(parent != NULL);
 
-	TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(narrow(parent->getIndex()));
+	TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(narrow<size_t>(parent->getIndex()));
 	if (!parent_tree_node) return;
 
 	if (mParent)
diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp
index 5fafb53832..b5b32cba38 100644
--- a/indra/llcommon/lltraceaccumulators.cpp
+++ b/indra/llcommon/lltraceaccumulators.cpp
@@ -77,7 +77,7 @@ void AccumulatorBufferGroup::makeCurrent()
 	// update stacktimer parent pointers
 	for (size_t i = 0, end_i = mStackTimers.size(); i < end_i; i++)
 	{
-		TimeBlockTreeNode* tree_node = thread_recorder->getTimeBlockTreeNode(narrow(i));
+		TimeBlockTreeNode* tree_node = thread_recorder->getTimeBlockTreeNode(narrow<size_t>(i));
 		if (tree_node)
 		{
 			timer_accumulator_buffer[i].mParent = tree_node->mParent;
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp
index 8d2e7c6a63..c780c06b4e 100644
--- a/indra/llcorehttp/bufferarray.cpp
+++ b/indra/llcorehttp/bufferarray.cpp
@@ -288,7 +288,7 @@ int BufferArray::findBlock(size_t pos, size_t * ret_offset)
 	if (pos >= mLen)
 		return -1;		// Doesn't exist
 
-	const int block_limit(narrow(mBlocks.size()));
+	const int block_limit(narrow<size_t>(mBlocks.size()));
 	for (int i(0); i < block_limit; ++i)
 	{
 		if (pos < mBlocks[i]->mUsed)
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 292ddb765f..1f5974c74d 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2228,7 +2228,7 @@ bool LLMaterialEditor::canModifyObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_MODIFY}), ItemSource::OBJECT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_MODIFY}), ItemSource::OBJECT, permissions, item_out);
 }
 
 bool LLMaterialEditor::canSaveObjectsMaterial()
@@ -2236,7 +2236,7 @@ bool LLMaterialEditor::canSaveObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item_out);
 }
 
 bool LLMaterialEditor::canClipboardObjectsMaterial()
@@ -2262,7 +2262,7 @@ bool LLMaterialEditor::canClipboardObjectsMaterial()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item_out;
-    return can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), ItemSource::OBJECT, permissions, item_out);
+    return can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY, PERM_TRANSFER}), ItemSource::OBJECT, permissions, item_out);
 }
 
 void LLMaterialEditor::saveObjectsMaterialAs()
@@ -2270,7 +2270,7 @@ void LLMaterialEditor::saveObjectsMaterialAs()
     LLSelectedTEGetMatData func(true);
     LLPermissions permissions;
     LLViewerInventoryItem* item = nullptr;
-    bool allowed = can_use_objects_material(func, std::vector({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item);
+    bool allowed = can_use_objects_material(func, std::vector<PermissionBit>({PERM_COPY, PERM_MODIFY}), ItemSource::AGENT, permissions, item);
     if (!allowed)
     {
         LL_WARNS("MaterialEditor") << "Failed to save GLTF material from object" << LL_ENDL;
-- 
cgit v1.2.3


From 5bd9c86314bf8ae57899654320fe212416435bc8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 8 Feb 2024 21:24:22 +0100
Subject: #746 BugSplat Crash: LLAccordionCtrlTab::showAndFocusHeader(873)

---
 indra/newview/lloutfitgallery.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index e621c32911..65ec38a41d 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -1094,8 +1094,11 @@ bool LLOutfitGalleryItem::openOutfitsContent()
             {
                 outfit_list->setSelectedOutfitByUUID(mUUID);
                 LLAccordionCtrlTab* tab = accordion->getSelectedTab();
-                tab->showAndFocusHeader();
-                return true;
+                if (tab)
+                {
+                    tab->showAndFocusHeader();
+                    return true;
+                }
             }
         }
     }
-- 
cgit v1.2.3


From afc9252372b2b511bb3f7caaaa0856989bbd3f46 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 8 Feb 2024 21:55:59 +0100
Subject: SL-20363 Option 'Debug Unicode' - show unicode values

---
 indra/llcommon/llstring.cpp | 87 +++++++++++++++++++++++++++++++++++++++------
 indra/llcommon/llstring.h   |  2 ++
 2 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index ab34262515..82dc7c9f80 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -645,49 +645,114 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
 	return out;
 }
 
+llwchar utf8str_to_wchar(const std::string& utf8str, size_t offset, size_t length)
+{
+    switch (length)
+    {
+    case 2:
+        return ((utf8str[offset] & 0x1F) << 6) +
+                (utf8str[offset + 1] & 0x3F);
+    case 3:
+        return ((utf8str[offset] & 0x0F) << 12) +
+                ((utf8str[offset + 1] & 0x3F) << 6) +
+                (utf8str[offset + 2] & 0x3F);
+    case 4:
+        return ((utf8str[offset] & 0x07) << 18) +
+                ((utf8str[offset + 1] & 0x3F) << 12) +
+                ((utf8str[offset + 2] & 0x3F) << 6) +
+                (utf8str[offset + 3] & 0x3F);
+    case 5:
+        return ((utf8str[offset] & 0x03) << 24) +
+                ((utf8str[offset + 1] & 0x3F) << 18) +
+                ((utf8str[offset + 2] & 0x3F) << 12) +
+                ((utf8str[offset + 3] & 0x3F) << 6) +
+                (utf8str[offset + 4] & 0x3F);
+    case 6:
+        return ((utf8str[offset] & 0x01) << 30) +
+                ((utf8str[offset + 1] & 0x3F) << 24) +
+                ((utf8str[offset + 2] & 0x3F) << 18) +
+                ((utf8str[offset + 3] & 0x3F) << 12) +
+                ((utf8str[offset + 4] & 0x3F) << 6) +
+                (utf8str[offset + 5] & 0x3F);
+    case 7:
+        return ((utf8str[offset + 1] & 0x03) << 30) +
+                ((utf8str[offset + 2] & 0x3F) << 24) +
+                ((utf8str[offset + 3] & 0x3F) << 18) +
+                ((utf8str[offset + 4] & 0x3F) << 12) +
+                ((utf8str[offset + 5] & 0x3F) << 6) +
+                (utf8str[offset + 6] & 0x3F);
+    }
+    return LL_UNKNOWN_CHAR;
+}
+
 std::string utf8str_showBytesUTF8(const std::string& utf8str)
 {
     std::string result;
 
     bool in_sequence = false;
-    for (U8 byte : utf8str)
+    size_t sequence_size = 0;
+    size_t byte_index = 0;
+    size_t source_length = utf8str.size();
+
+    auto open_sequence = [&]()
+        {
+            if (!result.empty() && result.back() != '\n')
+                result += '\n'; // Use LF as a separator before new UTF-8 sequence
+            result += '[';
+            in_sequence = true;
+        };
+
+    auto close_sequence = [&]()
+        {
+            llwchar unicode = utf8str_to_wchar(utf8str, byte_index - sequence_size, sequence_size);
+            if (unicode != LL_UNKNOWN_CHAR)
+            {
+                result += llformat("+%04X", unicode);
+            }
+            result += ']';
+            in_sequence = false;
+            sequence_size = 0;
+        };
+
+    while (byte_index < source_length)
     {
+        U8 byte = utf8str[byte_index];
         if (byte >= 0x80) // Part of an UTF-8 sequence
         {
             if (!in_sequence) // Start new UTF-8 sequence
             {
-                if (!result.empty() && result.back() != ' ')
-                    result += ' '; // Use space as separator between ASCII and UTF-8
-                result += '[';
+                open_sequence();
             }
             else if (byte >= 0xC0) // Start another UTF-8 sequence
             {
-                result += "] ["; // Use space as separator between UTF-8 and UTF-8
+                close_sequence();
+                open_sequence();
             }
             else // Continue the same UTF-8 sequence
             {
                 result += '.';
             }
             result += llformat("%02X", byte); // The byte is represented in hexadecimal form
-            in_sequence = true;
+            ++sequence_size;
         }
         else // ASCII symbol is represented as a character
         {
             if (in_sequence) // End of UTF-8 sequence
             {
-                result += ']';
-                if (byte != ' ')
+                close_sequence();
+                if (byte != '\n')
                 {
-                    result += ' '; // Use space as separator between UTF-8 and ASCII
+                    result += '\n'; // Use LF as a separator between UTF-8 and ASCII
                 }
             }
             result += byte;
-            in_sequence = false;
         }
+        ++byte_index;
     }
+
     if (in_sequence) // End of UTF-8 sequence
     {
-        result += ']';
+        close_sequence();
     }
 
     return result;
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 38b9c3e23c..bfbf25d9ab 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -743,6 +743,8 @@ LL_COMMON_API std::string mbcsstring_makeASCII(const std::string& str);
 
 LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str);
 
+LL_COMMON_API llwchar utf8str_to_wchar(const std::string& utf8str, size_t offset, size_t length);
+
 LL_COMMON_API std::string utf8str_showBytesUTF8(const std::string& utf8str);
 
 #if LL_WINDOWS
-- 
cgit v1.2.3


From b4e29ec0e922368f23fc735fd4719f205cc760eb Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 9 Feb 2024 12:54:09 +0100
Subject: #68 The 'Recently used emoji' can not be selected by the 'Tab' key

---
 indra/newview/llfloaterimsessiontab.cpp                   | 1 +
 indra/newview/skins/default/xui/en/floater_im_session.xml | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 2cb2ea0553..24cc398f3b 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -465,6 +465,7 @@ void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked()
 
 void LLFloaterIMSessionTab::onEmojiPickerShowBtnClicked()
 {
+    mInputEditor->setFocus(TRUE);
     mInputEditor->showEmojiHelper();
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 1b6bc7025a..a6493c5e24 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -305,7 +305,6 @@
                          tool_tip="Shows/hides recent emojis"
                          follows="right|bottom"
                          font="EmojiLarge"
-                         tab_stop="false"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
@@ -354,7 +353,6 @@
                  name="emoji_recent_icons_ctrl"
                  follows="top|left|right"
                  layout="topleft"
-                 tab_stop="false"
                  max_visible="20"
                  top="0"
                  left="1"
@@ -366,7 +364,6 @@
                  tool_tip="Shows/hides emoji picker"
                  follows="right|bottom"
                  layout="topleft"
-                 tab_stop="false"
                  bottom="-5"
                  right="-3"
                  height="20"
-- 
cgit v1.2.3


From 1820095dd4a64c142e14869c76ae09e1e0ca6a12 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 12 Feb 2024 19:01:00 +0100
Subject: #779 Emoji picker is an unintuitive UX disaster

---
 indra/newview/llfloateremojipicker.cpp | 62 ++++++++++++++++++++++++++++++----
 indra/newview/llfloateremojipicker.h   |  2 ++
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 2380fd357b..1578caa39c 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -953,6 +953,43 @@ void LLFloaterEmojiPicker::selectFocusedIcon()
     }
 }
 
+bool LLFloaterEmojiPicker::moveFocusedIconUp()
+{
+    for (S32 i = mFocusedIconRow - 1; i >= 0; --i)
+    {
+        LLScrollingPanel* panel = mEmojiGrid->getPanelList()[i];
+        LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
+        if (row && row->mList->getPanelList().size() > mFocusedIconCol)
+        {
+            mEmojiScroll->scrollToShowRect(row->getBoundingRect());
+            mFocusedIconRow = i;
+            selectFocusedIcon();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool LLFloaterEmojiPicker::moveFocusedIconDown()
+{
+    S32 rowCount = mEmojiGrid->getPanelList().size();
+    for (S32 i = mFocusedIconRow + 1; i < rowCount; ++i)
+    {
+        LLScrollingPanel* panel = mEmojiGrid->getPanelList()[i];
+        LLEmojiGridRow* row = dynamic_cast<LLEmojiGridRow*>(panel);
+        if (row && row->mList->getPanelList().size() > mFocusedIconCol)
+        {
+            mEmojiScroll->scrollToShowRect(row->getBoundingRect());
+            mFocusedIconRow = i;
+            selectFocusedIcon();
+            return true;
+        }
+    }
+
+    return false;
+}
+
 bool LLFloaterEmojiPicker::moveFocusedIconPrev()
 {
     if (mHoveredIcon)
@@ -1034,16 +1071,16 @@ BOOL LLFloaterEmojiPicker::handleKey(KEY key, MASK mask, BOOL called_from_parent
     {
         switch (key)
         {
-        case KEY_LEFT:
-            selectEmojiGroup((mSelectedGroupIndex + mFilteredEmojis.size()) % mGroupButtons.size());
+        case KEY_UP:
+            moveFocusedIconUp();
             return TRUE;
-        case KEY_RIGHT:
-            selectEmojiGroup((mSelectedGroupIndex + 1) % mGroupButtons.size());
+        case KEY_DOWN:
+            moveFocusedIconDown();
             return TRUE;
-        case KEY_UP:
+        case KEY_LEFT:
             moveFocusedIconPrev();
             return TRUE;
-        case KEY_DOWN:
+        case KEY_RIGHT:
             moveFocusedIconNext();
             return TRUE;
         case KEY_ESCAPE:
@@ -1052,6 +1089,19 @@ BOOL LLFloaterEmojiPicker::handleKey(KEY key, MASK mask, BOOL called_from_parent
         }
     }
 
+    if (mask == MASK_ALT)
+    {
+        switch (key)
+        {
+        case KEY_LEFT:
+            selectEmojiGroup((mSelectedGroupIndex + mFilteredEmojis.size()) % mGroupButtons.size());
+            return TRUE;
+        case KEY_RIGHT:
+            selectEmojiGroup((mSelectedGroupIndex + 1) % mGroupButtons.size());
+            return TRUE;
+        }
+    }
+
     if (key == KEY_RETURN)
     {
         U64 time = totalTime();
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index f169d67a4e..5d0402ca83 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -85,6 +85,8 @@ private:
     void onEmojiMouseUp(LLUICtrl* ctrl);
 
     void selectFocusedIcon();
+    bool moveFocusedIconUp();
+    bool moveFocusedIconDown();
     bool moveFocusedIconPrev();
     bool moveFocusedIconNext();
 
-- 
cgit v1.2.3


From ff543b744ee0b0fd4dd90b46419ae50a570572ab Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 15 Feb 2024 11:21:31 -0500
Subject: Engage new viewer-build-util/which-branch with relnotes output.

Put whatever release notes we retrieve into the generated release page.
---
 .github/workflows/build.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 19a6a0ef6f..73df01b8cf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,6 +25,7 @@ jobs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
       viewer_version: ${{ steps.build.outputs.viewer_version }}
       viewer_branch:  ${{ steps.which-branch.outputs.branch }}
+      relnotes:       ${{ steps.which-branch.outputs.relnotes }}
       imagename: ${{ steps.build.outputs.imagename }}
     env:
       AUTOBUILD_ADDRSIZE: 64
@@ -102,7 +103,7 @@ jobs:
 
       - name: Determine source branch
         id: which-branch
-        uses: secondlife/viewer-build-util/which-branch@v1
+        uses: secondlife/viewer-build-util/which-branch@relnotes
         with:
           token: ${{ github.token }}
 
@@ -377,6 +378,7 @@ jobs:
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
             ${{ needs.build.outputs.viewer_branch }}
+            ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
           append_body: true
-- 
cgit v1.2.3


From 5e697cc04c0dd876e2484dbe49e32ddd7a711b3d Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 21 Feb 2024 00:31:08 +0200
Subject: SL-20469 Crash at dead mRootVolp in getAttachedAvatar()

---
 indra/newview/llcontrolavatar.cpp | 6 ++++--
 indra/newview/llviewerobject.cpp  | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 50b9af668b..d764f64c79 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -99,7 +99,6 @@ LLVOAvatar *LLControlAvatar::getAttachedAvatar()
 
 void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_scale_fixup) const
 {
-
     F32 max_legal_offset = MAX_LEGAL_OFFSET;
     if (gSavedSettings.getControl("AnimatedObjectsMaxLegalOffset"))
     {
@@ -362,6 +361,9 @@ LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
 void LLControlAvatar::markForDeath()
 {
     mMarkedForDeath = true;
+    // object unlinked cav and might be dead already
+    // might need to clean mControlAVBridge here as well
+    mRootVolp = NULL;
 }
 
 void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
@@ -440,7 +442,7 @@ void LLControlAvatar::updateDebugText()
         F32 streaming_cost = 0.f;
         std::string cam_dist_string = "";
         S32 cam_dist_count = 0;
-        F32 lod_radius = mRootVolp->mLODRadius;
+        F32 lod_radius = mRootVolp ? mRootVolp->mLODRadius : 0.f;
 
         for (std::vector<LLVOVolume*>::iterator it = volumes.begin();
              it != volumes.end(); ++it)
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d46339e2fd..fc055a7303 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -392,6 +392,12 @@ LLViewerObject::~LLViewerObject()
 	sNumZombieObjects--;
 	llassert(mChildList.size() == 0);
     llassert(mControlAvatar.isNull()); // Should have been cleaned by now
+    if (mControlAvatar.notNull())
+    {
+        mControlAvatar->markForDeath();
+        mControlAvatar = NULL;
+        LL_WARNS() << "Dead object owned a live control avatar" << LL_ENDL;
+    }
 
 	clearInventoryListeners();
 }
-- 
cgit v1.2.3


From da0f5ea0b4366ccc2b065103a7bc37552b1fe8de Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 22 Feb 2024 01:09:23 +0200
Subject: Viewer#863 Crash reading xml

---
 indra/llcommon/llsdserialize_xml.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index 1511983596..db61f4ae41 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -404,11 +404,18 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 		if (buffer)
 		{
 			((char*) buffer)[count ? count - 1 : 0] = '\0';
+            if (mEmitErrors)
+            {
+                LL_INFOS() << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*)buffer << LL_ENDL;
+            }
 		}
-		if (mEmitErrors)
-		{
-		LL_INFOS() << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << LL_ENDL;
-		}
+        else
+        {
+            if (mEmitErrors)
+            {
+                LL_INFOS() << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR, null buffer" << LL_ENDL;
+            }
+        }
 		data = LLSD();
 		return LLSDParser::PARSE_FAILURE;
 	}
-- 
cgit v1.2.3


From 4b24b0d933fa701720d876639d2bbdd9b834b725 Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 10:28:10 -0500
Subject: Create issue_template.md

Issue template for the "blank issue" option
---
 .github/ISSUE_TEMPLATE/issue_template.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/issue_template.md

diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
new file mode 100644
index 0000000000..96e71e64f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -0,0 +1,3 @@
+---
+labels: triage
+---
-- 
cgit v1.2.3


From e452eeb81685b82581b7a3893b4cdbf0546a401c Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:24:55 -0500
Subject: Update issue_template.md

---
 .github/ISSUE_TEMPLATE/issue_template.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
index 96e71e64f5..b78a5f7774 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -1,3 +1,5 @@
 ---
+name: default issue
+description: template for default new issue if no template is selected
 labels: triage
 ---
-- 
cgit v1.2.3


From b9ac5e843331e34d9ec64ae60c4d2fef2994d3a7 Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:26:54 -0500
Subject: Update issue_template.md

---
 .github/ISSUE_TEMPLATE/issue_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
index b78a5f7774..0a106ca1e2 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -1,5 +1,5 @@
 ---
 name: default issue
-description: template for default new issue if no template is selected
+about: template for default new issue if no template is selected
 labels: triage
 ---
-- 
cgit v1.2.3


From ffef19843b79c53aa710ed475d526f0d8f91866b Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:28:44 -0500
Subject: Delete .github/ISSUE_TEMPLATE/issue_template.md

---
 .github/ISSUE_TEMPLATE/issue_template.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/issue_template.md

diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
deleted file mode 100644
index 0a106ca1e2..0000000000
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-name: default issue
-about: template for default new issue if no template is selected
-labels: triage
----
-- 
cgit v1.2.3


From 0f2248ea12713822c546e362487aa94bb29e2899 Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Thu, 22 Feb 2024 13:01:49 -0800
Subject: Improving issue templates. (#877)

making ordering explicit, and disabling blank issue submission to force
triage label to be set.
---
 .github/ISSUE_TEMPLATE/10-bug.yaml       | 36 ++++++++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/20-enhancement.md | 12 +++++++++++
 .github/ISSUE_TEMPLATE/30-blank.yaml     | 10 +++++++++
 .github/ISSUE_TEMPLATE/bug.yaml          | 36 --------------------------------
 .github/ISSUE_TEMPLATE/config.yml        |  1 +
 .github/ISSUE_TEMPLATE/enhancement.md    | 12 -----------
 6 files changed, 59 insertions(+), 48 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/10-bug.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/20-enhancement.md
 create mode 100644 .github/ISSUE_TEMPLATE/30-blank.yaml
 delete mode 100644 .github/ISSUE_TEMPLATE/bug.yaml
 delete mode 100644 .github/ISSUE_TEMPLATE/enhancement.md

diff --git a/.github/ISSUE_TEMPLATE/10-bug.yaml b/.github/ISSUE_TEMPLATE/10-bug.yaml
new file mode 100644
index 0000000000..41208e8bf5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/10-bug.yaml
@@ -0,0 +1,36 @@
+name: Bug report
+description: Viewer bug report
+labels: [bug, triage]
+body:
+- type: markdown
+  attributes:
+    value: |
+      - Write a descriptive bug title above.
+      - Search [open](https://github.com/secondlife/viewer/issues?q=is%3Aopen+label%3Abug+is%3Aissue) bugs to ensure that the issue has not already been identified.
+
+- type: textarea
+  attributes:
+    label: Environment
+    description: About Second Life Text
+    placeholder: ex. Second Life Test 7.1.3.240191747 (64bit) ...
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Description
+    description: Explain the problem.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Reproduction steps
+    description: Steps to reproduce this bug
+    placeholder: |
+      1. First step
+      2. Second step
+      Expected: ...
+      Actual: ...
+  validations:
+    required: true
diff --git a/.github/ISSUE_TEMPLATE/20-enhancement.md b/.github/ISSUE_TEMPLATE/20-enhancement.md
new file mode 100644
index 0000000000..dd40478811
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/20-enhancement.md
@@ -0,0 +1,12 @@
+---
+name: Enhancement
+about: New feature or enhancement
+title: New Feature
+labels: enhancement, triage
+---
+
+_What does this feature/enhancement do? Why is it needed?_
+
+## Test Plan
+
+_Include information, such as guidance and test scenarios, QA will need to test this feature._
diff --git a/.github/ISSUE_TEMPLATE/30-blank.yaml b/.github/ISSUE_TEMPLATE/30-blank.yaml
new file mode 100644
index 0000000000..abe2623378
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/30-blank.yaml
@@ -0,0 +1,10 @@
+name: Blank Issue
+description: Don’t see your issue here? Open a blank issue.
+labels: [triage]
+body:
+- type: textarea
+  attributes:
+    label: Description
+    description: Please describe your issue.
+  validations:
+    required: true
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
deleted file mode 100644
index 41208e8bf5..0000000000
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Bug report
-description: Viewer bug report
-labels: [bug, triage]
-body:
-- type: markdown
-  attributes:
-    value: |
-      - Write a descriptive bug title above.
-      - Search [open](https://github.com/secondlife/viewer/issues?q=is%3Aopen+label%3Abug+is%3Aissue) bugs to ensure that the issue has not already been identified.
-
-- type: textarea
-  attributes:
-    label: Environment
-    description: About Second Life Text
-    placeholder: ex. Second Life Test 7.1.3.240191747 (64bit) ...
-  validations:
-    required: true
-
-- type: textarea
-  attributes:
-    label: Description
-    description: Explain the problem.
-  validations:
-    required: true
-
-- type: textarea
-  attributes:
-    label: Reproduction steps
-    description: Steps to reproduce this bug
-    placeholder: |
-      1. First step
-      2. Second step
-      Expected: ...
-      Actual: ...
-  validations:
-    required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 75fa187132..f2d58f5f65 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,3 +1,4 @@
+blank_issues_enabled: false
 contact_links:
 - name: 💬 Community Feedback (Canny)
   url: https://feedback.secondlife.com
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
deleted file mode 100644
index dd40478811..0000000000
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Enhancement
-about: New feature or enhancement
-title: New Feature
-labels: enhancement, triage
----
-
-_What does this feature/enhancement do? Why is it needed?_
-
-## Test Plan
-
-_Include information, such as guidance and test scenarios, QA will need to test this feature._
-- 
cgit v1.2.3


From ae7b318e7f21d0d372d48a635ff1e2ea59c4acf6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 22 Feb 2024 21:48:46 +0200
Subject: viewer#875 Crash at uri normalization

Note that crash happened when setting LLProgressView::setMessage
---
 indra/llcommon/lluriparser.cpp | 18 ++++++++++++------
 indra/llui/llurlentry.cpp      | 18 ++++++++++++------
 indra/llui/llurlregistry.cpp   |  6 ++++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
index e4f229dd16..f79a98a56d 100644
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@@ -164,8 +164,10 @@ void LLUriParser::extractParts()
 #if LL_DARWIN
 typedef void(*sighandler_t)(int);
 jmp_buf return_to_normalize;
+static int sLastSignal = 0;
 void uri_signal_handler(int signal)
 {
+    sLastSignal = signal;
     // Apparently signal handler throwing an exception doesn't work.
     // This is ugly and unsafe due to not unwinding content of uriparser library,
     // but unless we have a way to catch this as NSexception, jump appears to be the only option.
@@ -179,8 +181,10 @@ S32 LLUriParser::normalize()
 	if (!mRes)
 	{
 #if LL_DARWIN
-        sighandler_t last_handler;
-        last_handler = signal(SIGILL, &uri_signal_handler);		// illegal instruction
+        sighandler_t last_sigill_handler, last_sigbus_handler;
+        last_sigill_handler = signal(SIGILL, &uri_signal_handler);		// illegal instruction
+        last_sigbus_handler = signal(SIGBUS, &uri_signal_handler);
+        
         if (setjmp(return_to_normalize))
         {
             // Issue: external library crashed via signal
@@ -194,8 +198,9 @@ S32 LLUriParser::normalize()
             // if this can be handled by NSexception, it needs to be remade
             llassert(0);
 
-            LL_WARNS() << "Uriparser crashed with SIGILL, while processing: " << mNormalizedUri << LL_ENDL;
-            signal(SIGILL, last_handler);
+            LL_WARNS() << "Uriparser crashed with " << sLastSignal << " , while processing: " << mNormalizedUri << LL_ENDL;
+            signal(SIGILL, last_sigill_handler);
+            signal(SIGBUS, last_sigbus_handler);
             return 1;
         }
 #endif
@@ -203,7 +208,8 @@ S32 LLUriParser::normalize()
         mRes = uriNormalizeSyntaxExA(&mUri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);
 
 #if LL_DARWIN
-        signal(SIGILL, last_handler);
+        signal(SIGILL, last_sigill_handler);
+        signal(SIGBUS, last_sigbus_handler);
 #endif
 
         if (!mRes)
@@ -226,7 +232,7 @@ S32 LLUriParser::normalize()
         }
 	}
 
-	if(mTmpScheme)
+	if(mTmpScheme && mNormalizedUri.size() > 7)
 	{
 		mNormalizedUri = mNormalizedUri.substr(7);
 		mTmpScheme = false;
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 77e9edf5e5..05d821f5d8 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -234,14 +234,20 @@ bool LLUrlEntryBase::isWikiLinkCorrect(const std::string &labeled_url) const
 
 std::string LLUrlEntryBase::urlToLabelWithGreyQuery(const std::string &url) const
 {
+    if (url.empty())
+    {
+        return url;
+    }
 	LLUriParser up(escapeUrl(url));
-	up.normalize();
-
-	std::string label;
-	up.extractParts();
-	up.glueFirst(label);
+	if (up.normalize() == 0)
+    {
+        std::string label;
+        up.extractParts();
+        up.glueFirst(label);
 
-	return unescapeUrl(label);
+        return unescapeUrl(label);
+    }
+    return std::string();
 }
 
 std::string LLUrlEntryBase::urlToGreyQuery(const std::string &url) const
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 3bd7321777..f1df7699e2 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -221,8 +221,10 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
 		if (match_entry == mUrlEntryTrusted)
 		{
 			LLUriParser up(url);
-			up.normalize();
-			url = up.normalizedUri();
+			if (up.normalize() == 0)
+            {
+                url = up.normalizedUri();
+            }
 		}
 
 		match.setValues(match_start, match_end,
-- 
cgit v1.2.3


From a908b4cfa98716d4a838fc1e5a6789faa15d16cf Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 11:23:47 -0500
Subject: Try to generate release notes for this specific branch.

Also try to cross-reference release page and build page.
---
 .github/workflows/build.yaml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1bc74fe084..c78c8c656b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -367,25 +367,30 @@ jobs:
           mv newview/viewer_version.txt macOS-viewer_version.txt
 
       # forked from softprops/action-gh-release
-      - uses: secondlife-3p/action-gh-release@v1
+      - name: Create GitHub release
+        id: release
+        uses: secondlife-3p/action-gh-release@v1
         with:
-          # name the release page for the build number so we can find it
-          # easily (analogous to looking up a codeticket build page)
-          name: "v${{ github.run_id }}"
+          # name the release page for the branch
+          name: "${{ needs.build.outputs.viewer_branch }}"
           # SL-20546: want the channel and version to be visible on the
           # release page
           body: |
+            Build ${{ github.repositoryUrl }}/actions/runs/${{ github.run_id }}
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
-            ${{ needs.build.outputs.viewer_branch }}
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
+          target_commitish: ${{ github.ref }}
           append_body: true
-          # the only reason we generate a GH release is to post build products
           fail_on_unmatched_files: true
           files: |
             *.dmg 
             *.exe
             *-autobuild-package.xml
             *-viewer_version.txt
+
+      - name: post release URL
+        run: |
+          echo "::notice::Release ${{ steps.release.outputs.url }}"
-- 
cgit v1.2.3


From c6a6db8488a8b3e7ea6534fbf5e2fe2b17864421 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 12:20:31 -0500
Subject: Try basing the GH release on github.ref_name instead of github.ref.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c78c8c656b..622ceb4afe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -382,7 +382,7 @@ jobs:
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
-          target_commitish: ${{ github.ref }}
+          target_commitish: ${{ github.ref_name }}
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 4edd78f2e54b3cd2e0b0a4b9300dfc669231dd98 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 13:26:29 -0500
Subject: Try basing release notes on github.sha rather than github.ref_name.

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 622ceb4afe..6f4325b9dd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -382,7 +382,7 @@ jobs:
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
-          target_commitish: ${{ github.ref_name }}
+          target_commitish: ${{ github.sha }}
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 88ebb92f05dade00cc8fc519cc062a458ecd48f2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 15:51:31 -0500
Subject: Leverage action-gh-release's new previous_tag input.

This should (!) allow us to generate full release notes relative to the
previous viewer release, instead of letting action-gh-release guess
incorrectly.

Also try again to add to the release page a back-link to the specific build.
---
 .github/workflows/build.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6f4325b9dd..c903f1b8ce 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -369,20 +369,21 @@ jobs:
       # forked from softprops/action-gh-release
       - name: Create GitHub release
         id: release
-        uses: secondlife-3p/action-gh-release@v1
+        uses: secondlife-3p/action-gh-release@feat/add-generateReleaseNotes
         with:
           # name the release page for the branch
           name: "${{ needs.build.outputs.viewer_branch }}"
           # SL-20546: want the channel and version to be visible on the
           # release page
           body: |
-            Build ${{ github.repositoryUrl }}/actions/runs/${{ github.run_id }}
+            Build ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
           target_commitish: ${{ github.sha }}
+          previous_tag: 7.1.2-release
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 27b298d8bc720ff315c8e74cc5bff9ff9ead0552 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 17:05:56 -0500
Subject: Base generated release notes on new floating tag 'release'

instead of on the current tag 7.1.2-release.
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c903f1b8ce..28310e54e2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -383,7 +383,7 @@ jobs:
           prerelease: true
           generate_release_notes: true
           target_commitish: ${{ github.sha }}
-          previous_tag: 7.1.2-release
+          previous_tag: release
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 563c35e1b4e5e0a1cd34dc92da917500f8a3d172 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Feb 2024 01:20:56 +0200
Subject: Issue#894 Crash at load3 in cacheOptimize

---
 indra/llmath/llvolume.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 6d36daa92a..e694732da2 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5592,9 +5592,9 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
 
         U32 stream_count = data.w.empty() ? 4 : 5;
 
-        U32 vert_count = meshopt_generateVertexRemapMulti(&remap[0], nullptr, data.p.size(), data.p.size(), mos, stream_count);
+        size_t vert_count = meshopt_generateVertexRemapMulti(&remap[0], nullptr, data.p.size(), data.p.size(), mos, stream_count);
 
-        if (vert_count < 65535)
+        if (vert_count < 65535 && vert_count != 0)
         {
             std::vector<U32> indices;
             indices.resize(mNumIndices);
@@ -5613,6 +5613,13 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
             {
                 U32 src_idx = i;
                 U32 dst_idx = remap[i];
+                if (dst_idx >= mNumVertices)
+                {
+                    dst_idx = mNumVertices - 1;
+                    // Shouldn't happen, figure out what gets returned in remap and why.
+                    llassert(false);
+                    LL_DEBUGS_ONCE("LLVOLUME") << "Invalid destination index, substituting" << LL_ENDL;
+                }
                 mIndices[i] = dst_idx;
 
                 mPositions[dst_idx].load3(data.p[src_idx].mV);
@@ -5646,6 +5653,10 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
         }
         else
         {
+            if (vert_count == 0)
+            {
+                LL_WARNS_ONCE("LLVOLUME") << "meshopt_generateVertexRemapMulti failed to process a model or model was invalid" << LL_ENDL;
+            }
             // blew past the max vertex size limit, use legacy tangent generation which never adds verts
             createTangents();
         }
-- 
cgit v1.2.3


From 44ea9490797ce0e984aadbf438c7a2aceef5ddf0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Feb 2024 23:00:37 +0200
Subject: Issue#900 Crash at LLInventoryAddItemByAssetObserver

---
 indra/newview/llinventoryobserver.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index fe067b621a..e1eaa18206 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -566,8 +566,12 @@ void LLInventoryAddItemByAssetObserver::changed(U32 mask)
 	for (uuid_set_t::iterator it = added.begin(); it != added.end(); ++it)
 	{
 		LLInventoryItem *item = gInventory.getItem(*it);
+        if (!item)
+        {
+            continue;
+        }
 		const LLUUID& asset_uuid = item->getAssetUUID();
-		if (item && item->getUUID().notNull() && asset_uuid.notNull())
+		if (item->getUUID().notNull() && asset_uuid.notNull())
 		{
 			if (isAssetWatched(asset_uuid))
 			{
-- 
cgit v1.2.3


From 18ec799992e0e2571ed3d3a61454be682a81aa16 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Feb 2024 23:02:00 +0200
Subject: SL-18721 Shutdown fixes #5

---
 indra/llcommon/threadpool.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp
index a063a01b82..c48989358e 100644
--- a/indra/llcommon/threadpool.cpp
+++ b/indra/llcommon/threadpool.cpp
@@ -120,8 +120,11 @@ void LL::ThreadPoolBase::close()
         mQueue->close();
         for (auto& pair: mThreads)
         {
-            LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL;
-            pair.second.join();
+            if (pair.second.joinable())
+            {
+                LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL;
+                pair.second.join();
+            }
         }
         LL_DEBUGS("ThreadPool") << mName << " shutdown complete" << LL_ENDL;
     }
-- 
cgit v1.2.3


From b42e01d7acf5d4c55612c3a7df0e1ff6ee5ed951 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 28 Feb 2024 08:45:12 -0500
Subject: Reference updated action-gh-release@v1

instead of the branch that got pulled.
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 28310e54e2..321ba281cf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -369,7 +369,7 @@ jobs:
       # forked from softprops/action-gh-release
       - name: Create GitHub release
         id: release
-        uses: secondlife-3p/action-gh-release@feat/add-generateReleaseNotes
+        uses: secondlife-3p/action-gh-release@v1
         with:
           # name the release page for the branch
           name: "${{ needs.build.outputs.viewer_branch }}"
-- 
cgit v1.2.3


From 701d1a33bb8227aa55a71f48caeb30a453e77ee0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 1 Mar 2024 10:26:00 -0500
Subject: Increment viewer version to 7.1.4 following promotion of
 secondlife/viewer #673

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 1996c50447..b7f8ee41e6 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.3
+7.1.4
-- 
cgit v1.2.3


From fe3be58938ec3a6241d011156cd6ff3607ed1602 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Feb 2024 21:14:39 +0200
Subject: SL-18721 Shutdown fixes #6

---
 indra/llwindow/llwindowwin32.cpp | 183 ++++++++++++++++++++++++---------------
 1 file changed, 113 insertions(+), 70 deletions(-)

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 8cc8f9c408..0d56d2f6f6 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -353,7 +353,7 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
     void run() override;
 
     // closes queue, wakes thread, waits until thread closes
-    void wakeAndClose();
+    void wakeAndDestroy();
 
     void glReady()
     {
@@ -366,6 +366,9 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
     // initialize D3D (if DXGI cannot be used)
     void initD3D();
 
+    //clean up DXGI/D3D resources
+    void cleanupDX();
+
     // call periodically to update available VRAM
     void updateVRAMUsage();
 
@@ -990,43 +993,10 @@ void LLWindowWin32::close()
 
 	LL_DEBUGS("Window") << "Destroying Window" << LL_ENDL;
 
-    mWindowThread->post([this, self = mWindowThread]()
-        {
-            if (IsWindow(self->mWindowHandleThrd))
-            {
-                if (self->mhDCThrd)
-                {
-                    if (!ReleaseDC(self->mWindowHandleThrd, self->mhDCThrd))
-                    {
-                        LL_WARNS("Window") << "Release of ghDC failed!" << LL_ENDL;
-                    }
-                }
-
-                // Make sure we don't leave a blank toolbar button.
-                ShowWindow(self->mWindowHandleThrd, SW_HIDE);
-
-                // This causes WM_DESTROY to be sent *immediately*
-                if (!destroy_window_handler(self->mWindowHandleThrd))
-                {
-                    OSMessageBox(mCallbacks->translateString("MBDestroyWinFailed"),
-                        mCallbacks->translateString("MBShutdownErr"),
-                        OSMB_OK);
-                }
-            }
-            else
-            {
-                // Something killed the window while we were busy destroying gl or handle somehow got broken
-                LL_WARNS("Window") << "Failed to destroy Window, invalid handle!" << LL_ENDL;
-            }
-            self->mWindowHandleThrd = NULL;
-            self->mhDCThrd = NULL;
-            self->mGLReady = false;
-        });
-
     mhDC = NULL;
     mWindowHandle = NULL;
     
-    mWindowThread->wakeAndClose();
+    mWindowThread->wakeAndDestroy();
 }
 
 BOOL LLWindowWin32::isValid()
@@ -4771,6 +4741,28 @@ void LLWindowWin32::LLWindowWin32Thread::initD3D()
     }
 }
 
+void LLWindowWin32::LLWindowWin32Thread::cleanupDX()
+{
+    //clean up DXGI/D3D resources
+    if (mDXGIAdapter)
+    {
+        mDXGIAdapter->Release();
+        mDXGIAdapter = nullptr;
+    }
+
+    if (mD3DDevice)
+    {
+        mD3DDevice->Release();
+        mD3DDevice = nullptr;
+    }
+
+    if (mD3D)
+    {
+        mD3D->Release();
+        mD3D = nullptr;
+    }
+}
+
 void LLWindowWin32::LLWindowWin32Thread::updateVRAMUsage()
 {
     LL_PROFILE_ZONE_SCOPED;
@@ -4918,58 +4910,109 @@ void LLWindowWin32::LLWindowWin32Thread::run()
 #endif
     }
 
-    //clean up DXGI/D3D resources
-    if (mDXGIAdapter)
+    cleanupDX();
+}
+
+void LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()
+{
+    if (mQueue->isClosed())
     {
-        mDXGIAdapter->Release();
-        mDXGIAdapter = nullptr;
+        LL_WARNS() << "Tried to close Queue. Win32 thread Queue already closed." <<LL_ENDL;
     }
 
-    if (mD3DDevice)
+    // Make sure we don't leave a blank toolbar button.
+    // Also hiding window now prevents user from suspending it
+    // via some action (like dragging it around)
+    ShowWindow(mWindowHandleThrd, SW_HIDE);
+
+    // Schedule destruction
+    HWND old_handle = mWindowHandleThrd;
+    post([this]()
+         {
+             if (IsWindow(mWindowHandleThrd))
+             {
+                 if (mhDCThrd)
+                 {
+                     if (!ReleaseDC(mWindowHandleThrd, mhDCThrd))
+                     {
+                         LL_WARNS("Window") << "Release of ghDC failed!" << LL_ENDL;
+                     }
+                     mhDCThrd = NULL;
+                 }
+
+                 // This causes WM_DESTROY to be sent *immediately*
+                 if (!destroy_window_handler(mWindowHandleThrd))
+                 {
+                     LL_WARNS("Window") << "Failed to destroy Window! " << std::hex << GetLastError() << LL_ENDL;
+                 }
+             }
+             else
+             {
+                 // Something killed the window while we were busy destroying gl or handle somehow got broken
+                 LL_WARNS("Window") << "Failed to destroy Window, invalid handle!" << LL_ENDL;
+             }
+             mWindowHandleThrd = NULL;
+             mhDCThrd = NULL;
+             mGLReady = false;
+         });
+
+    LL_DEBUGS("Window") << "Closing window's pool queue" << LL_ENDL;
+    mQueue->close();
+
+    // Post a nonsense user message to wake up the thread in
+    // case it is waiting for a getMessage()
+    if (old_handle)
     {
-        mD3DDevice->Release();
-        mD3DDevice = nullptr;
+        WPARAM wparam{ 0xB0B0 };
+        LL_DEBUGS("Window") << "PostMessage(" << std::hex << old_handle
+            << ", " << WM_DUMMY_
+            << ", " << wparam << ")" << std::dec << LL_ENDL;
+        PostMessage(old_handle, WM_DUMMY_, wparam, 0x1337);
     }
 
-    if (mD3D)
+    // There are cases where window will refuse to close,
+    // can't wait forever on join, check state instead
+    LLTimer timeout;
+    timeout.setTimerExpirySec(2.0);
+    while (!getQueue().done() && !timeout.hasExpired() && mWindowHandleThrd)
     {
-        mD3D->Release();
-        mD3D = nullptr;
+        ms_sleep(100);
     }
 
-}
-
-void LLWindowWin32::LLWindowWin32Thread::wakeAndClose()
-{
-    if (!mQueue->isClosed())
+    if (getQueue().done() || mWindowHandleThrd == NULL)
     {
-        LL_DEBUGS("Window") << "closing pool queue" << LL_ENDL;
-        mQueue->close();
-
-        // Post a nonsense user message to wake up the thred in
-        // case it is waiting for a getMessage()
-        // 
-        // Note that mWindowHandleThrd can change at any moment and isn't thread safe
-        // but since we aren't writing it, should be safe to use even if value is obsolete
-        // worst case dead handle gets reused and some new window ignores the message
-        HWND old_handle = mWindowHandleThrd;
-        if (old_handle)
+        // Window is closed, started closing or is cleaning up
+        // now wait for our single thread to die.
+        if (mWindowHandleThrd)
         {
-            WPARAM wparam{ 0xB0B0 };
-            LL_DEBUGS("Window") << "PostMessage(" << std::hex << old_handle
-                << ", " << WM_DUMMY_
-                << ", " << wparam << ")" << std::dec << LL_ENDL;
-            PostMessage(old_handle, WM_DUMMY_, wparam, 0x1337);
+            LL_INFOS("Window") << "Window is closing, waiting on pool's thread to join, time since post: " << timeout.getElapsedSeconds() << "s" << LL_ENDL;
+        }
+        else
+        {
+            LL_DEBUGS("Window") << "Waiting on pool's thread, time since post: " << timeout.getElapsedSeconds() << "s" << LL_ENDL;
         }
-
-        // now wait for our one thread to die.
         for (auto& pair : mThreads)
         {
-            LL_DEBUGS("Window") << "waiting on pool's thread " << pair.first << LL_ENDL;
             pair.second.join();
         }
-        LL_DEBUGS("Window") << "thread pool shutdown complete" << LL_ENDL;
     }
+    else
+    {
+        // Something suspended window thread, can't afford to wait forever
+        // so kill thread instead
+        // Ex: This can happen if user starts dragging window arround (if it
+        // was visible) or a modal notification pops up
+        LL_WARNS("Window") << "Window is frozen, couldn't perform clean exit" << LL_ENDL;
+
+        for (auto& pair : mThreads)
+        {
+            // very unsafe
+            TerminateThread(pair.second.native_handle(), 0);
+            pair.second.detach();
+            cleanupDX();
+        }
+    }
+    LL_DEBUGS("Window") << "thread pool shutdown complete" << LL_ENDL;
 }
 
 void LLWindowWin32::post(const std::function<void()>& func)
-- 
cgit v1.2.3


From 60debe828b87c33fdbd33e3a5fcef423e544fe55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pantera=20P=C3=B3=C5=82nocy?= <panterapolnocy@gmail.com>
Date: Fri, 1 Mar 2024 21:39:56 +0100
Subject: Update emoji_categories in Polish translation to slightly more
 correct erms...

---
 indra/newview/skins/default/xui/pl/emoji_categories.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/emoji_categories.xml b/indra/newview/skins/default/xui/pl/emoji_categories.xml
index 9aad7af794..ea4004bdb9 100644
--- a/indra/newview/skins/default/xui/pl/emoji_categories.xml
+++ b/indra/newview/skins/default/xui/pl/emoji_categories.xml
@@ -5,13 +5,13 @@
       <key>Name</key>
       <string>smileys and emotion</string>
       <key>Category</key>
-      <string>buźki and emocje</string>
+      <string>buźki i emocje</string>
     </map>
     <map>
       <key>Name</key>
       <string>people and body</string>
       <key>Category</key>
-      <string>ludzie and ciało</string>
+      <string>ludzie i ciało</string>
     </map>
     <map>
       <key>Name</key>
@@ -23,7 +23,7 @@
       <key>Name</key>
       <string>animals and nature</string>
       <key>Category</key>
-      <string>zwierzęta and przyroda</string>
+      <string>zwierzęta i przyroda</string>
     </map>
     <map>
       <key>Name</key>
@@ -35,19 +35,19 @@
       <key>Name</key>
       <string>travel and places</string>
       <key>Category</key>
-      <string>podróże and miejsca</string>
+      <string>podróże i miejsca</string>
     </map>
     <map>
       <key>Name</key>
       <string>activities</string>
       <key>Category</key>
-      <string>aktywność</string>
+      <string>aktywności</string>
     </map>
     <map>
       <key>Name</key>
       <string>objects</string>
       <key>Category</key>
-      <string>objekt</string>
+      <string>obiekty</string>
     </map>
     <map>
       <key>Name</key>
-- 
cgit v1.2.3


From e0ae227d0af39ee1c55d167d5091889f821ce124 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 31 Oct 2023 10:50:39 -0400
Subject: SL-20546: Add viewer channel and full version to GitHub release page.

(cherry picked from commit f71662225eadf1589f5331e763e02e0bb1b72137)
---
 .github/workflows/build.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1dd2c1d5df..9d04fbe87a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -360,6 +360,11 @@ jobs:
           # name the release page for the build number so we can find it
           # easily (analogous to looking up a codeticket build page)
           name: "v${{ github.run_id }}"
+          # SL-20546: want the channel and version to be visible on the
+          # release page
+          body: |
+            ${{ needs.build.outputs.viewer_channel }}
+            ${{ needs.build.outputs.viewer_version }}
           prerelease: true
           generate_release_notes: true
           # the only reason we generate a GH release is to post build products
-- 
cgit v1.2.3


From cac7023996d691f00101429830a23b2cef3a2f83 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 14 Nov 2023 04:09:56 -0500
Subject: SL-20546: Append generated release notes body to our explicit body.

For a tag build that generates a release page, try to deduce the git branch to
which the tag we're building corresponds and add that to release notes.

(cherry picked from commit 9e99bb04a32f2ecc0f0b99686ce5a7adb356596d)
---
 .github/workflows/build.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9d04fbe87a..c0bec11275 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,6 +24,7 @@ jobs:
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
       viewer_version: ${{ steps.build.outputs.viewer_version }}
+      viewer_branch:  ${{ steps.build.outputs.viewer_branch }}
       imagename: ${{ steps.build.outputs.imagename }}
     env:
       AUTOBUILD_ADDRSIZE: 64
@@ -176,9 +177,17 @@ jobs:
           if [[ "$GITHUB_REF_TYPE" == "tag" && "${GITHUB_REF_NAME:0:12}" == "Second_Life_" ]]
           then viewer_channel="${GITHUB_REF_NAME%#*}"
                export viewer_channel="${viewer_channel//_/ }"
+               # Since GITHUB_REF_NAME is a tag rather than a branch, we need
+               # to discover to what branch this tag corresponds. Get the tip
+               # commit (for the tag) and then ask for branches containing it.
+               # Assume GitHub cloned only this tag and its containing branch.
+               viewer_branch="$(git branch --contains "$(git log -n 1 --format=%h)" |
+                                grep -v '(HEAD')"
           else export viewer_channel="Second Life Test"
+               viewer_branch="${GITHUB_REF_NAME}"
           fi
           echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
+          echo "viewer_branch=$viewer_branch" >> "$GITHUB_OUTPUT"
 
           # On windows we need to point the build to the correct python
           # as neither CMake's FindPython nor our custom Python.cmake module
@@ -365,8 +374,10 @@ jobs:
           body: |
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
+            ${{ needs.build.outputs.viewer_branch }}
           prerelease: true
           generate_release_notes: true
+          append_body: true
           # the only reason we generate a GH release is to post build products
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From a13e70aeffb87e2934f1b01f85dc2c78ea10e20c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 14 Nov 2023 14:20:51 -0500
Subject: SL-20546: Try harder to infer the branch corresponding to build tag.

(cherry picked from commit 59eeaed1187e7592fd83380045916f2d8b9d58e7)
---
 .github/workflows/build.yaml      |  8 ++--
 .github/workflows/which_branch.py | 77 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/which_branch.py

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c0bec11275..6c40c173db 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -178,11 +178,9 @@ jobs:
           then viewer_channel="${GITHUB_REF_NAME%#*}"
                export viewer_channel="${viewer_channel//_/ }"
                # Since GITHUB_REF_NAME is a tag rather than a branch, we need
-               # to discover to what branch this tag corresponds. Get the tip
-               # commit (for the tag) and then ask for branches containing it.
-               # Assume GitHub cloned only this tag and its containing branch.
-               viewer_branch="$(git branch --contains "$(git log -n 1 --format=%h)" |
-                                grep -v '(HEAD')"
+               # to discover to what branch this tag corresponds.
+               viewer_branch="$(python3 .github/workflows/which_branch.py \
+                                --token "${{ github.token }}" ${{ github.workflow_sha }})"
           else export viewer_channel="Second Life Test"
                viewer_branch="${GITHUB_REF_NAME}"
           fi
diff --git a/.github/workflows/which_branch.py b/.github/workflows/which_branch.py
new file mode 100644
index 0000000000..802ea44b5a
--- /dev/null
+++ b/.github/workflows/which_branch.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+"""\
+@file   which_branch.py
+@author Nat Goodspeed
+@date   2023-11-14
+@brief  Discover which git branch(es) correspond to a given commit hash.
+
+$LicenseInfo:firstyear=2023&license=viewerlgpl$
+Copyright (c) 2023, Linden Research, Inc.
+$/LicenseInfo$
+"""
+
+import github
+import re
+import sys
+import subprocess
+
+class Error(Exception):
+    pass
+
+def branches_for(token, commit, repo=None):
+    """
+    Use the GitHub REST API to discover which branch(es) correspond to the
+    passed commit hash. The commit string can actually be any of the ways git
+    permits to identify a commit:
+
+    https://git-scm.com/docs/gitrevisions#_specifying_revisions
+
+    branches_for() generates a (possibly empty) sequence of all the branches
+    of the specified repo for which the specified commit is the tip.
+
+    If repo is omitted or None, assume the current directory is a local clone
+    whose 'origin' remote is the GitHub repository of interest.
+    """
+    if not repo:
+        url = subprocess.check_output(['git', 'remote', 'get-url', 'origin'],
+                                      text=True)
+        parts = re.split(r'[:/]', url.rstrip())
+        repo = '/'.join(parts[-2:]).removesuffix('.git')
+
+    gh = github.MainClass.Github(token)
+    grepo = gh.get_repo(repo)
+    for branch in grepo.get_branches():
+        try:
+            delta = grepo.compare(base=commit, head=branch.name)
+        except github.GithubException:
+            continue
+
+        if delta.ahead_by == 0 and delta.behind_by == 0:
+            yield branch
+
+def main(*raw_args):
+    from argparse import ArgumentParser
+    parser = ArgumentParser(description=
+"%(prog)s reports the branch(es) for which the specified commit hash is the tip.",
+                            epilog="""\
+When GitHub Actions launches a tag build, it checks out the specific changeset
+identified by the tag, and so 'git branch' reports detached HEAD. But we use
+tag builds to build a GitHub 'release' of the tip of a particular branch, and
+it's useful to be able to identify which branch that is.
+""")
+    parser.add_argument('-t', '--token', required=True,
+                        help="""GitHub REST API access token""")
+    parser.add_argument('-r', '--repo',
+                        help="""GitHub repository name, in the form OWNER/REPOSITORY""")
+    parser.add_argument('commit',
+                        help="""commit hash at the tip of the sought branch""")
+
+    args = parser.parse_args(raw_args)
+    for branch in branches_for(token=args.token, commit=args.commit, repo=args.repo):
+        print(branch.name)
+
+if __name__ == "__main__":
+    try:
+        sys.exit(main(*sys.argv[1:]))
+    except Error as err:
+        sys.exit(str(err))
-- 
cgit v1.2.3


From e4865db0cae7dc3b4e37543cb7cd57d357048340 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 14 Nov 2023 14:30:44 -0500
Subject: SL-20546: Add PyGithub to installed Python packages.

(cherry picked from commit 6654ad14eed674e894d2903e0f2ea37c4e806c0f)
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6c40c173db..6704737409 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -81,7 +81,7 @@ jobs:
           path: .master-message-template
 
       - name: Install autobuild and python dependencies
-        run: pip3 install autobuild llsd
+        run: pip3 install autobuild PyGithub llsd
 
       - name: Cache autobuild packages
         uses: actions/cache@v3
-- 
cgit v1.2.3


From cfbef4e4f961cafaa004089e2055ff13de35b8dc Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Nov 2023 09:44:38 -0500
Subject: SL-20546: Make dependency on build job explicit, not indirect.

The release job has been dependent on sign-and-package-windows and
sign-and-package-mac, each of which depends on build. But that indirect
dependency doesn't convey access to ${{ needs.build.outputs.xxx }}. Add the
build job to direct dependencies so release can access its outputs.

(cherry picked from commit 819604d2cee6d4527cc436bebfacddf8642635ff)
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6704737409..861f1567c6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -331,7 +331,7 @@ jobs:
           version: ${{ needs.build.outputs.viewer_version }}
 
   release:
-    needs: [sign-and-package-windows, sign-and-package-mac]
+    needs: [build, sign-and-package-windows, sign-and-package-mac]
     runs-on: ubuntu-latest
     if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life_')
     steps:
-- 
cgit v1.2.3


From 8590ce0533a4bc273b6c0094250fe31fc8e78f1f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 10:59:03 -0500
Subject: DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision

in viewer's autobuild-package.xml.

Ensure that AUTOBUILD_VCS_BRANCH is set before the build.

(cherry picked from commit b782ab73e640e434e4ed67fa8dfc951f09757585)
(cherry picked from commit 6e8d4f48466a5bbad2fcc27bc2877a30e575d4ce)
---
 .github/workflows/build.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 861f1567c6..f127ac3f0f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -34,6 +34,9 @@ jobs:
       AUTOBUILD_GITHUB_TOKEN: ${{ secrets.SHARED_AUTOBUILD_GITHUB_TOKEN }}
       AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables
       AUTOBUILD_VARIABLES_FILE: ${{ github.workspace }}/.build-variables/variables
+      # Direct autobuild to store vcs_url, vcs_branch and vcs_revision in
+      # autobuild-package.xml.
+      AUTOBUILD_VCS_INFO: "true"
       AUTOBUILD_VSVER: "170"
       DEVELOPER_DIR: ${{ matrix.developer_dir }}
       # Ensure that Linden viewer builds engage Bugsplat.
@@ -199,6 +202,11 @@ jobs:
           fi
           export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
 
+          # branch will be something like "origin/mybranch"
+          branch="$(git branch -r --contains ${{ github.event.pull_request.head.sha || github.sha }} | head -n 1)"
+          # strip off "origin/"
+          export AUTOBUILD_VCS_BRANCH="${branch#*/}"
+
           ./build.sh
 
           # Each artifact is downloaded as a distinct .zip file. Multiple jobs
-- 
cgit v1.2.3


From 9b3d4325d9f049bc7315e3772eee2fb5e4bfc83a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 17:35:23 -0500
Subject: DRTVWR-601: Use viewer-build-util/which-branch to determine branch.

(cherry picked from commit 2c5066f1fcc0c9f145698ef3aaec72d27bce7181)
(cherry picked from commit ff1741cecae0fac6d94507fa4a6e4662219af707)
---
 .github/workflows/build.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f127ac3f0f..f172883ae6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -100,10 +100,17 @@ jobs:
         if: runner.os == 'Windows'
         run: choco install nsis-unicode
 
+      - name: Determine source branch
+        id: which-branch
+        uses: secondlife/viewer-build-util/which-branch@v1
+        with:
+          token: ${{ github.token }}
+
       - name: Build
         id: build
         shell: bash
         env:
+          AUTOBUILD_VCS_BRANCH: ${{ steps.which-branch.outputs.branch }}
           RUNNER_OS: ${{ runner.os }}
         run: |
           # set up things the viewer's build.sh script expects
@@ -154,7 +161,7 @@ jobs:
           }
           repo_branch()
           {
-            git -C "$1" branch | grep '^* ' | cut -c 3-
+            echo "$AUTOBUILD_VCS_BRANCH"
           }
           record_dependencies_graph()
           {
@@ -202,11 +209,6 @@ jobs:
           fi
           export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
 
-          # branch will be something like "origin/mybranch"
-          branch="$(git branch -r --contains ${{ github.event.pull_request.head.sha || github.sha }} | head -n 1)"
-          # strip off "origin/"
-          export AUTOBUILD_VCS_BRANCH="${branch#*/}"
-
           ./build.sh
 
           # Each artifact is downloaded as a distinct .zip file. Multiple jobs
-- 
cgit v1.2.3


From 8f68199ccd4beeee827ff360e2f36871cedacdfe Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 18 Jan 2024 13:34:40 -0500
Subject: SL-20546: Use branch for autobuild package as well as release page.

which_branch.py has moved to viewer-build-util as a reusable action.

(cherry picked from commit 09f66828ba573515c3766cce32f4746b8189efcf)
---
 .github/workflows/build.yaml      |  8 +---
 .github/workflows/which_branch.py | 77 ---------------------------------------
 2 files changed, 1 insertion(+), 84 deletions(-)
 delete mode 100644 .github/workflows/which_branch.py

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f172883ae6..b323290f6b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,7 +24,7 @@ jobs:
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
       viewer_version: ${{ steps.build.outputs.viewer_version }}
-      viewer_branch:  ${{ steps.build.outputs.viewer_branch }}
+      viewer_branch:  ${{ steps.which-branch.outputs.branch }}
       imagename: ${{ steps.build.outputs.imagename }}
     env:
       AUTOBUILD_ADDRSIZE: 64
@@ -187,15 +187,9 @@ jobs:
           if [[ "$GITHUB_REF_TYPE" == "tag" && "${GITHUB_REF_NAME:0:12}" == "Second_Life_" ]]
           then viewer_channel="${GITHUB_REF_NAME%#*}"
                export viewer_channel="${viewer_channel//_/ }"
-               # Since GITHUB_REF_NAME is a tag rather than a branch, we need
-               # to discover to what branch this tag corresponds.
-               viewer_branch="$(python3 .github/workflows/which_branch.py \
-                                --token "${{ github.token }}" ${{ github.workflow_sha }})"
           else export viewer_channel="Second Life Test"
-               viewer_branch="${GITHUB_REF_NAME}"
           fi
           echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
-          echo "viewer_branch=$viewer_branch" >> "$GITHUB_OUTPUT"
 
           # On windows we need to point the build to the correct python
           # as neither CMake's FindPython nor our custom Python.cmake module
diff --git a/.github/workflows/which_branch.py b/.github/workflows/which_branch.py
deleted file mode 100644
index 802ea44b5a..0000000000
--- a/.github/workflows/which_branch.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env python3
-"""\
-@file   which_branch.py
-@author Nat Goodspeed
-@date   2023-11-14
-@brief  Discover which git branch(es) correspond to a given commit hash.
-
-$LicenseInfo:firstyear=2023&license=viewerlgpl$
-Copyright (c) 2023, Linden Research, Inc.
-$/LicenseInfo$
-"""
-
-import github
-import re
-import sys
-import subprocess
-
-class Error(Exception):
-    pass
-
-def branches_for(token, commit, repo=None):
-    """
-    Use the GitHub REST API to discover which branch(es) correspond to the
-    passed commit hash. The commit string can actually be any of the ways git
-    permits to identify a commit:
-
-    https://git-scm.com/docs/gitrevisions#_specifying_revisions
-
-    branches_for() generates a (possibly empty) sequence of all the branches
-    of the specified repo for which the specified commit is the tip.
-
-    If repo is omitted or None, assume the current directory is a local clone
-    whose 'origin' remote is the GitHub repository of interest.
-    """
-    if not repo:
-        url = subprocess.check_output(['git', 'remote', 'get-url', 'origin'],
-                                      text=True)
-        parts = re.split(r'[:/]', url.rstrip())
-        repo = '/'.join(parts[-2:]).removesuffix('.git')
-
-    gh = github.MainClass.Github(token)
-    grepo = gh.get_repo(repo)
-    for branch in grepo.get_branches():
-        try:
-            delta = grepo.compare(base=commit, head=branch.name)
-        except github.GithubException:
-            continue
-
-        if delta.ahead_by == 0 and delta.behind_by == 0:
-            yield branch
-
-def main(*raw_args):
-    from argparse import ArgumentParser
-    parser = ArgumentParser(description=
-"%(prog)s reports the branch(es) for which the specified commit hash is the tip.",
-                            epilog="""\
-When GitHub Actions launches a tag build, it checks out the specific changeset
-identified by the tag, and so 'git branch' reports detached HEAD. But we use
-tag builds to build a GitHub 'release' of the tip of a particular branch, and
-it's useful to be able to identify which branch that is.
-""")
-    parser.add_argument('-t', '--token', required=True,
-                        help="""GitHub REST API access token""")
-    parser.add_argument('-r', '--repo',
-                        help="""GitHub repository name, in the form OWNER/REPOSITORY""")
-    parser.add_argument('commit',
-                        help="""commit hash at the tip of the sought branch""")
-
-    args = parser.parse_args(raw_args)
-    for branch in branches_for(token=args.token, commit=args.commit, repo=args.repo):
-        print(branch.name)
-
-if __name__ == "__main__":
-    try:
-        sys.exit(main(*sys.argv[1:]))
-    except Error as err:
-        sys.exit(str(err))
-- 
cgit v1.2.3


From a8cd70123b075440c6343862349495421d12be45 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 18 Jan 2024 13:43:34 -0500
Subject: SL-20546: PyGithub was only needed for local which_branch.py.

Now that which_branch.py has moved to viewer-build-util, so has the PyGithub
dependency.

(cherry picked from commit dd0ec112fe5ded8ed5f69b72b3df26343ca12d35)
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b323290f6b..0cd5595e4b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -84,7 +84,7 @@ jobs:
           path: .master-message-template
 
       - name: Install autobuild and python dependencies
-        run: pip3 install autobuild PyGithub llsd
+        run: pip3 install autobuild llsd
 
       - name: Cache autobuild packages
         uses: actions/cache@v3
-- 
cgit v1.2.3


From 9f326f5b960b0d039280e4c04e7eb44fc094e40e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 15 Feb 2024 11:21:31 -0500
Subject: Engage new viewer-build-util/which-branch with relnotes output.

Put whatever release notes we retrieve into the generated release page.

(cherry picked from commit ff543b744ee0b0fd4dd90b46419ae50a570572ab)
---
 .github/workflows/build.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0cd5595e4b..4d3dd31801 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,6 +25,7 @@ jobs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
       viewer_version: ${{ steps.build.outputs.viewer_version }}
       viewer_branch:  ${{ steps.which-branch.outputs.branch }}
+      relnotes:       ${{ steps.which-branch.outputs.relnotes }}
       imagename: ${{ steps.build.outputs.imagename }}
     env:
       AUTOBUILD_ADDRSIZE: 64
@@ -102,7 +103,7 @@ jobs:
 
       - name: Determine source branch
         id: which-branch
-        uses: secondlife/viewer-build-util/which-branch@v1
+        uses: secondlife/viewer-build-util/which-branch@relnotes
         with:
           token: ${{ github.token }}
 
@@ -377,6 +378,7 @@ jobs:
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
             ${{ needs.build.outputs.viewer_branch }}
+            ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
           append_body: true
-- 
cgit v1.2.3


From 603d3a865a0f619488555dd2d205e0eff4280cc5 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 11:23:47 -0500
Subject: Try to generate release notes for this specific branch.

Also try to cross-reference release page and build page.

(cherry picked from commit a908b4cfa98716d4a838fc1e5a6789faa15d16cf)
---
 .github/workflows/build.yaml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4d3dd31801..6713e429cc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -367,25 +367,30 @@ jobs:
           mv newview/viewer_version.txt macOS-viewer_version.txt
 
       # forked from softprops/action-gh-release
-      - uses: secondlife-3p/action-gh-release@v1
+      - name: Create GitHub release
+        id: release
+        uses: secondlife-3p/action-gh-release@v1
         with:
-          # name the release page for the build number so we can find it
-          # easily (analogous to looking up a codeticket build page)
-          name: "v${{ github.run_id }}"
+          # name the release page for the branch
+          name: "${{ needs.build.outputs.viewer_branch }}"
           # SL-20546: want the channel and version to be visible on the
           # release page
           body: |
+            Build ${{ github.repositoryUrl }}/actions/runs/${{ github.run_id }}
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
-            ${{ needs.build.outputs.viewer_branch }}
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
+          target_commitish: ${{ github.ref }}
           append_body: true
-          # the only reason we generate a GH release is to post build products
           fail_on_unmatched_files: true
           files: |
             *.dmg 
             *.exe
             *-autobuild-package.xml
             *-viewer_version.txt
+
+      - name: post release URL
+        run: |
+          echo "::notice::Release ${{ steps.release.outputs.url }}"
-- 
cgit v1.2.3


From d7e6a7dbd057e03984583f4524953f8ae5250f17 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 12:20:31 -0500
Subject: Try basing the GH release on github.ref_name instead of github.ref.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using github.ref as action-gh-release's target_commitish produces:

⚠️ GitHub release failed with status: 422
[{"resource":"Release","code":"invalid","field":"target_commitish"}]

(cherry picked from commit c6a6db8488a8b3e7ea6534fbf5e2fe2b17864421)
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6713e429cc..b156133799 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -382,7 +382,7 @@ jobs:
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
-          target_commitish: ${{ github.ref }}
+          target_commitish: ${{ github.ref_name }}
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 7c52db381c61f10aa5e4e9c5414c54c0e49d5815 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 13:26:29 -0500
Subject: Try basing release notes on github.sha rather than github.ref_name.

(cherry picked from commit 4edd78f2e54b3cd2e0b0a4b9300dfc669231dd98)
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b156133799..1816e8b48f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -382,7 +382,7 @@ jobs:
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
-          target_commitish: ${{ github.ref_name }}
+          target_commitish: ${{ github.sha }}
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 7ad13c851198d3ea2692c0c16f2eb844ebca8bf5 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 15:51:31 -0500
Subject: Leverage action-gh-release's new previous_tag input.

This should (!) allow us to generate full release notes relative to the
previous viewer release, instead of letting action-gh-release guess
incorrectly.

Also try again to add to the release page a back-link to the specific build.

(cherry picked from commit 88ebb92f05dade00cc8fc519cc062a458ecd48f2)
---
 .github/workflows/build.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1816e8b48f..f76d4286e2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -369,20 +369,21 @@ jobs:
       # forked from softprops/action-gh-release
       - name: Create GitHub release
         id: release
-        uses: secondlife-3p/action-gh-release@v1
+        uses: secondlife-3p/action-gh-release@feat/add-generateReleaseNotes
         with:
           # name the release page for the branch
           name: "${{ needs.build.outputs.viewer_branch }}"
           # SL-20546: want the channel and version to be visible on the
           # release page
           body: |
-            Build ${{ github.repositoryUrl }}/actions/runs/${{ github.run_id }}
+            Build ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
             ${{ needs.build.outputs.viewer_channel }}
             ${{ needs.build.outputs.viewer_version }}
             ${{ needs.build.outputs.relnotes }}
           prerelease: true
           generate_release_notes: true
           target_commitish: ${{ github.sha }}
+          previous_tag: 7.1.2-release
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 3ee3e011ffe2b0d0810f61b5d35afb24ee4095a0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 26 Feb 2024 17:05:56 -0500
Subject: Base generated release notes on new floating tag 'release'

instead of on the current tag 7.1.2-release.

(cherry picked from commit 27b298d8bc720ff315c8e74cc5bff9ff9ead0552)
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f76d4286e2..b3dafd43c9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -383,7 +383,7 @@ jobs:
           prerelease: true
           generate_release_notes: true
           target_commitish: ${{ github.sha }}
-          previous_tag: 7.1.2-release
+          previous_tag: release
           append_body: true
           fail_on_unmatched_files: true
           files: |
-- 
cgit v1.2.3


From 00d7fef75ed860596ab87904209a827fd9de867e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 28 Feb 2024 08:45:12 -0500
Subject: Reference updated action-gh-release@v1

instead of the branch that got pulled.

(cherry picked from commit b42e01d7acf5d4c55612c3a7df0e1ff6ee5ed951)
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b3dafd43c9..8b08bb3960 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -369,7 +369,7 @@ jobs:
       # forked from softprops/action-gh-release
       - name: Create GitHub release
         id: release
-        uses: secondlife-3p/action-gh-release@feat/add-generateReleaseNotes
+        uses: secondlife-3p/action-gh-release@v1
         with:
           # name the release page for the branch
           name: "${{ needs.build.outputs.viewer_branch }}"
-- 
cgit v1.2.3


From 9b8800f216fb0a6efa80b76ca15d0491bd9948ee Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 1 Mar 2024 16:43:15 -0500
Subject: Now that viewer-build-util@relnotes has merged to v1, use @v1.

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8b08bb3960..df49f5fa42 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -103,7 +103,7 @@ jobs:
 
       - name: Determine source branch
         id: which-branch
-        uses: secondlife/viewer-build-util/which-branch@relnotes
+        uses: secondlife/viewer-build-util/which-branch@v1
         with:
           token: ${{ github.token }}
 
-- 
cgit v1.2.3


From 4c2d4e32addd95dedf01acf254db9b41b0813fdb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 2 Mar 2024 02:23:20 +0200
Subject: Revert "Update emoji_categories in Polish translation to slightly
 more correct erms..."

This reverts commit 60debe828b87c33fdbd33e3a5fcef423e544fe55.
---
 indra/newview/skins/default/xui/pl/emoji_categories.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/pl/emoji_categories.xml b/indra/newview/skins/default/xui/pl/emoji_categories.xml
index ea4004bdb9..9aad7af794 100644
--- a/indra/newview/skins/default/xui/pl/emoji_categories.xml
+++ b/indra/newview/skins/default/xui/pl/emoji_categories.xml
@@ -5,13 +5,13 @@
       <key>Name</key>
       <string>smileys and emotion</string>
       <key>Category</key>
-      <string>buźki i emocje</string>
+      <string>buźki and emocje</string>
     </map>
     <map>
       <key>Name</key>
       <string>people and body</string>
       <key>Category</key>
-      <string>ludzie i ciało</string>
+      <string>ludzie and ciało</string>
     </map>
     <map>
       <key>Name</key>
@@ -23,7 +23,7 @@
       <key>Name</key>
       <string>animals and nature</string>
       <key>Category</key>
-      <string>zwierzęta i przyroda</string>
+      <string>zwierzęta and przyroda</string>
     </map>
     <map>
       <key>Name</key>
@@ -35,19 +35,19 @@
       <key>Name</key>
       <string>travel and places</string>
       <key>Category</key>
-      <string>podróże i miejsca</string>
+      <string>podróże and miejsca</string>
     </map>
     <map>
       <key>Name</key>
       <string>activities</string>
       <key>Category</key>
-      <string>aktywności</string>
+      <string>aktywność</string>
     </map>
     <map>
       <key>Name</key>
       <string>objects</string>
       <key>Category</key>
-      <string>obiekty</string>
+      <string>objekt</string>
     </map>
     <map>
       <key>Name</key>
-- 
cgit v1.2.3


From 78ce375dda587cbc86ade15a4d564a469e6db9d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 3 Jan 2024 22:57:28 +0200
Subject: SL-17896 Don't crash silently if files are missing or out of memory

Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
---
 indra/llcommon/llcoros.cpp                         |  1 +
 indra/llcommon/llerror.cpp                         | 42 ++++++++++++++++++++++
 indra/llcommon/llerror.h                           | 23 ++++++++++++
 indra/llcommon/llexception.cpp                     |  1 +
 indra/llcorehttp/_httpservice.cpp                  |  1 +
 indra/llimage/llimagebmp.cpp                       |  1 +
 indra/llimage/llimagedxt.cpp                       |  1 +
 indra/llimage/llimagetga.cpp                       |  1 +
 indra/llrender/llimagegl.cpp                       |  3 ++
 indra/llui/llnotifications.cpp                     |  3 ++
 indra/llui/lltexteditor.cpp                        |  1 +
 indra/llui/lltransutil.cpp                         |  8 ++++-
 indra/newview/llappcorehttp.cpp                    |  1 +
 indra/newview/llappviewer.cpp                      | 29 ++++++++++++---
 indra/newview/llappviewer.h                        |  1 +
 indra/newview/llavatarrenderinfoaccountant.cpp     |  2 ++
 indra/newview/llmeshrepository.cpp                 |  8 ++---
 indra/newview/llviewermenu.cpp                     | 16 +++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  6 ++++
 indra/newview/skins/default/xui/en/strings.xml     | 13 ++++++-
 20 files changed, 152 insertions(+), 10 deletions(-)

diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp
index 3ab97b557f..1d383f174d 100644
--- a/indra/llcommon/llcoros.cpp
+++ b/indra/llcommon/llcoros.cpp
@@ -278,6 +278,7 @@ std::string LLCoros::launch(const std::string& prefix, const callable_t& callabl
     catch (std::bad_alloc&)
     {
         // Out of memory on stack allocation?
+        LLError::LLUserWarningMsg::showOutOfMemory();
         printActiveCoroutines();
         LL_ERRS("LLCoros") << "Bad memory allocation in LLCoros::launch(" << prefix << ")!" << LL_ENDL;
     }
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 414515854a..3de641fcba 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1601,6 +1601,48 @@ namespace LLError
     {
         return out << boost::stacktrace::stacktrace();
     }
+
+    // LLOutOfMemoryWarning
+    std::string LLUserWarningMsg::sLocalizedOutOfMemoryTitle;
+    std::string LLUserWarningMsg::sLocalizedOutOfMemoryWarning;
+    LLUserWarningMsg::Handler LLUserWarningMsg::sHandler;
+
+    void LLUserWarningMsg::show(const std::string& message)
+    {
+        if (sHandler)
+        {
+            sHandler(std::string(), message);
+        }
+    }
+
+    void LLUserWarningMsg::showOutOfMemory()
+    {
+        if (sHandler && !sLocalizedOutOfMemoryTitle.empty())
+        {
+            sHandler(sLocalizedOutOfMemoryTitle, sLocalizedOutOfMemoryWarning);
+        }
+    }
+
+    void LLUserWarningMsg::showMissingFiles()
+    {
+        // Files Are missing, likely can't localize.
+        const std::string error_string =
+            "Second Life viewer couldn't access some of the files it needs and will be closed."
+            "\n\nPlease reinstall viewer from  https://secondlife.com/support/downloads/ and "
+            "contact https://support.secondlife.com if issue persists after reinstall.";
+        sHandler("Missing Files", error_string);
+    }
+
+    void LLUserWarningMsg::setHandler(const LLUserWarningMsg::Handler &handler)
+    {
+        sHandler = handler;
+    }
+
+    void LLUserWarningMsg::setOutOfMemoryStrings(const std::string& title, const std::string& message)
+    {
+        sLocalizedOutOfMemoryTitle = title;
+        sLocalizedOutOfMemoryWarning = message;
+    }
 }
 
 void crashdriver(void (*callback)(int*))
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 05dd88ee51..6f6b349cf5 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -39,6 +39,7 @@
 #include "llpreprocessor.h"
 
 #include <boost/static_assert.hpp>
+#include <functional> // std::function
 
 const int LL_ERR_NOERR = 0;
 
@@ -301,6 +302,28 @@ namespace LLError
     {
         friend std::ostream& operator<<(std::ostream& out, const LLStacktrace&);
     };
+
+    // Provides access to OS notification popup on error, since
+    // not everything has access to OS's messages
+    class LLUserWarningMsg
+    {
+    public:
+        typedef std::function<void(const std::string&, const std::string&)> Handler;
+        static void setHandler(const Handler&);
+        static void setOutOfMemoryStrings(const std::string& title, const std::string& message);
+
+        // When viewer encounters bad alloc or can't access files try warning user about reasons
+        static void showOutOfMemory();
+        static void showMissingFiles();
+        // Genering error
+        static void show(const std::string&);
+
+    private:
+        // needs to be preallocated before viewer runs out of memory
+        static std::string sLocalizedOutOfMemoryTitle;
+        static std::string sLocalizedOutOfMemoryWarning;
+        static Handler sHandler;
+    };
 }
 
 //this is cheaper than llcallstacks if no need to output other variables to call stacks. 
diff --git a/indra/llcommon/llexception.cpp b/indra/llcommon/llexception.cpp
index 46560b5e4c..0787bde57f 100644
--- a/indra/llcommon/llexception.cpp
+++ b/indra/llcommon/llexception.cpp
@@ -37,6 +37,7 @@
 #include "llerror.h"
 #include "llerrorcontrol.h"
 
+
 // used to attach and extract stacktrace information to/from boost::exception,
 // see https://www.boost.org/doc/libs/release/doc/html/stacktrace/getting_started.html#stacktrace.getting_started.exceptions_with_stacktrace
 // apparently the struct passed as the first template param needs no definition?
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp
index 294acd7f63..517076804d 100644
--- a/indra/llcorehttp/_httpservice.cpp
+++ b/indra/llcorehttp/_httpservice.cpp
@@ -320,6 +320,7 @@ void HttpService::threadRun(LLCoreInt::HttpThread * thread)
             LLMemory::logMemoryInfo(TRUE);
 
             //output possible call stacks to log file.
+            LLError::LLUserWarningMsg::showOutOfMemory();
             LLError::LLCallStacks::print();
 
             LL_ERRS() << "Bad memory allocation in HttpService::threadRun()!" << LL_ENDL;
diff --git a/indra/llimage/llimagebmp.cpp b/indra/llimage/llimagebmp.cpp
index 90b7272efa..cdea0da68d 100644
--- a/indra/llimage/llimagebmp.cpp
+++ b/indra/llimage/llimagebmp.cpp
@@ -321,6 +321,7 @@ bool LLImageBMP::updateData()
 		mColorPalette = new(std::nothrow) U8[color_palette_size];
 		if (!mColorPalette)
 		{
+            LLError::LLUserWarningMsg::showOutOfMemory();
 			LL_ERRS() << "Out of memory in LLImageBMP::updateData()" << LL_ENDL;
 			return false;
 		}
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp
index 36317a5ba8..ae76c5243f 100644
--- a/indra/llimage/llimagedxt.cpp
+++ b/indra/llimage/llimagedxt.cpp
@@ -437,6 +437,7 @@ bool LLImageDXT::convertToDXR()
 	U8* newdata = (U8*)ll_aligned_malloc_16(total_bytes);
 	if (!newdata)
 	{
+        LLError::LLUserWarningMsg::showOutOfMemory();
 		LL_ERRS() << "Out of memory in LLImageDXT::convertToDXR()" << LL_ENDL;
 		return false;
 	}
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
index 88bdae9b80..152a7f309c 100644
--- a/indra/llimage/llimagetga.cpp
+++ b/indra/llimage/llimagetga.cpp
@@ -266,6 +266,7 @@ bool LLImageTGA::updateData()
 			mColorMap = new(std::nothrow) U8[ color_map_bytes ];  
 			if (!mColorMap)
 			{
+                LLError::LLUserWarningMsg::showOutOfMemory();
 				LL_ERRS() << "Out of Memory in bool LLImageTGA::updateData()" << LL_ENDL;
 				return false;
 			}
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index c6fd824c4e..56a12b07b1 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1353,6 +1353,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
                 scratch = new(std::nothrow) U32[width * height];
                 if (!scratch)
                 {
+                    LLError::LLUserWarningMsg::showOutOfMemory();
                     LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
                               << " bytes for a manual image W" << width << " H" << height << LL_ENDL;
                 }
@@ -1378,6 +1379,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
                 scratch = new(std::nothrow) U32[width * height];
                 if (!scratch)
                 {
+                    LLError::LLUserWarningMsg::showOutOfMemory();
                     LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
                         << " bytes for a manual image W" << width << " H" << height << LL_ENDL;
                 }
@@ -1406,6 +1408,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
                 scratch = new(std::nothrow) U32[width * height];
                 if (!scratch)
                 {
+                    LLError::LLUserWarningMsg::showOutOfMemory();
                     LL_ERRS() << "Failed to allocate " << (U32)(width * height * sizeof(U32))
                         << " bytes for a manual image W" << width << " H" << height << LL_ENDL;
                 }
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index d736aa6634..2fe9ee18e3 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1553,6 +1553,7 @@ bool LLNotifications::loadTemplates()
 
 	if (!success || root.isNull() || !root->hasName( "notifications" ))
 	{
+        LLError::LLUserWarningMsg::show(LLTrans::getString("MBMissingFile"));
 		LL_ERRS() << "Problem reading XML from UI Notifications file: " << base_filename << LL_ENDL;
 		return false;
 	}
@@ -1563,6 +1564,7 @@ bool LLNotifications::loadTemplates()
 
 	if(!params.validateBlock())
 	{
+        LLError::LLUserWarningMsg::show(LLTrans::getString("MBMissingFile"));
 		LL_ERRS() << "Problem reading XUI from UI Notifications file: " << base_filename << LL_ENDL;
 		return false;
 	}
@@ -1629,6 +1631,7 @@ bool LLNotifications::loadVisibilityRules()
 
 	if(!params.validateBlock())
 	{
+        LLError::LLUserWarningMsg::show(LLTrans::getString("MBMissingFile"));
 		LL_ERRS() << "Problem reading UI Notification Visibility Rules file: " << full_filename << LL_ENDL;
 		return false;
 	}
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 092739a538..a247e8700a 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2694,6 +2694,7 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
 	char* text = new char[ text_len + 1];
 	if (text == NULL)
 	{
+        LLError::LLUserWarningMsg::showOutOfMemory();
 		LL_ERRS() << "Memory allocation failure." << LL_ENDL;			
 		return FALSE;
 	}
diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp
index 5da722a72b..6c486f29ba 100644
--- a/indra/llui/lltransutil.cpp
+++ b/indra/llui/lltransutil.cpp
@@ -44,8 +44,13 @@ bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<s
 	bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS);
 	if (!success)
 	{
+        const std::string error_string =
+            "Second Life viewer couldn't access some of the files it needs and will be closed."
+            "\n\nPlease reinstall viewer from  https://secondlife.com/support/downloads/ and "
+            "contact https://support.secondlife.com if issue persists after reinstall.";
+        LLError::LLUserWarningMsg::show(error_string);
 		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
-		LL_ERRS() << "Couldn't load string table " << xml_filename << ". Please reinstall viewer from  https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
+		LL_ERRS() << "Couldn't load string table " << xml_filename << " " << errno << LL_ENDL;
 		return false;
 	}
 
@@ -60,6 +65,7 @@ bool LLTransUtil::parseLanguageStrings(const std::string& xml_filename)
 	
 	if (!success)
 	{
+        LLError::LLUserWarningMsg::showMissingFiles();
 		LL_ERRS() << "Couldn't load localization table " << xml_filename << LL_ENDL;
 		return false;
 	}
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index debf93dccd..51e259992d 100644
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -168,6 +168,7 @@ void LLAppCoreHttp::init()
     }
     else
     {
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS("Init") << "Missing CA File; should be at " << ca_file << LL_ENDL;
     }
     
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e6a47f1c64..a1fecdb981 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -362,7 +362,6 @@ BOOL gRandomizeFramerate = FALSE;
 BOOL gPeriodicSlowFrame = FALSE;
 
 BOOL gCrashOnStartup = FALSE;
-BOOL gLLErrorActivated = FALSE;
 BOOL gLogoutInProgress = FALSE;
 
 BOOL gSimulateMemLeak = FALSE;
@@ -2253,9 +2252,6 @@ void errorCallback(LLError::ELevel level, const std::string &error_string)
         OSMessageBox(error_string, LLTrans::getString("MBFatalError"), OSMB_OK);
 #endif
 
-        //Set the ErrorActivated global so we know to create a marker file
-        gLLErrorActivated = true;
-
         gDebugInfo["FatalMessage"] = error_string;
         // We're not already crashing -- we simply *intend* to crash. Since we
         // haven't actually trashed anything yet, we can afford to write the whole
@@ -2264,6 +2260,14 @@ void errorCallback(LLError::ELevel level, const std::string &error_string)
     }
 }
 
+void errorMSG(const std::string& title_string, const std::string& message_string)
+{
+    if (!message_string.empty())
+    {
+        OSMessageBox(message_string, title_string.empty() ? LLTrans::getString("MBFatalError") : title_string, OSMB_OK);
+    }
+}
+
 void LLAppViewer::initLoggingAndGetLastDuration()
 {
     //
@@ -2275,6 +2279,8 @@ void LLAppViewer::initLoggingAndGetLastDuration()
     LLError::addGenericRecorder(&errorCallback);
     //LLError::setTimeFunction(getRuntime);
 
+    LLError::LLUserWarningMsg::setHandler(errorMSG);
+
 
     if (mSecondInstance)
     {
@@ -2412,6 +2418,7 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
 			{	// failed to load
 				if(file.required)
 				{
+                    LLError::LLUserWarningMsg::showMissingFiles();
 					LL_ERRS() << "Error: Cannot load required settings file from: " << full_settings_path << LL_ENDL;
 					return false;
 				}
@@ -2510,6 +2517,7 @@ bool LLAppViewer::initConfiguration()
 	if (!success)
 	{
         LL_WARNS() << "Cannot load default configuration file " << settings_file_list << LL_ENDL;
+        LLError::LLUserWarningMsg::showMissingFiles();
         if (gDirUtilp->fileExists(settings_file_list))
         {
             LL_ERRS() << "Cannot load default configuration file settings_files.xml. "
@@ -2533,6 +2541,7 @@ bool LLAppViewer::initConfiguration()
 
 	if (!mSettingsLocationList->validateBlock())
 	{
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Invalid settings file list " << settings_file_list << LL_ENDL;
 	}
 
@@ -2967,6 +2976,8 @@ bool LLAppViewer::initConfiguration()
 		LLEventPumps::instance().obtain("LLControlGroup").post(LLSDMap("init", key));
 	}
 
+    LLError::LLUserWarningMsg::setOutOfMemoryStrings(LLTrans::getString("MBOutOfMemoryTitle"), LLTrans::getString("MBOutOfMemoryErr"));
+
 	return true; // Config was successful.
 }
 
@@ -3004,6 +3015,7 @@ void LLAppViewer::initStrings()
 
 		// initial check to make sure files are there failed
 		gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
+        LLError::LLUserWarningMsg::showMissingFiles();
 		LL_ERRS() << "Viewer failed to find localization and UI files."
 			<< " Please reinstall viewer from https://secondlife.com/support/downloads"
 			<< " and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL;
@@ -4309,6 +4321,7 @@ void LLAppViewer::loadKeyBindings()
 		key_bindings_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "key_bindings.xml");
 		if (!gViewerInput.loadBindingsXML(key_bindings_file))
 		{
+            LLError::LLUserWarningMsg::showMissingFiles();
 			LL_ERRS("InitInfo") << "Unable to open default key bindings from " << key_bindings_file << LL_ENDL;
 		}
 	}
@@ -5399,6 +5412,14 @@ void LLAppViewer::forceErrorLLError()
    	LL_ERRS() << "This is a deliberate llerror" << LL_ENDL;
 }
 
+void LLAppViewer::forceErrorLLErrorMsg()
+{
+    LLError::LLUserWarningMsg::show("Deliberate error");
+    // Note: under debug this will show a message as well,
+    // but release won't show anything and will quit silently
+    LL_ERRS() << "This is a deliberate llerror with a message" << LL_ENDL;
+}
+
 void LLAppViewer::forceErrorBreakpoint()
 {
    	LL_WARNS() << "Forcing a deliberate breakpoint" << LL_ENDL;
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 6d1496d517..77a1cdb485 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -152,6 +152,7 @@ public:
     // LLAppViewer testing helpers.
     // *NOTE: These will potentially crash the viewer. Only for debugging.
     virtual void forceErrorLLError();
+    virtual void forceErrorLLErrorMsg();
     virtual void forceErrorBreakpoint();
     virtual void forceErrorBadMemoryAccess();
     virtual void forceErrorInfiniteLoop();
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index a6c9a41fa4..b95b971890 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -339,6 +339,7 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio
         }
         catch (std::bad_alloc&)
         {
+            LLError::LLUserWarningMsg::showOutOfMemory();
             LL_ERRS() << "LLCoros::launch() allocation failure" << LL_ENDL;
         }
 	}
@@ -370,6 +371,7 @@ void LLAvatarRenderInfoAccountant::getRenderInfoFromRegion(LLViewerRegion * regi
         }
         catch (std::bad_alloc&)
         {
+            LLError::LLUserWarningMsg::showOutOfMemory();
             LL_ERRS() << "LLCoros::launch() allocation failure" << LL_ENDL;
         }
 	}
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 01d6469010..6dc4f25d02 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1360,7 +1360,7 @@ bool LLMeshRepoThread::fetchMeshSkinInfo(const LLUUID& mesh_id, bool can_retry)
 				U8* buffer = new(std::nothrow) U8[size];
 				if (!buffer)
 				{
-					LL_WARNS_ONCE(LOG_MESH) << "Failed to allocate memory for skin info, size: " << size << LL_ENDL;
+					LL_WARNS(LOG_MESH) << "Failed to allocate memory for skin info, size: " << size << LL_ENDL;
 					return false;
 				}
 				LLMeshRepository::sCacheBytesRead += size;
@@ -1473,7 +1473,7 @@ bool LLMeshRepoThread::fetchMeshDecomposition(const LLUUID& mesh_id)
 				U8* buffer = new(std::nothrow) U8[size];
 				if (!buffer)
 				{
-					LL_WARNS_ONCE(LOG_MESH) << "Failed to allocate memory for mesh decomposition, size: " << size << LL_ENDL;
+					LL_WARNS(LOG_MESH) << "Failed to allocate memory for mesh decomposition, size: " << size << LL_ENDL;
 					return false;
 				}
 				LLMeshRepository::sCacheBytesRead += size;
@@ -1575,7 +1575,7 @@ bool LLMeshRepoThread::fetchMeshPhysicsShape(const LLUUID& mesh_id)
 				U8* buffer = new(std::nothrow) U8[size];
 				if (!buffer)
 				{
-					LL_WARNS_ONCE(LOG_MESH) << "Failed to allocate memory for physics shape, size: " << size << LL_ENDL;
+					LL_WARNS(LOG_MESH) << "Failed to allocate memory for physics shape, size: " << size << LL_ENDL;
 					return false;
 				}
 				file.read(buffer, size);
@@ -1770,7 +1770,7 @@ bool LLMeshRepoThread::fetchMeshLOD(const LLVolumeParams& mesh_params, S32 lod,
 				U8* buffer = new(std::nothrow) U8[size];
 				if (!buffer)
 				{
-					LL_WARNS_ONCE(LOG_MESH) << "Can't allocate memory for mesh " << mesh_id << " LOD " << lod << ", size: " << size << LL_ENDL;
+					LL_WARNS(LOG_MESH) << "Can't allocate memory for mesh " << mesh_id << " LOD " << lod << ", size: " << size << LL_ENDL;
 					// todo: for now it will result in indefinite constant retries, should result in timeout
 					// or in retry-count and disabling mesh. (but usually viewer is beyond saving at this point)
 					return false;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 2cf341f87f..289ad2a948 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -289,6 +289,7 @@ void handle_disconnect_viewer(void *);
 
 void force_error_breakpoint(void *);
 void force_error_llerror(void *);
+void force_error_llerror_msg(void*);
 void force_error_bad_memory_access(void *);
 void force_error_infinite_loop(void *);
 void force_error_software_exception(void *);
@@ -2400,6 +2401,15 @@ class LLAdvancedForceErrorLlerror : public view_listener_t
 	}
 };
 
+class LLAdvancedForceErrorLlerrorMsg: public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        force_error_llerror_msg(NULL);
+        return true;
+    }
+};
+
 class LLAdvancedForceErrorBadMemoryAccess : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -8379,6 +8389,11 @@ void force_error_llerror(void *)
     LLAppViewer::instance()->forceErrorLLError();
 }
 
+void force_error_llerror_msg(void*)
+{
+    LLAppViewer::instance()->forceErrorLLErrorMsg();
+}
+
 void force_error_bad_memory_access(void *)
 {
     LLAppViewer::instance()->forceErrorBadMemoryAccess();
@@ -9604,6 +9619,7 @@ void initialize_menus()
 	// Advanced > Debugging
 	view_listener_t::addMenu(new LLAdvancedForceErrorBreakpoint(), "Advanced.ForceErrorBreakpoint");
 	view_listener_t::addMenu(new LLAdvancedForceErrorLlerror(), "Advanced.ForceErrorLlerror");
+    view_listener_t::addMenu(new LLAdvancedForceErrorLlerrorMsg(), "Advanced.ForceErrorLlerrorMsg");
 	view_listener_t::addMenu(new LLAdvancedForceErrorBadMemoryAccess(), "Advanced.ForceErrorBadMemoryAccess");
 	view_listener_t::addMenu(new LLAdvancedForceErrorBadMemoryAccessCoro(), "Advanced.ForceErrorBadMemoryAccessCoro");
 	view_listener_t::addMenu(new LLAdvancedForceErrorInfiniteLoop(), "Advanced.ForceErrorInfiniteLoop");
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 38763cd9a8..7b3b4ed395 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2716,6 +2716,12 @@ function="World.EnvPreset"
                 <menu_item_call.on_click
                  function="Advanced.ForceErrorLlerror" />
             </menu_item_call>
+            <menu_item_call
+             label="Force LLError, Message And Crash"
+             name="Force LLError And Crash">
+                <menu_item_call.on_click
+                 function="Advanced.ForceErrorLlerrorMsg" />
+            </menu_item_call>
             <menu_item_call
              label="Force Bad Memory Access"
              name="Force Bad Memory Access">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f3b26820d2..7360c06f86 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3019,8 +3019,19 @@ Running in window.
 
 If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
+    <string name="MBOutOfMemoryTitle">Out Of Memory</string>
+    <string name="MBOutOfMemoryErr">
+        [APP_NAME]'s request for memory failed. Application can't proceed and will be closed.
 
-	<!-- Avatar Shape Information -->
+If your computer's RAM is low, quit any heavy applications before runing Second Life, allocate a page file or reduce graphical settings like draw distance.
+    </string>
+    <string name="MBMissingFile">
+        [APP_NAME] couldn't access or find some of the files it needs and will be closed.
+
+Please reinstall viewer from  https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall.
+    </string>
+
+    <!-- Avatar Shape Information -->
 <string name="5 O'Clock Shadow">5 O'Clock Shadow</string>
 
 <string name="All White">All White</string>
-- 
cgit v1.2.3


From 6c43baf0298929ee315bdb3d95f0bd23f589a4cf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 24 Jan 2024 23:56:22 +0200
Subject: Issue #54 LLRender::init crash

---
 indra/llrender/llrender.cpp      | 10 +++++++++-
 indra/llrender/llrender.h        |  2 +-
 indra/newview/llviewerwindow.cpp |  6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index ee66122774..4d64dc9e10 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -857,7 +857,7 @@ LLRender::~LLRender()
 	shutdown();
 }
 
-void LLRender::init(bool needs_vertex_buffer)
+bool LLRender::init(bool needs_vertex_buffer)
 {
 #if LL_WINDOWS
     if (gGLManager.mHasDebugOutput && gDebugGL)
@@ -879,6 +879,13 @@ void LLRender::init(bool needs_vertex_buffer)
     // necessary for reflection maps
     glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
 
+#if LL_WINDOWS
+    if (glGenVertexArrays == nullptr)
+    {
+        return false;
+    }
+#endif
+
     { //bind a dummy vertex array object so we're core profile compliant
         U32 ret;
         glGenVertexArrays(1, &ret);
@@ -889,6 +896,7 @@ void LLRender::init(bool needs_vertex_buffer)
     {
         initVertexBuffer();
     }
+    return true;
 }
 
 void LLRender::initVertexBuffer()
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index fd922affba..716b52354d 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -375,7 +375,7 @@ public:
 
 	LLRender();
 	~LLRender();
-    void init(bool needs_vertex_buffer);
+    bool init(bool needs_vertex_buffer);
     void initVertexBuffer();
     void resetVertexBuffer();
 	void shutdown();
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 47c7eed872..37e64dfc17 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1957,7 +1957,11 @@ LLViewerWindow::LLViewerWindow(const Params& p)
 	// Initialize OpenGL Renderer
 	LLVertexBuffer::initClass(mWindow);
 	LL_INFOS("RenderInit") << "LLVertexBuffer initialization done." << LL_ENDL ;
-	gGL.init(true);
+	if (!gGL.init(true))
+    {
+        LLError::LLUserWarningMsg::show(LLTrans::getString("MBVideoDrvErr"));
+        LL_ERRS() << "gGL not initialized" << LL_ENDL;
+    }
 
 	if (LLFeatureManager::getInstance()->isSafe()
 		|| (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion())
-- 
cgit v1.2.3


From e07bf1c0a27cfb37c67c5ffdc92bb92975eabbbf Mon Sep 17 00:00:00 2001
From: Signal Linden <signal@lindenlab.com>
Date: Mon, 4 Mar 2024 17:32:35 -0800
Subject: Do not automatically close issues (#929)

Mark issues as stale but do not close them.
---
 .github/workflows/stale.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index 35ac41420c..e44e223589 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -17,7 +17,8 @@ jobs:
         with:
           stale-pr-message: This pull request is stale because it has been open 30 days with no activity. Remove stale label or comment or it will be closed in 7 days
           days-before-stale: 30
-          days-before-close: 7 
+          days-before-close: 7
+          days-before-issue-close: -1
           exempt-pr-labels: blocked,must,should,keep
           stale-pr-label: stale
       - name: Print outputs
-- 
cgit v1.2.3


From 6328cb7817174765d068685f67809108eb64f2b1 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 5 Mar 2024 13:36:18 -0500
Subject: Make signing and symbol posting jobs conditional on secrets.

Specifically, when secrets aren't available (e.g. for external PRs), skip the
affected steps.
---
 .github/workflows/build.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1dd2c1d5df..edb180a2d1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -250,6 +250,7 @@ jobs:
             ${{ steps.build.outputs.physicstpv }}
 
   sign-and-package-windows:
+    if: secrets.AZURE_KEY_VAULT_URI && secrets.AZURE_CERT_NAME && secrets.AZURE_CLIENT_ID && secrets.AZURE_CLIENT_SECRET && secrets.AZURE_TENANT_ID
     needs: build
     runs-on: windows
     steps:
@@ -263,6 +264,7 @@ jobs:
           tenant_id: "${{ secrets.AZURE_TENANT_ID }}"
 
   sign-and-package-mac:
+    if: secrets.NOTARIZE_CREDS_MACOS && secrets.SIGNING_CERT_MACOS && secrets.SIGNING_CERT_MACOS_IDENTITY && secrets.SIGNING_CERT_MACOS_PASSWORD
     needs: build
     runs-on: macos-latest
     steps:
@@ -298,6 +300,7 @@ jobs:
           note_team: ${{ steps.note-creds.outputs.note_team }}
 
   post-windows-symbols:
+    if: secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS
     needs: build
     runs-on: ubuntu-latest
     steps:
@@ -311,6 +314,7 @@ jobs:
           version: ${{ needs.build.outputs.viewer_version }}
 
   post-mac-symbols:
+    if: secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS
     needs: build
     runs-on: ubuntu-latest
     steps:
-- 
cgit v1.2.3


From 73a12f5529cd6646b4d0a19ac3de15dc3a3570a6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 5 Mar 2024 13:50:38 -0500
Subject: Enclose 'if:' expressions in ${{ ... }}.

The previous construct produced:

Unrecognized named-value: 'secrets'. Located at position 1 within expression:
secrets.AZURE_KEY_VAULT_URI && ...
---
 .github/workflows/build.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index edb180a2d1..5fad232203 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -250,7 +250,7 @@ jobs:
             ${{ steps.build.outputs.physicstpv }}
 
   sign-and-package-windows:
-    if: secrets.AZURE_KEY_VAULT_URI && secrets.AZURE_CERT_NAME && secrets.AZURE_CLIENT_ID && secrets.AZURE_CLIENT_SECRET && secrets.AZURE_TENANT_ID
+    if: ${{ secrets.AZURE_KEY_VAULT_URI && secrets.AZURE_CERT_NAME && secrets.AZURE_CLIENT_ID && secrets.AZURE_CLIENT_SECRET && secrets.AZURE_TENANT_ID }}
     needs: build
     runs-on: windows
     steps:
@@ -264,7 +264,7 @@ jobs:
           tenant_id: "${{ secrets.AZURE_TENANT_ID }}"
 
   sign-and-package-mac:
-    if: secrets.NOTARIZE_CREDS_MACOS && secrets.SIGNING_CERT_MACOS && secrets.SIGNING_CERT_MACOS_IDENTITY && secrets.SIGNING_CERT_MACOS_PASSWORD
+    if: ${{ secrets.NOTARIZE_CREDS_MACOS && secrets.SIGNING_CERT_MACOS && secrets.SIGNING_CERT_MACOS_IDENTITY && secrets.SIGNING_CERT_MACOS_PASSWORD }}
     needs: build
     runs-on: macos-latest
     steps:
@@ -300,7 +300,7 @@ jobs:
           note_team: ${{ steps.note-creds.outputs.note_team }}
 
   post-windows-symbols:
-    if: secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS
+    if: ${{ secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS }}
     needs: build
     runs-on: ubuntu-latest
     steps:
@@ -314,7 +314,7 @@ jobs:
           version: ${{ needs.build.outputs.viewer_version }}
 
   post-mac-symbols:
-    if: secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS
+    if: ${{ secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS }}
     needs: build
     runs-on: ubuntu-latest
     steps:
-- 
cgit v1.2.3


From 74ee07d94268a76bcf24dfc0063fb5b6964ed607 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 5 Mar 2024 14:23:32 -0500
Subject: To test for presence of secrets, set environment variables.

From https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions#using-secrets-in-a-workflow :

"Secrets cannot be directly referenced in if: conditionals. Instead, consider
setting secrets as job-level environment variables, then referencing the
environment variables to conditionally run steps in the job."
---
 .github/workflows/build.yaml | 54 ++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5fad232203..13798fc607 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -37,8 +37,6 @@ jobs:
       DEVELOPER_DIR: ${{ matrix.developer_dir }}
       # Ensure that Linden viewer builds engage Bugsplat.
       BUGSPLAT_DB: ${{ matrix.configuration != 'ReleaseOS' && 'SecondLife_Viewer_2018' || '' }}
-      BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
-      BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
       build_coverity: false
       build_log_dir: ${{ github.workspace }}/.logs
       build_viewer: true
@@ -250,25 +248,36 @@ jobs:
             ${{ steps.build.outputs.physicstpv }}
 
   sign-and-package-windows:
-    if: ${{ secrets.AZURE_KEY_VAULT_URI && secrets.AZURE_CERT_NAME && secrets.AZURE_CLIENT_ID && secrets.AZURE_CLIENT_SECRET && secrets.AZURE_TENANT_ID }}
+    env:
+      AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
+      AZURE_CERT_NAME:     ${{ secrets.AZURE_CERT_NAME }}
+      AZURE_CLIENT_ID:     ${{ secrets.AZURE_CLIENT_ID }}
+      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
+      AZURE_TENANT_ID:     ${{ secrets.AZURE_TENANT_ID }}
     needs: build
     runs-on: windows
     steps:
       - name: Sign and package Windows viewer
+        if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID
         uses: secondlife/viewer-build-util/sign-pkg-windows@v1
         with:
-          vault_uri: "${{ secrets.AZURE_KEY_VAULT_URI }}"
-          cert_name: "${{ secrets.AZURE_CERT_NAME }}"
-          client_id: "${{ secrets.AZURE_CLIENT_ID }}"
-          client_secret: "${{ secrets.AZURE_CLIENT_SECRET }}"
-          tenant_id: "${{ secrets.AZURE_TENANT_ID }}"
+          vault_uri: "${{ env.AZURE_KEY_VAULT_URI }}"
+          cert_name: "${{ env.AZURE_CERT_NAME }}"
+          client_id: "${{ env.AZURE_CLIENT_ID }}"
+          client_secret: "${{ env.AZURE_CLIENT_SECRET }}"
+          tenant_id: "${{ env.AZURE_TENANT_ID }}"
 
   sign-and-package-mac:
-    if: ${{ secrets.NOTARIZE_CREDS_MACOS && secrets.SIGNING_CERT_MACOS && secrets.SIGNING_CERT_MACOS_IDENTITY && secrets.SIGNING_CERT_MACOS_PASSWORD }}
+    env:
+      NOTARIZE_CREDS_MACOS:        ${{ secrets.NOTARIZE_CREDS_MACOS }}
+      SIGNING_CERT_MACOS:          ${{ secrets.SIGNING_CERT_MACOS }}
+      SIGNING_CERT_MACOS_IDENTITY: ${{ secrets.SIGNING_CERT_MACOS_IDENTITY }}
+      SIGNING_CERT_MACOS_PASSWORD: ${{ secrets.SIGNING_CERT_MACOS_PASSWORD }}
     needs: build
     runs-on: macos-latest
     steps:
       - name: Unpack Mac notarization credentials
+        if: env.NOTARIZE_CREDS_MACOS
         id: note-creds
         shell: bash
         run: |
@@ -276,7 +285,7 @@ jobs:
           # USERNAME="..."
           # PASSWORD="..."
           # TEAM_ID="..."
-          eval "${{ secrets.NOTARIZE_CREDS_MACOS }}"
+          eval "${{ env.NOTARIZE_CREDS_MACOS }}"
           echo "::add-mask::$USERNAME"
           echo "::add-mask::$PASSWORD"
           echo "::add-mask::$TEAM_ID"
@@ -288,41 +297,48 @@ jobs:
           [[ -n "$USERNAME" && -n "$PASSWORD" && -n "$TEAM_ID" ]]
 
       - name: Sign and package Mac viewer
+        if: env.SIGNING_CERT_MACOS && env.SIGNING_CERT_MACOS_IDENTITY && env.SIGNING_CERT_MACOS_PASSWORD && steps.note-creds.outputs.note_user && steps.note-creds.outputs.note_pass && steps.note-creds.outputs.note_team
         uses: secondlife/viewer-build-util/sign-pkg-mac@v1
         with:
           channel: ${{ needs.build.outputs.viewer_channel }}
           imagename: ${{ needs.build.outputs.imagename }}
-          cert_base64: ${{ secrets.SIGNING_CERT_MACOS }}
-          cert_name: ${{ secrets.SIGNING_CERT_MACOS_IDENTITY }}
-          cert_pass: ${{ secrets.SIGNING_CERT_MACOS_PASSWORD }}
+          cert_base64: ${{ env.SIGNING_CERT_MACOS }}
+          cert_name: ${{ env.SIGNING_CERT_MACOS_IDENTITY }}
+          cert_pass: ${{ env.SIGNING_CERT_MACOS_PASSWORD }}
           note_user: ${{ steps.note-creds.outputs.note_user }}
           note_pass: ${{ steps.note-creds.outputs.note_pass }}
           note_team: ${{ steps.note-creds.outputs.note_team }}
 
   post-windows-symbols:
-    if: ${{ secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS }}
+    env:
+      BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
+      BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
     needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Post Windows symbols
+        if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
         uses: secondlife/viewer-build-util/post-bugsplat-windows@v1
         with:
-          username: ${{ secrets.BUGSPLAT_USER }}
-          password: ${{ secrets.BUGSPLAT_PASS }}
+          username: ${{ env.BUGSPLAT_USER }}
+          password: ${{ env.BUGSPLAT_PASS }}
           database: "SecondLife_Viewer_2018"
           channel: ${{ needs.build.outputs.viewer_channel }}
           version: ${{ needs.build.outputs.viewer_version }}
 
   post-mac-symbols:
-    if: ${{ secrets.BUGSPLAT_USER && secrets.BUGSPLAT_PASS }}
+    env:
+      BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
+      BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
     needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Post Mac symbols
+        if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
         uses: secondlife/viewer-build-util/post-bugsplat-mac@v1
         with:
-          username: ${{ secrets.BUGSPLAT_USER }}
-          password: ${{ secrets.BUGSPLAT_PASS }}
+          username: ${{ env.BUGSPLAT_USER }}
+          password: ${{ env.BUGSPLAT_PASS }}
           database: "SecondLife_Viewer_2018"
           channel: ${{ needs.build.outputs.viewer_channel }}
           version: ${{ needs.build.outputs.viewer_version }}
-- 
cgit v1.2.3


From 041c66d59acc1706db37cf5e819f2d72743a7028 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 5 Mar 2024 14:29:24 -0500
Subject: Stop requiring BUGSPLAT_USER and BUGSPLAT_PASS in build.sh.

The build step no longer needs these variables at all: they're used in a
subsequent workflow job.
---
 build.sh | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/build.sh b/build.sh
index 22f9e0c78a..f7b3632ee8 100755
--- a/build.sh
+++ b/build.sh
@@ -175,28 +175,6 @@ pre_build()
         VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2")"
     fi
 
-    # expect these variables to be set in the environment from GitHub secrets
-    if [[ -n "$BUGSPLAT_DB" ]]
-    then
-        # don't spew credentials into build log
-        set +x
-        if [[ -z "$BUGSPLAT_USER" || -z "$BUGSPLAT_PASS" ]]
-        then
-            # older mechanism involving build-secrets repo -
-            # if build_secrets_checkout isn't set, report its name
-            bugsplat_sh="${build_secrets_checkout:-\$build_secrets_checkout}/bugsplat/bugsplat.sh"
-            if [ -r "$bugsplat_sh" ]
-            then # show that we're doing this, just not the contents
-                echo source "$bugsplat_sh"
-                source "$bugsplat_sh"
-            else
-                fatal "BUGSPLAT_USER or BUGSPLAT_PASS missing, and no $bugsplat_sh"
-            fi
-        fi
-        set -x
-        export BUGSPLAT_USER BUGSPLAT_PASS
-    fi
-
     # honor autobuild_configure_parameters same as sling-buildscripts
     eval_autobuild_configure_parameters=$(eval $(echo echo $autobuild_configure_parameters))
 
-- 
cgit v1.2.3


From 231062d5323eca322c67c7132f96a1d402c0036c Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Tue, 12 Mar 2024 17:49:19 -0700
Subject: Fix github actions dependency deprecations

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 13798fc607..078eb1f1b8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -60,7 +60,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -81,7 +81,7 @@ jobs:
         run: pip3 install autobuild llsd
 
       - name: Cache autobuild packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installables
         with:
           path: .autobuild-installables
-- 
cgit v1.2.3


From 1161262029f9619fb02d81575382b64d82d9cd09 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 15 Mar 2024 00:04:19 +0200
Subject: SL-18721 Restore release behavior

Closing window correctly caused a significant amount of logout freezes
with no known reproes. Temporarily returning to old behavior were thread
was killes without closing window and will reenable in later maints to
hopefully get a scenario or at least more data of what is causing the
freeze.
---
 indra/llcommon/threadpool.h      |  2 +-
 indra/llwindow/llwindowwin32.cpp | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/indra/llcommon/threadpool.h b/indra/llcommon/threadpool.h
index b8be7bb81a..74056aea17 100644
--- a/indra/llcommon/threadpool.h
+++ b/indra/llcommon/threadpool.h
@@ -55,7 +55,7 @@ namespace LL
          * ThreadPool listens for application shutdown messages on the "LLApp"
          * LLEventPump. Call close() to shut down this ThreadPool early.
          */
-        void close();
+        virtual void close();
 
         std::string getName() const { return mName; }
         size_t getWidth() const { return mThreads.size(); }
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 0d56d2f6f6..54e5f43e87 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -351,6 +351,7 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool
     LLWindowWin32Thread();
 
     void run() override;
+    void close() override;
 
     // closes queue, wakes thread, waits until thread closes
     void wakeAndDestroy();
@@ -4562,11 +4563,25 @@ U32 LLWindowWin32::getAvailableVRAMMegabytes()
 #endif // LL_WINDOWS
 
 inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
-    : LL::ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, false)
+    : LL::ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, true /*should be false, temporary workaround for SL-18721*/)
 {
     LL::ThreadPool::start();
 }
 
+void LLWindowWin32::LLWindowWin32Thread::close()
+{
+    if (!mQueue->isClosed())
+    {
+        LL_WARNS() << "Closing window thread without using destroy_window_handler" << LL_ENDL;
+        LL::ThreadPool::close();
+
+        // Workaround for SL-18721 in case window closes too early and abruptly
+        LLSplashScreen::show();
+        LLSplashScreen::update("..."); // will be updated later
+    }
+}
+
+
 /**
  * LogChange is to log changes in status while trying to avoid spamming the
  * log with repeated messages, especially in a tight loop. It refuses to log
@@ -4917,7 +4932,8 @@ void LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()
 {
     if (mQueue->isClosed())
     {
-        LL_WARNS() << "Tried to close Queue. Win32 thread Queue already closed." <<LL_ENDL;
+        LL_WARNS() << "Tried to close Queue. Win32 thread Queue already closed." << LL_ENDL;
+        return;
     }
 
     // Make sure we don't leave a blank toolbar button.
-- 
cgit v1.2.3


From 61935a13f41b92c652e677bbfd58725ce826c649 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 21 Mar 2024 07:34:51 +0100
Subject: Add Develop menu option 'Debug Camera Controls'

---
 indra/llui/llview.cpp                              |   1 +
 indra/llui/llview.h                                |   3 +
 indra/newview/llfloatercamera.cpp                  | 135 +++++++++++++++++----
 indra/newview/llfloatercamera.h                    |  17 ++-
 indra/newview/llviewermenu.cpp                     |  27 +++++
 .../skins/default/xui/en/floater_camera.xml        |  24 +++-
 indra/newview/skins/default/xui/en/menu_viewer.xml |   8 ++
 7 files changed, 187 insertions(+), 28 deletions(-)

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 21fe088550..5768ceacd3 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -60,6 +60,7 @@ static const S32 LINE_HEIGHT = 15;
 S32		LLView::sDepth = 0;
 bool	LLView::sDebugRects = false;
 bool	LLView::sDebugUnicode = false;
+bool	LLView::sDebugCamera = false;
 bool	LLView::sIsRectDirty = false;
 LLRect	LLView::sDirtyRect;
 bool	LLView::sDebugRectsShowNames = true;
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 6e16d41cba..c14a8bdce3 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -662,6 +662,9 @@ public:
 	// Show hexadecimal byte values of unicode symbols in a tooltip
 	static bool	sDebugUnicode;
 
+	// Show camera position and direction in Camera Controls floater
+	static bool	sDebugCamera;
+
 	static bool sIsRectDirty;
 	static LLRect sDirtyRect;
 
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 1c69b9d60b..177e2a8567 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -44,6 +44,7 @@
 #include "llfirstuse.h"
 #include "llhints.h"
 #include "lltabcontainer.h"
+#include "llviewercamera.h"
 #include "llvoavatarself.h"
 
 static LLDefaultChildRegistry::Register<LLPanelCameraItem> r("panel_camera_item");
@@ -65,13 +66,19 @@ class LLPanelCameraZoom
 :	public LLPanel
 {
 	LOG_CLASS(LLPanelCameraZoom);
+
 public:
-	LLPanelCameraZoom();
+	struct Params : public LLInitParam::Block<Params, LLPanel::Params> {};
+
+	LLPanelCameraZoom() { onCreate(); }
 
 	/* virtual */ BOOL	postBuild();
 	/* virtual */ void	draw();
 
 protected:
+	LLPanelCameraZoom(const Params& p) { onCreate(); }
+
+	void	onCreate();
 	void	onZoomPlusHeldDown();
 	void	onZoomMinusHeldDown();
 	void	onSliderValueChanged();
@@ -80,9 +87,11 @@ protected:
 	F32		getOrbitRate(F32 time);
 
 private:
-	LLButton*	mPlusBtn;
-	LLButton*	mMinusBtn;
-	LLSlider*	mSlider;
+	LLButton*	mPlusBtn { nullptr };
+	LLButton*	mMinusBtn{ nullptr };
+	LLSlider*	mSlider{ nullptr };
+
+	friend class LLUICtrlFactory;
 };
 
 LLPanelCameraItem::Params::Params()
@@ -158,10 +167,7 @@ static LLPanelInjector<LLPanelCameraZoom> t_camera_zoom_panel("camera_zoom_panel
 // LLPanelCameraZoom
 //-------------------------------------------------------------------------------
 
-LLPanelCameraZoom::LLPanelCameraZoom()
-:	mPlusBtn( NULL ),
-	mMinusBtn( NULL ),
-	mSlider( NULL )
+void LLPanelCameraZoom::onCreate()
 {
 	mCommitCallbackRegistrar.add("Zoom.minus", boost::bind(&LLPanelCameraZoom::onZoomMinusHeldDown, this));
 	mCommitCallbackRegistrar.add("Zoom.plus", boost::bind(&LLPanelCameraZoom::onZoomPlusHeldDown, this));
@@ -172,9 +178,9 @@ LLPanelCameraZoom::LLPanelCameraZoom()
 
 BOOL LLPanelCameraZoom::postBuild()
 {
-	mPlusBtn  = getChild <LLButton> ("zoom_plus_btn");
-	mMinusBtn = getChild <LLButton> ("zoom_minus_btn");
-	mSlider   = getChild <LLSlider> ("zoom_slider");
+	mPlusBtn  = getChild<LLButton>("zoom_plus_btn");
+	mMinusBtn = getChild<LLButton>("zoom_minus_btn");
+	mSlider   = getChild<LLSlider>("zoom_slider");
 	return LLPanel::postBuild();
 }
 
@@ -240,11 +246,59 @@ void activate_camera_tool()
 	LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance());
 };
 
+class LLCameraInfoPanel : public LLPanel
+{
+    const S32 MARGIN { 10 };
+
+    const char* mTitle;
+    const LLCoordFrame* mCamera;
+    const LLFontGL* mFont;
+
+public:
+    LLCameraInfoPanel(const LLView* parent, const LLCoordFrame* camera, const char* title)
+        : LLPanel([&]() -> LLPanel::Params
+            {
+                LLPanel::Params params;
+                params.rect = LLRect(parent->getLocalRect());
+                return params;
+            }())
+        , mTitle(title)
+        , mCamera(camera)
+        , mFont(LLFontGL::getFontSansSerifBig())
+    {
+    }
+
+    virtual void draw() override
+    {
+        LLPanel::draw();
+
+        S32 width = getRect().getWidth();
+        S32 height = getRect().getHeight();
+        S32 top = MARGIN / 2 + (height - MARGIN) / 10 * 9;
+        mFont->renderUTF8(mTitle, 0, MARGIN, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
+        const LLVector3* const vectors[] = { &mCamera->getOrigin(), &mCamera->getXAxis(), &mCamera->getYAxis(), &mCamera->getZAxis() };
+        for (int row = 0; row < 4; ++row)
+        {
+            top -= (height - MARGIN) / 5;
+            static const char* const labels[] = { "Origin:", "X Axis:", "Y Axis:", "Z Axis:" };
+            mFont->renderUTF8(labels[row], 0, MARGIN, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
+            const LLVector3& vector = *vectors[row];
+            for (int col = 0; col < 3; ++col)
+            {
+                std::string text = llformat("%.6f", vector[col]);
+                S32 right = width / 4 * (col + 2) - MARGIN;
+                mFont->renderUTF8(text, 0, right, top, LLColor4::white, LLFontGL::RIGHT, LLFontGL::VCENTER);
+            }
+        }
+    }
+};
+
 //
 // Member functions
 //
 
-/*static*/ bool LLFloaterCamera::inFreeCameraMode()
+// static
+bool LLFloaterCamera::inFreeCameraMode()
 {
 	LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance();
 	if (floater_camera && floater_camera->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA && gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK)
@@ -254,6 +308,7 @@ void activate_camera_tool()
 	return false;
 }
 
+// static
 void LLFloaterCamera::resetCameraMode()
 {
 	LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance();
@@ -261,6 +316,7 @@ void LLFloaterCamera::resetCameraMode()
 	floater_camera->switchMode(CAMERA_CTRL_MODE_PAN);
 }
 
+// static
 void LLFloaterCamera::onAvatarEditingAppearance(bool editing)
 {
 	sAppearanceEditing = editing;
@@ -269,15 +325,44 @@ void LLFloaterCamera::onAvatarEditingAppearance(bool editing)
 	floater_camera->handleAvatarEditingAppearance(editing);
 }
 
-void LLFloaterCamera::handleAvatarEditingAppearance(bool editing)
+// static
+void LLFloaterCamera::onDebugCameraToggled()
 {
+    if (LLFloaterCamera* instance = LLFloaterCamera::findInstance())
+    {
+        instance->showDebugInfo(LLView::sDebugCamera);
+    }
 
+    if (LLView::sDebugCamera)
+    {
+        LLFloaterReg::showInstanceOrBringToFront("camera");
+    }
+}
+
+void LLFloaterCamera::showDebugInfo(bool show)
+{
+    // Initially LLPanel contains 1 child "view_border"
+    if (show && mViewerCameraInfo->getChildCount() < 2)
+    {
+        mViewerCameraInfo->addChild(new LLCameraInfoPanel(mViewerCameraInfo, LLViewerCamera::getInstance(), "Viewer Camera"));
+        mAgentCameraInfo->addChild(new LLCameraInfoPanel(mAgentCameraInfo, &gAgent.getFrameAgent(), "Agent Camera"));
+    }
+
+    mAgentCameraInfo->setVisible(show);
+    mViewerCameraInfo->setVisible(show);
+}
+
+void LLFloaterCamera::handleAvatarEditingAppearance(bool editing)
+{
 }
 
 void LLFloaterCamera::update()
 {
 	ECameraControlMode mode = determineMode();
-	if (mode != mCurrMode) setMode(mode);
+	if (mode != mCurrMode)
+	{
+		setMode(mode);
+	}
 }
 
 
@@ -286,7 +371,8 @@ void LLFloaterCamera::toPrevMode()
 	switchMode(mPrevMode);
 }
 
-/*static*/ void LLFloaterCamera::onLeavingMouseLook()
+// static
+void LLFloaterCamera::onLeavingMouseLook()
 {
 	LLFloaterCamera* floater_camera = LLFloaterCamera::findInstance();
 	if (floater_camera)
@@ -320,12 +406,14 @@ void LLFloaterCamera::onOpen(const LLSD& key)
 	mClosed = FALSE;
 
 	populatePresetCombo();
+
+	showDebugInfo(LLView::sDebugCamera);
 }
 
 void LLFloaterCamera::onClose(bool app_quitting)
 {
 	//We don't care of camera mode if app is quitting
-	if(app_quitting)
+	if (app_quitting)
 		return;
 	// It is necessary to reset mCurrMode to CAMERA_CTRL_MODE_PAN so 
 	// to avoid seeing an empty floater when reopening the control.
@@ -360,14 +448,18 @@ BOOL LLFloaterCamera::postBuild()
 {
 	updateTransparency(TT_ACTIVE); // force using active floater transparency (STORM-730)
 
+	mControls = getChild<LLPanel>("controls");
+	mAgentCameraInfo = getChild<LLPanel>("agent_camera_info");
+	mViewerCameraInfo = getChild<LLPanel>("viewer_camera_info");
 	mRotate = getChild<LLJoystickCameraRotate>(ORBIT);
-	mZoom = findChild<LLPanelCameraZoom>(ZOOM);
+	mZoom = getChild<LLPanelCameraZoom>(ZOOM);
 	mTrack = getChild<LLJoystickCameraTrack>(PAN);
 	mPresetCombo = getChild<LLComboBox>("preset_combo");
+	mPreciseCtrls = getChild<LLTextBox>("precise_ctrs_label");
 
-	getChild<LLTextBox>("precise_ctrs_label")->setShowCursorHand(false);
-	getChild<LLTextBox>("precise_ctrs_label")->setSoundFlags(LLView::MOUSE_UP);
-	getChild<LLTextBox>("precise_ctrs_label")->setClickedCallback(boost::bind(&LLFloaterReg::showInstance, "prefs_view_advanced", LLSD(), FALSE));
+	mPreciseCtrls->setShowCursorHand(false);
+	mPreciseCtrls->setSoundFlags(LLView::MOUSE_UP);
+	mPreciseCtrls->setClickedCallback(boost::bind(&LLFloaterReg::showInstance, "prefs_view_advanced", LLSD(), FALSE));
 
 	mPresetCombo->setCommitCallback(boost::bind(&LLFloaterCamera::onCustomPresetSelected, this));
 	LLPresetsManager::getInstance()->setPresetListChangeCameraCallback(boost::bind(&LLFloaterCamera::populatePresetCombo, this));
@@ -507,6 +599,7 @@ void LLFloaterCamera::updateItemsSelection()
 	getChild<LLPanelCameraItem>("object_view")->setValue(argument);
 }
 
+// static
 void LLFloaterCamera::onClickCameraItem(const LLSD& param)
 {
 	std::string name = param.asString();
@@ -533,7 +626,7 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param)
 	}
 }
 
-/*static*/
+// static
 void LLFloaterCamera::switchToPreset(const std::string& name)
 {
 	sFreeCamera = false;
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index a69b87ad16..f31bc5486b 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -63,6 +63,9 @@ public:
 	/** Called when Avatar is entered/exited editing appearance mode */
 	static void onAvatarEditingAppearance(bool editing);
 
+	/** Called when opening and when "Advanced | Debug Camera" menu item is toggled */
+	static void onDebugCameraToggled();
+
 	/* determines actual mode and updates ui */
 	void update();
 
@@ -77,9 +80,9 @@ public:
 
 	void populatePresetCombo();
 
-	LLJoystickCameraRotate* mRotate;
-	LLPanelCameraZoom*	mZoom;
-	LLJoystickCameraTrack*	mTrack;
+	LLJoystickCameraRotate* mRotate { nullptr };
+	LLPanelCameraZoom* mZoom { nullptr };
+	LLJoystickCameraTrack* mTrack { nullptr };
 
 private:
 
@@ -117,6 +120,8 @@ private:
 
 	void handleAvatarEditingAppearance(bool editing);
 
+	void showDebugInfo(bool show);
+
 	// set to true when free camera mode is selected in modes list
 	// remains true until preset camera mode is chosen, or pan button is clicked, or escape pressed
 	static bool sFreeCamera;
@@ -126,7 +131,11 @@ private:
 	ECameraControlMode mCurrMode;
 	std::map<ECameraControlMode, LLButton*> mMode2Button;
 
-	LLComboBox* mPresetCombo;
+	LLPanel* mControls { nullptr };
+	LLPanel* mViewerCameraInfo { nullptr };
+	LLPanel* mAgentCameraInfo { nullptr };
+	LLComboBox* mPresetCombo { nullptr };
+	LLTextBox* mPreciseCtrls { nullptr };
 };
 
 /**
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 7f9b7eb410..736f525124 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1462,6 +1462,31 @@ class LLAdvancedCheckDebugUnicode : public view_listener_t
 
 
 
+//////////////////
+// DEBUG CAMERA //
+//////////////////
+
+
+class LLAdvancedToggleDebugCamera : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLView::sDebugCamera = !(LLView::sDebugCamera);
+		LLFloaterCamera::onDebugCameraToggled();
+		return true;
+	}
+};
+
+class LLAdvancedCheckDebugCamera : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		return LLView::sDebugCamera;
+	}
+};
+
+
+
 ///////////////////////
 // XUI NAME TOOLTIPS //
 ///////////////////////
@@ -9543,6 +9568,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLAdvancedToggleDebugViews(), "Advanced.ToggleDebugViews");
 	view_listener_t::addMenu(new LLAdvancedCheckDebugUnicode(), "Advanced.CheckDebugUnicode");
 	view_listener_t::addMenu(new LLAdvancedToggleDebugUnicode(), "Advanced.ToggleDebugUnicode");
+	view_listener_t::addMenu(new LLAdvancedCheckDebugCamera(), "Advanced.CheckDebugCamera");
+	view_listener_t::addMenu(new LLAdvancedToggleDebugCamera(), "Advanced.ToggleDebugCamera");
 	view_listener_t::addMenu(new LLAdvancedToggleXUINameTooltips(), "Advanced.ToggleXUINameTooltips");
 	view_listener_t::addMenu(new LLAdvancedCheckXUINameTooltips(), "Advanced.CheckXUINameTooltips");
 	view_listener_t::addMenu(new LLAdvancedToggleDebugMouseEvents(), "Advanced.ToggleDebugMouseEvents");
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 9deb38e3af..8774b12e2b 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -138,13 +138,13 @@
         </panel>
     </panel>
     <panel
-     follows="all"
+     follows="left|top"
      height="102"
      layout="topleft"
      left_pad="2"
+     right="-2"
      name="buttons_panel"
-     top="22"
-     width="212">
+     top="22">
     <panel_camera_item
       name="front_view"
       tool_tip="Front View"
@@ -253,4 +253,22 @@
           function="CameraPresets.Save"/>
       </button>
   </panel>
+  <panel
+    name="viewer_camera_info"
+    left="0"
+    top="135"
+    width="400"
+    height="130"
+    border="true"
+    visible="false"
+    background_visible="true"/>
+  <panel
+    name="agent_camera_info"
+    left="0"
+    top="265"
+    width="400"
+    height="130"
+    border="true"
+    visible="false"
+    background_visible="true"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6444ea2540..b3bf977df2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3633,6 +3633,14 @@ function="World.EnvPreset"
                 <menu_item_check.on_click
                  function="Advanced.ToggleDebugUnicode" />
             </menu_item_check>
+            <menu_item_check
+             label="Debug Camera Controls"
+             name="Debug Camera Controls">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugCamera" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugCamera" />
+            </menu_item_check>
             <menu_item_check
              label="Debug Name Tooltips"
              name="Debug Name Tooltips">
-- 
cgit v1.2.3


From 757655d7c342d66711937ff7786a50f1c52d8699 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 22 Mar 2024 22:36:45 +0200
Subject: Revert "SL-20416 Fix Crash Report 1409376 (update)"

This reverts commit cc43f42e6b7401c2cdd3204a16f757f5169bd95b.
---
 indra/llui/llfloater.cpp | 11 +----------
 indra/llui/llfloater.h   |  1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index de3de53569..fb90cebd39 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -506,7 +506,6 @@ void LLFloater::enableResizeCtrls(bool enable, bool width, bool height)
 
 void LLFloater::destroy()
 {
-	gFloaterView->onDestroyFloater(this);
 	// LLFloaterReg should be synchronized with "dead" floater to avoid returning dead instance before
 	// it was deleted via LLMortician::updateClass(). See EXT-8458.
 	LLFloaterReg::removeInstance(mInstanceName, mKey);
@@ -2573,7 +2572,7 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 		return;
 	}
 
-	if (mFrontChild)
+	if (mFrontChild && !mFrontChild->isDead() && mFrontChild->getVisible())
 	{
 		mFrontChild->goneFromFront();
 	}
@@ -3235,14 +3234,6 @@ void LLFloaterView::setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LL
 	}
 }
 
-void LLFloaterView::onDestroyFloater(LLFloater* floater)
-{
-    if (mFrontChild == floater)
-    {
-        mFrontChild = nullptr;
-    }
-}
-
 void LLFloater::setInstanceName(const std::string& name)
 {
 	if (name != mInstanceName)
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 88f9e77777..5f4e1a2cad 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -607,7 +607,6 @@ public:
 	LLFloater* getFrontmostClosableFloater(); 
 
 	void setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LLRect& toolbar_rect);
-	void onDestroyFloater(LLFloater* floater);
 
 private:
 	void hiddenFloaterClosed(LLFloater* floater);
-- 
cgit v1.2.3


From 689ef9442581d7af8ff0e0264be4919fe6cffd73 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 22 Mar 2024 23:04:56 +0200
Subject: viewer#1033 Crash at syncFloaterTabOrder

---
 indra/llui/llfloater.cpp | 22 ++++++++++++----------
 indra/llui/llfloater.h   |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index fb90cebd39..cf33d633ad 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2406,8 +2406,7 @@ LLFloaterView::LLFloaterView (const Params& p)
 	mFocusCycleMode(FALSE),
 	mMinimizePositionVOffset(0),
 	mSnapOffsetBottom(0),
-	mSnapOffsetRight(0),
-	mFrontChild(NULL)
+	mSnapOffsetRight(0)
 {
 	mSnapView = getHandle();
 }
@@ -2563,7 +2562,8 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 	if (!child)
 		return;
 
-	if (mFrontChild == child)
+    LLFloater* front_child = mFrontChildHandle.get();
+	if (front_child == child)
 	{
 		if (give_focus && child->canFocusStealFrontmost() && !gFocusMgr.childHasKeyboardFocus(child))
 		{
@@ -2572,12 +2572,12 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 		return;
 	}
 
-	if (mFrontChild && !mFrontChild->isDead() && mFrontChild->getVisible())
+	if (front_child && front_child->getVisible())
 	{
-		mFrontChild->goneFromFront();
+        front_child->goneFromFront();
 	}
 
-	mFrontChild = child;
+    mFrontChildHandle = child->getHandle();
 
 	// *TODO: make this respect floater's mAutoFocus value, instead of
 	// using parameter
@@ -3076,7 +3076,8 @@ LLFloater *LLFloaterView::getBackmost() const
 
 void LLFloaterView::syncFloaterTabOrder()
 {
-	if (mFrontChild && !mFrontChild->isDead() && mFrontChild->getIsChrome())
+    LLFloater* front_child = mFrontChildHandle.get();
+	if (front_child && front_child->getIsChrome())
 		return;
 
 	// look for a visible modal dialog, starting from first
@@ -3114,11 +3115,12 @@ void LLFloaterView::syncFloaterTabOrder()
 			LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
 			if (gFocusMgr.childHasKeyboardFocus(floaterp))
 			{
-                if (mFrontChild != floaterp)
+                LLFloater* front_child = mFrontChildHandle.get();
+                if (front_child != floaterp)
                 {
                     // Grab a list of the top floaters that want to stay on top of the focused floater
 					std::list<LLFloater*> listTop;
-					if (mFrontChild && !mFrontChild->canFocusStealFrontmost())
+					if (front_child && !front_child->canFocusStealFrontmost())
                     {
                         for (LLView* childp : *getChildList())
                         {
@@ -3138,7 +3140,7 @@ void LLFloaterView::syncFloaterTabOrder()
 						{
 							sendChildToFront(childp);
 						}
-						mFrontChild = listTop.back();
+                        mFrontChildHandle = listTop.back()->getHandle();
 					}
                 }
 
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 5f4e1a2cad..39957386df 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -622,7 +622,7 @@ private:
 	S32				mMinimizePositionVOffset;
 	typedef std::vector<std::pair<LLHandle<LLFloater>, boost::signals2::connection> > hidden_floaters_t;
 	hidden_floaters_t mHiddenFloaters;
-	LLFloater *		mFrontChild;
+    LLHandle<LLFloater>	mFrontChildHandle;
 };
 
 //
-- 
cgit v1.2.3


From f815b015cecda18098dd2d16f65682a37e1bff7c Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 26 Mar 2024 03:19:06 +0100
Subject: secondlife/jira-archive-internal#69593 Avatar is upside down when
 viewed from below

---
 indra/newview/llagent.cpp                          | 30 ++++----
 indra/newview/llfloatercamera.cpp                  | 81 ++++++++++++++--------
 .../skins/default/xui/en/floater_camera.xml        |  6 +-
 3 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index d1e1815a79..13501833b2 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1468,23 +1468,27 @@ void LLAgent::pitch(F32 angle)
 
 	LLVector3 skyward = getReferenceUpVector();
 
-	// SL-19286 Avatar is upside down when viewed from below
-	// after left-clicking the mouse on the avatar and dragging down
-	//
-	// The issue is observed on angle below 10 degrees
-	const F32 look_down_limit = 179.f * DEG_TO_RAD;
-	const F32 look_up_limit   =  10.f * DEG_TO_RAD;
-
-	F32 angle_from_skyward = acos(mFrameAgent.getAtAxis() * skyward);
-
 	// clamp pitch to limits
-	if ((angle >= 0.f) && (angle_from_skyward + angle > look_down_limit))
+	if (angle >= 0.f)
 	{
-		angle = look_down_limit - angle_from_skyward;
+		const F32 look_down_limit = 179.f * DEG_TO_RAD;
+		F32 angle_from_skyward = acos(mFrameAgent.getAtAxis() * skyward);
+		if (angle_from_skyward + angle > look_down_limit)
+		{
+			angle = look_down_limit - angle_from_skyward;
+		}
 	}
-	else if ((angle < 0.f) && (angle_from_skyward + angle < look_up_limit))
+	else if (angle < 0.f)
 	{
-		angle = look_up_limit - angle_from_skyward;
+		const F32 look_up_limit = 5.f * DEG_TO_RAD;
+		const LLVector3& viewer_camera_pos = LLViewerCamera::getInstance()->getOrigin();
+		LLVector3 agent_focus_pos = getPosAgentFromGlobal(gAgentCamera.calcFocusPositionTargetGlobal());
+		LLVector3 look_dir = agent_focus_pos - viewer_camera_pos;
+		F32 angle_from_skyward = angle_between(look_dir, skyward);
+		if (angle_from_skyward + angle < look_up_limit)
+		{
+			angle = look_up_limit - angle_from_skyward;
+		}
 	}
 
 	if (fabs(angle) > 1e-4)
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 177e2a8567..7985ce447f 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -248,23 +248,25 @@ void activate_camera_tool()
 
 class LLCameraInfoPanel : public LLPanel
 {
-    const S32 MARGIN { 10 };
-
-    const char* mTitle;
-    const LLCoordFrame* mCamera;
-    const LLFontGL* mFont;
-
 public:
-    LLCameraInfoPanel(const LLView* parent, const LLCoordFrame* camera, const char* title)
-        : LLPanel([&]() -> LLPanel::Params
-            {
-                LLPanel::Params params;
-                params.rect = LLRect(parent->getLocalRect());
-                return params;
-            }())
-        , mTitle(title)
-        , mCamera(camera)
-        , mFont(LLFontGL::getFontSansSerifBig())
+    typedef std::function<LLVector3()> get_vector_t;
+
+    LLCameraInfoPanel(
+        const LLView* parent,
+        const char* title,
+        const LLCoordFrame& camera,
+        const get_vector_t get_focus
+    )
+    : LLPanel([&]() -> LLPanel::Params
+        {
+            LLPanel::Params params;
+            params.rect = LLRect(parent->getLocalRect());
+            return params;
+        }())
+    , mTitle(title)
+    , mCamera(camera)
+    , mGetFocus(get_focus)
+    , mFont(LLFontGL::getFontSansSerifBig())
     {
     }
 
@@ -272,25 +274,44 @@ public:
     {
         LLPanel::draw();
 
+        static const U32 HPADDING = 10;
+        static const U32 VPADDING = 5;
+        LLVector3 focus = mGetFocus();
+        LLVector3 sight = focus - mCamera.mOrigin;
+        std::pair<const char*, const LLVector3&> const data[] =
+        {
+            { "Origin:", mCamera.mOrigin },
+            { "X Axis:", mCamera.mXAxis },
+            { "Y Axis:", mCamera.mYAxis },
+            { "Z Axis:", mCamera.mZAxis },
+            { "Focus:", focus },
+            { "Sight:", sight }
+        };
         S32 width = getRect().getWidth();
         S32 height = getRect().getHeight();
-        S32 top = MARGIN / 2 + (height - MARGIN) / 10 * 9;
-        mFont->renderUTF8(mTitle, 0, MARGIN, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
-        const LLVector3* const vectors[] = { &mCamera->getOrigin(), &mCamera->getXAxis(), &mCamera->getYAxis(), &mCamera->getZAxis() };
-        for (int row = 0; row < 4; ++row)
+        S32 row_count = 1 + sizeof(data) / sizeof(*data);
+        S32 row_height = (height - VPADDING * 2) / row_count;
+        S32 top = height - VPADDING - row_height / 2;
+        mFont->renderUTF8(mTitle, 0, HPADDING, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
+        for (const auto& row : data)
         {
-            top -= (height - MARGIN) / 5;
-            static const char* const labels[] = { "Origin:", "X Axis:", "Y Axis:", "Z Axis:" };
-            mFont->renderUTF8(labels[row], 0, MARGIN, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
-            const LLVector3& vector = *vectors[row];
-            for (int col = 0; col < 3; ++col)
+            top -= row_height;
+            mFont->renderUTF8(row.first, 0, HPADDING, top, LLColor4::white, LLFontGL::LEFT, LLFontGL::VCENTER);
+            const LLVector3& vector = row.second;
+            for (S32 i = 0; i < 3; ++i)
             {
-                std::string text = llformat("%.6f", vector[col]);
-                S32 right = width / 4 * (col + 2) - MARGIN;
+                std::string text = llformat("%.6f", vector[i]);
+                S32 right = width / 4 * (i + 2) - HPADDING;
                 mFont->renderUTF8(text, 0, right, top, LLColor4::white, LLFontGL::RIGHT, LLFontGL::VCENTER);
             }
         }
     }
+
+private:
+    const char* mTitle;
+    const LLCoordFrame& mCamera;
+    const get_vector_t mGetFocus;
+    const LLFontGL* mFont;
 };
 
 //
@@ -344,8 +365,10 @@ void LLFloaterCamera::showDebugInfo(bool show)
     // Initially LLPanel contains 1 child "view_border"
     if (show && mViewerCameraInfo->getChildCount() < 2)
     {
-        mViewerCameraInfo->addChild(new LLCameraInfoPanel(mViewerCameraInfo, LLViewerCamera::getInstance(), "Viewer Camera"));
-        mAgentCameraInfo->addChild(new LLCameraInfoPanel(mAgentCameraInfo, &gAgent.getFrameAgent(), "Agent Camera"));
+        mViewerCameraInfo->addChild(new LLCameraInfoPanel(mViewerCameraInfo, "Viewer Camera", *LLViewerCamera::getInstance(),
+            []() { return LLViewerCamera::getInstance()->getPointOfInterest(); }));
+        mAgentCameraInfo->addChild(new LLCameraInfoPanel(mAgentCameraInfo, "Agent Camera", gAgent.getFrameAgent(),
+            []() { return gAgent.getPosAgentFromGlobal(gAgentCamera.calcFocusPositionTargetGlobal()); }));
     }
 
     mAgentCameraInfo->setVisible(show);
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 8774b12e2b..93cfdf6030 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -258,16 +258,16 @@
     left="0"
     top="135"
     width="400"
-    height="130"
+    height="150"
     border="true"
     visible="false"
     background_visible="true"/>
   <panel
     name="agent_camera_info"
     left="0"
-    top="265"
+    top="285"
     width="400"
-    height="130"
+    height="150"
     border="true"
     visible="false"
     background_visible="true"/>
-- 
cgit v1.2.3


From 9567393f803dfb0c786b8e917e41c8f4b8b22af7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 26 Mar 2024 16:56:26 -0400
Subject: Increment viewer version to 7.1.5 following promotion of
 secondlife/viewer #650

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index b7f8ee41e6..69adf3456f 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.4
+7.1.5
-- 
cgit v1.2.3


From 2b1e372f760c8dd7510418e1c2362804b7c854b3 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Sat, 30 Mar 2024 21:21:55 -0700
Subject: Remove BuildParams

This file is no longer used.
---
 BuildParams | 73 -------------------------------------------------------------
 build.sh    |  3 ---
 2 files changed, 76 deletions(-)
 delete mode 100644 BuildParams

diff --git a/BuildParams b/BuildParams
deleted file mode 100644
index dda25e3e63..0000000000
--- a/BuildParams
+++ /dev/null
@@ -1,73 +0,0 @@
-# BuildParams
-#
-# Please refer to:
-#  https://wiki.secondlife.com/wiki/Automated_Build_System
-
-# Variants (NOTE: 'Release' must be last for uploads to work correctly)
-variants = "RelWithDebInfo Release"
-
-# Use Public Upload Locations
-public_build = true
-build_docs = true
-
-# enable Doxygen building on Linux for TeamCity (it can be done manually on any platform)
-build_Linux_Doxygen = true
-
-# Need viewer-build-variables as well as other shared repositories
-buildscripts_shared_more_NAMEs="build_secrets build_variables git_hooks"
-
-# Python 3 / SL-15742
-BUILDSCRIPTS_PY3 = "true"
-
-################################################################
-####      Examples of how to set the viewer_channel         ####
-#
-# To build a Release or Release candidate in build bingo:
-#    bingo.viewer_channel = "Second Life Release"
-#
-# To build a Beta for the 'Bingo' project in build bingo:
-#    bingo.viewer_channel = "Second Life Beta Bingo"
-#
-# To build a Project viewer for the 'Bingo' project in build bingo:
-#    bingo.viewer_channel = "Second Life Project Bingo"
-#
-# If left unset, viewer_channel defaults to 'Second Life Test',
-# which is appropriate for individual developer builds.
-#
-# All Linden Lab builds (and only Linden Lab builds)
-# should use a viewer_channel that begins with "Second Life"
-################################################################
-viewer_channel = "Second Life Test"
-
-
-################################################################
-# Special packaging parameters.
-# These parameters can be used to create additional packages
-# which identify themselves in a distinct way with either
-# a sourceid (sent to web services) or a channel name (sent to login)
-# the default sourceid should always be a null string:
-sourceid = ""
-# the additional_packages variable is a blank separated list of package prefixes:
-# additional_packages = ""
-# to set the special values for a package, create variables using each prefix:
-#   additional_packages = "Foo Bar"
-#   Foo_sourceid = "bingo"
-#   Foo_viewer_channel_suffix = "Foo"
-#   Bar_sourceid = "bongo"
-#   Bar_viewer_channel_suffix = "Bar"
-# the viewer_channel_suffix is prefixed by a blank and then appended to the viewer_channel
-# for the package in a setting that overrides the compiled-in value
-################################################################
-additional_packages = "EDU"
-Linux.additional_packages = ""
-
-# The EDU package allows us to create a separate release channel whose expirations
-# are synchronized as much as possible with the academic year
-EDU_sourceid = ""
-EDU_viewer_channel_suffix = "edu"
-
-# Notifications - to configure email notices use the TeamCity parameter
-# setting screen for your project or build configuration to set the
-# environment variable 'email' to a space-separated list of email addresses
-email=""
-
diff --git a/build.sh b/build.sh
index f7b3632ee8..fe795a24ee 100755
--- a/build.sh
+++ b/build.sh
@@ -6,9 +6,6 @@
 # it relies on the environment that sets up, functions it provides, and
 # the build result post-processing it does.
 #
-# The shared buildscript build.sh invokes this because it is named 'build.sh',
-# which is the default custom build script name in buildscripts/hg/BuildParams
-#
 # PLEASE NOTE:
 #
 # * This script is interpreted on three platforms, including windows and cygwin
-- 
cgit v1.2.3


From da9a1dcb55548a249ff7a1255f3e518696b81245 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 9 Apr 2024 17:14:13 -0400
Subject: Increment viewer version to 7.1.6 following promotion of
 secondlife/viewer #690

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 69adf3456f..14627a7c8c 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.5
+7.1.6
-- 
cgit v1.2.3


From 72d46037bd03dfcdf7f3804bb70a8cff86107a2a Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Wed, 10 Apr 2024 21:21:09 -0700
Subject: Remove unused fix-incredibuild.py

---
 indra/fix-incredibuild.py | 61 -----------------------------------------------
 1 file changed, 61 deletions(-)
 delete mode 100755 indra/fix-incredibuild.py

diff --git a/indra/fix-incredibuild.py b/indra/fix-incredibuild.py
deleted file mode 100755
index 678ee4329e..0000000000
--- a/indra/fix-incredibuild.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python3
-## 
-## $LicenseInfo:firstyear=2011&license=viewerlgpl$
-## Second Life Viewer Source Code
-## Copyright (C) 2011, 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$
-
-import sys
-import os
-import glob
-
-def delete_file_types(path, filetypes):
-    if os.path.exists(path):
-        print('Cleaning: ' + path)
-        orig_dir = os.getcwd();
-        os.chdir(path)
-        filelist = []
-        for type in filetypes:
-            filelist.extend(glob.glob(type))
-        for file in filelist:
-            os.remove(file)
-        os.chdir(orig_dir)
-
-def main():
-    build_types = ['*.exp','*.exe','*.pdb','*.idb',
-                 '*.ilk','*.lib','*.obj','*.ib_pdb_index']
-    pch_types = ['*.pch']
-    delete_file_types("build-vc80/newview/Release", build_types)
-    delete_file_types("build-vc80/newview/secondlife-bin.dir/Release/", 
-                      pch_types)
-    delete_file_types("build-vc80/newview/RelWithDebInfo", build_types)
-    delete_file_types("build-vc80/newview/secondlife-bin.dir/RelWithDebInfo/", 
-                      pch_types)
-    delete_file_types("build-vc80/newview/Debug", build_types)
-    delete_file_types("build-vc80/newview/secondlife-bin.dir/Debug/", 
-                      pch_types)
-
-
-    delete_file_types("build-vc80/test/RelWithDebInfo", build_types)
-    delete_file_types("build-vc80/test/test.dir/RelWithDebInfo/", 
-                      pch_types)
-
-
-if __name__ == "__main__":
-    main()
-- 
cgit v1.2.3


From 7fa24d636e42c19baf8a9a6fc4bf9b554dca0e3a Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Thu, 11 Apr 2024 00:16:17 -0700
Subject: CI: Remove python-version from matrix

Drop python version from matrix configuration as it's always 3.11.
---
 .github/workflows/build.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ddb0f44150..f18b31ef0f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -13,7 +13,6 @@ jobs:
       matrix:
         runner: [windows-large, macos-12-xl]
         configuration: [Release, ReleaseOS]
-        python-version: ["3.11"]
         include:
           - runner: macos-12-xl
             developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
@@ -67,7 +66,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.11"
 
       - name: Checkout build variables
         uses: actions/checkout@v4
-- 
cgit v1.2.3


From 0f94ea86d44f56ace4160eabceafe07a1f11784f Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Thu, 11 Apr 2024 13:32:48 -0700
Subject: CI: adopt xz compression

Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
---
 .github/workflows/build.yaml     | 58 +++++++++++++++-------------------------
 build.sh                         | 10 +++----
 indra/newview/CMakeLists.txt     | 12 ++++-----
 indra/newview/viewer_manifest.py | 14 +++++-----
 4 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f18b31ef0f..44f32c1c5d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,13 +12,10 @@ jobs:
     strategy:
       matrix:
         runner: [windows-large, macos-12-xl]
-        configuration: [Release, ReleaseOS]
+        configuration: [Release]
         include:
           - runner: macos-12-xl
             developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
-        exclude:
-          - runner: macos-12-xl
-            configuration: ReleaseOS
     runs-on: ${{ matrix.runner }}
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
@@ -100,7 +97,7 @@ jobs:
 
       - name: Determine source branch
         id: which-branch
-        uses: secondlife/viewer-build-util/which-branch@v1
+        uses: secondlife/viewer-build-util/which-branch@v2
         with:
           token: ${{ github.token }}
 
@@ -223,7 +220,7 @@ jobs:
 
       - name: Upload executable
         if: matrix.configuration != 'ReleaseOS' && steps.build.outputs.viewer_app
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.build.outputs.artifact }}-app"
           path: |
@@ -233,7 +230,7 @@ jobs:
       # artifact for that too.
       - name: Upload symbol file
         if: matrix.configuration != 'ReleaseOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.build.outputs.artifact }}-symbols"
           path: |
@@ -241,7 +238,7 @@ jobs:
 
       - name: Upload metadata
         if: matrix.configuration != 'ReleaseOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.build.outputs.artifact }}-metadata"
           # emitted by build.sh, possibly multiple lines
@@ -249,7 +246,7 @@ jobs:
             ${{ steps.build.outputs.metadata }}
 
       - name: Upload physics package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         # should only be set for viewer-private
         if: matrix.configuration != 'ReleaseOS' && steps.build.outputs.physicstpv
         with:
@@ -270,7 +267,7 @@ jobs:
     steps:
       - name: Sign and package Windows viewer
         if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID
-        uses: secondlife/viewer-build-util/sign-pkg-windows@v1
+        uses: secondlife/viewer-build-util/sign-pkg-windows@v2
         with:
           vault_uri: "${{ env.AZURE_KEY_VAULT_URI }}"
           cert_name: "${{ env.AZURE_CERT_NAME }}"
@@ -309,7 +306,7 @@ jobs:
 
       - name: Sign and package Mac viewer
         if: env.SIGNING_CERT_MACOS && env.SIGNING_CERT_MACOS_IDENTITY && env.SIGNING_CERT_MACOS_PASSWORD && steps.note-creds.outputs.note_user && steps.note-creds.outputs.note_pass && steps.note-creds.outputs.note_team
-        uses: secondlife/viewer-build-util/sign-pkg-mac@v1
+        uses: secondlife/viewer-build-util/sign-pkg-mac@v2
         with:
           channel: ${{ needs.build.outputs.viewer_channel }}
           imagename: ${{ needs.build.outputs.imagename }}
@@ -329,7 +326,7 @@ jobs:
     steps:
       - name: Post Windows symbols
         if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
-        uses: secondlife/viewer-build-util/post-bugsplat-windows@v1
+        uses: secondlife/viewer-build-util/post-bugsplat-windows@v2
         with:
           username: ${{ env.BUGSPLAT_USER }}
           password: ${{ env.BUGSPLAT_PASS }}
@@ -346,7 +343,7 @@ jobs:
     steps:
       - name: Post Mac symbols
         if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
-        uses: secondlife/viewer-build-util/post-bugsplat-mac@v1
+        uses: secondlife/viewer-build-util/post-bugsplat-mac@v2
         with:
           username: ${{ env.BUGSPLAT_USER }}
           password: ${{ env.BUGSPLAT_PASS }}
@@ -359,31 +356,20 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life_')
     steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: Windows-installer
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: macOS-installer
-
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: Windows-metadata
-
-      - name: Rename windows metadata 
-        run: |
-          mv autobuild-package.xml Windows-autobuild-package.xml
-          mv newview/viewer_version.txt Windows-viewer_version.txt
+          pattern: "*-installer"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: macOS-metadata
-
-      - name: Rename macOS metadata 
+          pattern: "*-metadata"
+      
+      - name: Rename metadata
         run: |
-          mv autobuild-package.xml macOS-autobuild-package.xml
-          mv newview/viewer_version.txt macOS-viewer_version.txt
+          cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml
+          cp Windows-metadata/newview/viewer_version.txt Windows-viewer_version.txt
+          cp macOS-metadata/autobuild-package.xml macOS-autobuild-package.xml
+          cp macOS-metadata/newview/viewer_version.txt macOS-viewer_version.txt
 
       # forked from softprops/action-gh-release
       - name: Create GitHub release
@@ -406,8 +392,8 @@ jobs:
           append_body: true
           fail_on_unmatched_files: true
           files: |
-            *.dmg 
-            *.exe
+            macOS-installer/*.dmg 
+            Windows-installer/*.exe
             *-autobuild-package.xml
             *-viewer_version.txt
 
diff --git a/build.sh b/build.sh
index 806718e077..46a287ea32 100755
--- a/build.sh
+++ b/build.sh
@@ -82,7 +82,7 @@ installer_Linux()
 {
   local package_name="$1"
   local package_dir="$(build_dir_Linux)/newview/"
-  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$"
+  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.xz\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
   # even if someone makes a qualified name that duplicates the last word of the base name
@@ -170,7 +170,7 @@ pre_build()
         # This name is consumed by indra/newview/CMakeLists.txt. Make it
         # absolute because we've had troubles with relative pathnames.
         abs_build_dir="$(cd "$build_dir"; pwd)"
-        VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2")"
+        VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.xz")"
     fi
 
     # honor autobuild_configure_parameters same as sling-buildscripts
@@ -414,10 +414,10 @@ do
               fi
               if [ -d "$build_dir/doxygen/html" ]
               then
-                  tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3  "$build_dir/doxygen/html"
-                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" \
+                  tar -cJf "$build_dir/viewer-doxygen.tar.xz" --strip-components 3  "$build_dir/doxygen/html"
+                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.xz" \
                       || fatal "Upload of doxygen tarball failed"
-                  metadata+=("$build_dir/viewer-doxygen.tar.bz2")
+                  metadata+=("$build_dir/viewer-doxygen.tar.xz")
               fi
               ;;
             *)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 355f35c558..39f6117c69 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1820,7 +1820,7 @@ if (WINDOWS)
 
     if (PACKAGE)
       add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
@@ -1864,7 +1864,7 @@ if (WINDOWS)
         )
         # temporarily disable packaging of event_host until hg subrepos get
         # sorted out on the parabuild cluster...
-        #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2)
+        #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz)
 
     endif (PACKAGE)
 elseif (DARWIN)
@@ -1984,7 +1984,7 @@ if (LINUX)
   #endif (NOT USE_BUGSPLAT)
 
   add_custom_command(
-      OUTPUT ${product}.tar.bz2
+      OUTPUT ${product}.tar.xz
       COMMAND ${PYTHON_EXECUTABLE}
       ARGS
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -2038,7 +2038,7 @@ if (LINUX)
   add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched)
 
   if (PACKAGE)
-    add_custom_target(llpackage ALL DEPENDS ${product}.tar.bz2)
+    add_custom_target(llpackage ALL DEPENDS ${product}.tar.xz)
     # Make sure we don't run two instances of viewer_manifest.py at the same time.
     add_dependencies(llpackage copy_l_viewer_manifest)
     check_message_template(llpackage)
@@ -2169,12 +2169,12 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
         OUTPUT_VARIABLE PARENT_DIRECTORY_CYGWIN
         OUTPUT_STRIP_TRAILING_WHITESPACE)
       add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}"
-        # Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.bz2;
+        # Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.xz;
         # testing a string suffix is painful enough in CMake language that
         # we'll continue assuming it until forced to generalize.
         COMMAND "tar"
         ARGS
-          "cjf"
+          "cJf"
           "${VIEWER_SYMBOL_FILE_CYGWIN}"
           "-C"
           "${PARENT_DIRECTORY_CYGWIN}"
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c7f32d0da9..4de4dc8fc5 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -525,7 +525,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
                                              'secondlife-bin.*',
                                              '*_Setup.exe',
                                              '*.bat',
-                                             '*.tar.bz2')))
+                                             '*.tar.xz')))
 
             with self.prefix(src=os.path.join(pkgdir, "VMP")):
                 # include the compiled launcher scripts so that it gets included in the file_list
@@ -1183,9 +1183,9 @@ class Darwin_x86_64_Manifest(ViewerManifest):
             # causes problems, especially with frameworks: a framework's top
             # level must contain symlinks into its Versions/Current, which
             # must itself be a symlink to some specific Versions subdir.
-            tarpath = os.path.join(RUNNER_TEMP, "viewer.tar.bz2")
+            tarpath = os.path.join(RUNNER_TEMP, "viewer.tar.xz")
             print(f'Creating {tarpath} from {self.get_dst_prefix()}')
-            with tarfile.open(tarpath, mode="w:bz2") as tarball:
+            with tarfile.open(tarpath, mode="w:xz") as tarball:
                 # Store in the tarball as just 'Second Life Mumble.app'
                 # instead of 'Users/someone/.../newview/Release/Second...'
                 # It's at this point that we rename 'Second Life Release.app'
@@ -1272,7 +1272,7 @@ class LinuxManifest(ViewerManifest):
             self.run_command(['find', self.get_dst_prefix(),
                               '-type', 'f', '-perm', old,
                               '-exec', 'chmod', new, '{}', ';'])
-        self.package_file = installer_name + '.tar.bz2'
+        self.package_file = installer_name + '.tar.xz'
 
         # temporarily move directory tree so that it has the right
         # name in the tarfile
@@ -1285,10 +1285,10 @@ class LinuxManifest(ViewerManifest):
                 # --numeric-owner hides the username of the builder for
                 # security etc.
                 self.run_command(['tar', '-C', self.get_build_prefix(),
-                                  '--numeric-owner', '-cjf',
-                                 tempname + '.tar.bz2', installer_name])
+                                  '--numeric-owner', '-cJf',
+                                 tempname + '.tar.xz', installer_name])
             else:
-                print("Skipping %s.tar.bz2 for non-Release build (%s)" % \
+                print("Skipping %s.tar.xz for non-Release build (%s)" % \
                       (installer_name, self.args['buildtype']))
         finally:
             self.run_command(["mv", tempname, realname])
-- 
cgit v1.2.3


From e1f9356e917c197a26557467b84304c33432bb24 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Sat, 30 Mar 2024 21:21:55 -0700
Subject: Remove BuildParams

This file is no longer used.
---
 BuildParams | 73 -------------------------------------------------------------
 build.sh    |  3 ---
 2 files changed, 76 deletions(-)
 delete mode 100644 BuildParams

diff --git a/BuildParams b/BuildParams
deleted file mode 100644
index dda25e3e63..0000000000
--- a/BuildParams
+++ /dev/null
@@ -1,73 +0,0 @@
-# BuildParams
-#
-# Please refer to:
-#  https://wiki.secondlife.com/wiki/Automated_Build_System
-
-# Variants (NOTE: 'Release' must be last for uploads to work correctly)
-variants = "RelWithDebInfo Release"
-
-# Use Public Upload Locations
-public_build = true
-build_docs = true
-
-# enable Doxygen building on Linux for TeamCity (it can be done manually on any platform)
-build_Linux_Doxygen = true
-
-# Need viewer-build-variables as well as other shared repositories
-buildscripts_shared_more_NAMEs="build_secrets build_variables git_hooks"
-
-# Python 3 / SL-15742
-BUILDSCRIPTS_PY3 = "true"
-
-################################################################
-####      Examples of how to set the viewer_channel         ####
-#
-# To build a Release or Release candidate in build bingo:
-#    bingo.viewer_channel = "Second Life Release"
-#
-# To build a Beta for the 'Bingo' project in build bingo:
-#    bingo.viewer_channel = "Second Life Beta Bingo"
-#
-# To build a Project viewer for the 'Bingo' project in build bingo:
-#    bingo.viewer_channel = "Second Life Project Bingo"
-#
-# If left unset, viewer_channel defaults to 'Second Life Test',
-# which is appropriate for individual developer builds.
-#
-# All Linden Lab builds (and only Linden Lab builds)
-# should use a viewer_channel that begins with "Second Life"
-################################################################
-viewer_channel = "Second Life Test"
-
-
-################################################################
-# Special packaging parameters.
-# These parameters can be used to create additional packages
-# which identify themselves in a distinct way with either
-# a sourceid (sent to web services) or a channel name (sent to login)
-# the default sourceid should always be a null string:
-sourceid = ""
-# the additional_packages variable is a blank separated list of package prefixes:
-# additional_packages = ""
-# to set the special values for a package, create variables using each prefix:
-#   additional_packages = "Foo Bar"
-#   Foo_sourceid = "bingo"
-#   Foo_viewer_channel_suffix = "Foo"
-#   Bar_sourceid = "bongo"
-#   Bar_viewer_channel_suffix = "Bar"
-# the viewer_channel_suffix is prefixed by a blank and then appended to the viewer_channel
-# for the package in a setting that overrides the compiled-in value
-################################################################
-additional_packages = "EDU"
-Linux.additional_packages = ""
-
-# The EDU package allows us to create a separate release channel whose expirations
-# are synchronized as much as possible with the academic year
-EDU_sourceid = ""
-EDU_viewer_channel_suffix = "edu"
-
-# Notifications - to configure email notices use the TeamCity parameter
-# setting screen for your project or build configuration to set the
-# environment variable 'email' to a space-separated list of email addresses
-email=""
-
diff --git a/build.sh b/build.sh
index 251a04a6dd..806718e077 100755
--- a/build.sh
+++ b/build.sh
@@ -6,9 +6,6 @@
 # it relies on the environment that sets up, functions it provides, and
 # the build result post-processing it does.
 #
-# The shared buildscript build.sh invokes this because it is named 'build.sh',
-# which is the default custom build script name in buildscripts/hg/BuildParams
-#
 # PLEASE NOTE:
 #
 # * This script is interpreted on three platforms, including windows and cygwin
-- 
cgit v1.2.3


From 970531b483e4cab8c5b9608028f19626ce6f0cce Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Wed, 10 Apr 2024 21:21:09 -0700
Subject: Remove unused fix-incredibuild.py

---
 indra/fix-incredibuild.py | 61 -----------------------------------------------
 1 file changed, 61 deletions(-)
 delete mode 100755 indra/fix-incredibuild.py

diff --git a/indra/fix-incredibuild.py b/indra/fix-incredibuild.py
deleted file mode 100755
index 678ee4329e..0000000000
--- a/indra/fix-incredibuild.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python3
-## 
-## $LicenseInfo:firstyear=2011&license=viewerlgpl$
-## Second Life Viewer Source Code
-## Copyright (C) 2011, 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$
-
-import sys
-import os
-import glob
-
-def delete_file_types(path, filetypes):
-    if os.path.exists(path):
-        print('Cleaning: ' + path)
-        orig_dir = os.getcwd();
-        os.chdir(path)
-        filelist = []
-        for type in filetypes:
-            filelist.extend(glob.glob(type))
-        for file in filelist:
-            os.remove(file)
-        os.chdir(orig_dir)
-
-def main():
-    build_types = ['*.exp','*.exe','*.pdb','*.idb',
-                 '*.ilk','*.lib','*.obj','*.ib_pdb_index']
-    pch_types = ['*.pch']
-    delete_file_types("build-vc80/newview/Release", build_types)
-    delete_file_types("build-vc80/newview/secondlife-bin.dir/Release/", 
-                      pch_types)
-    delete_file_types("build-vc80/newview/RelWithDebInfo", build_types)
-    delete_file_types("build-vc80/newview/secondlife-bin.dir/RelWithDebInfo/", 
-                      pch_types)
-    delete_file_types("build-vc80/newview/Debug", build_types)
-    delete_file_types("build-vc80/newview/secondlife-bin.dir/Debug/", 
-                      pch_types)
-
-
-    delete_file_types("build-vc80/test/RelWithDebInfo", build_types)
-    delete_file_types("build-vc80/test/test.dir/RelWithDebInfo/", 
-                      pch_types)
-
-
-if __name__ == "__main__":
-    main()
-- 
cgit v1.2.3


From f8c7933f306dc2cec81b222a1d58a1d84e0f6442 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Thu, 11 Apr 2024 00:16:17 -0700
Subject: CI: Remove python-version from matrix

Drop python version from matrix configuration as it's always 3.11.
---
 .github/workflows/build.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ddb0f44150..f18b31ef0f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -13,7 +13,6 @@ jobs:
       matrix:
         runner: [windows-large, macos-12-xl]
         configuration: [Release, ReleaseOS]
-        python-version: ["3.11"]
         include:
           - runner: macos-12-xl
             developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
@@ -67,7 +66,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.11"
 
       - name: Checkout build variables
         uses: actions/checkout@v4
-- 
cgit v1.2.3


From 11bffc8252d169d84bf5066ad4cd34cad535f5e8 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Thu, 11 Apr 2024 13:32:48 -0700
Subject: CI: adopt xz compression

Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
---
 .github/workflows/build.yaml     | 58 +++++++++++++++-------------------------
 build.sh                         | 10 +++----
 indra/newview/CMakeLists.txt     | 12 ++++-----
 indra/newview/viewer_manifest.py | 14 +++++-----
 4 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f18b31ef0f..44f32c1c5d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,13 +12,10 @@ jobs:
     strategy:
       matrix:
         runner: [windows-large, macos-12-xl]
-        configuration: [Release, ReleaseOS]
+        configuration: [Release]
         include:
           - runner: macos-12-xl
             developer_dir: "/Applications/Xcode_14.0.1.app/Contents/Developer"
-        exclude:
-          - runner: macos-12-xl
-            configuration: ReleaseOS
     runs-on: ${{ matrix.runner }}
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
@@ -100,7 +97,7 @@ jobs:
 
       - name: Determine source branch
         id: which-branch
-        uses: secondlife/viewer-build-util/which-branch@v1
+        uses: secondlife/viewer-build-util/which-branch@v2
         with:
           token: ${{ github.token }}
 
@@ -223,7 +220,7 @@ jobs:
 
       - name: Upload executable
         if: matrix.configuration != 'ReleaseOS' && steps.build.outputs.viewer_app
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.build.outputs.artifact }}-app"
           path: |
@@ -233,7 +230,7 @@ jobs:
       # artifact for that too.
       - name: Upload symbol file
         if: matrix.configuration != 'ReleaseOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.build.outputs.artifact }}-symbols"
           path: |
@@ -241,7 +238,7 @@ jobs:
 
       - name: Upload metadata
         if: matrix.configuration != 'ReleaseOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "${{ steps.build.outputs.artifact }}-metadata"
           # emitted by build.sh, possibly multiple lines
@@ -249,7 +246,7 @@ jobs:
             ${{ steps.build.outputs.metadata }}
 
       - name: Upload physics package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         # should only be set for viewer-private
         if: matrix.configuration != 'ReleaseOS' && steps.build.outputs.physicstpv
         with:
@@ -270,7 +267,7 @@ jobs:
     steps:
       - name: Sign and package Windows viewer
         if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID
-        uses: secondlife/viewer-build-util/sign-pkg-windows@v1
+        uses: secondlife/viewer-build-util/sign-pkg-windows@v2
         with:
           vault_uri: "${{ env.AZURE_KEY_VAULT_URI }}"
           cert_name: "${{ env.AZURE_CERT_NAME }}"
@@ -309,7 +306,7 @@ jobs:
 
       - name: Sign and package Mac viewer
         if: env.SIGNING_CERT_MACOS && env.SIGNING_CERT_MACOS_IDENTITY && env.SIGNING_CERT_MACOS_PASSWORD && steps.note-creds.outputs.note_user && steps.note-creds.outputs.note_pass && steps.note-creds.outputs.note_team
-        uses: secondlife/viewer-build-util/sign-pkg-mac@v1
+        uses: secondlife/viewer-build-util/sign-pkg-mac@v2
         with:
           channel: ${{ needs.build.outputs.viewer_channel }}
           imagename: ${{ needs.build.outputs.imagename }}
@@ -329,7 +326,7 @@ jobs:
     steps:
       - name: Post Windows symbols
         if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
-        uses: secondlife/viewer-build-util/post-bugsplat-windows@v1
+        uses: secondlife/viewer-build-util/post-bugsplat-windows@v2
         with:
           username: ${{ env.BUGSPLAT_USER }}
           password: ${{ env.BUGSPLAT_PASS }}
@@ -346,7 +343,7 @@ jobs:
     steps:
       - name: Post Mac symbols
         if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
-        uses: secondlife/viewer-build-util/post-bugsplat-mac@v1
+        uses: secondlife/viewer-build-util/post-bugsplat-mac@v2
         with:
           username: ${{ env.BUGSPLAT_USER }}
           password: ${{ env.BUGSPLAT_PASS }}
@@ -359,31 +356,20 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life_')
     steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: Windows-installer
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: macOS-installer
-
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: Windows-metadata
-
-      - name: Rename windows metadata 
-        run: |
-          mv autobuild-package.xml Windows-autobuild-package.xml
-          mv newview/viewer_version.txt Windows-viewer_version.txt
+          pattern: "*-installer"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: macOS-metadata
-
-      - name: Rename macOS metadata 
+          pattern: "*-metadata"
+      
+      - name: Rename metadata
         run: |
-          mv autobuild-package.xml macOS-autobuild-package.xml
-          mv newview/viewer_version.txt macOS-viewer_version.txt
+          cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml
+          cp Windows-metadata/newview/viewer_version.txt Windows-viewer_version.txt
+          cp macOS-metadata/autobuild-package.xml macOS-autobuild-package.xml
+          cp macOS-metadata/newview/viewer_version.txt macOS-viewer_version.txt
 
       # forked from softprops/action-gh-release
       - name: Create GitHub release
@@ -406,8 +392,8 @@ jobs:
           append_body: true
           fail_on_unmatched_files: true
           files: |
-            *.dmg 
-            *.exe
+            macOS-installer/*.dmg 
+            Windows-installer/*.exe
             *-autobuild-package.xml
             *-viewer_version.txt
 
diff --git a/build.sh b/build.sh
index 806718e077..46a287ea32 100755
--- a/build.sh
+++ b/build.sh
@@ -82,7 +82,7 @@ installer_Linux()
 {
   local package_name="$1"
   local package_dir="$(build_dir_Linux)/newview/"
-  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$"
+  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.xz\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
   # even if someone makes a qualified name that duplicates the last word of the base name
@@ -170,7 +170,7 @@ pre_build()
         # This name is consumed by indra/newview/CMakeLists.txt. Make it
         # absolute because we've had troubles with relative pathnames.
         abs_build_dir="$(cd "$build_dir"; pwd)"
-        VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2")"
+        VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.xz")"
     fi
 
     # honor autobuild_configure_parameters same as sling-buildscripts
@@ -414,10 +414,10 @@ do
               fi
               if [ -d "$build_dir/doxygen/html" ]
               then
-                  tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3  "$build_dir/doxygen/html"
-                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" \
+                  tar -cJf "$build_dir/viewer-doxygen.tar.xz" --strip-components 3  "$build_dir/doxygen/html"
+                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.xz" \
                       || fatal "Upload of doxygen tarball failed"
-                  metadata+=("$build_dir/viewer-doxygen.tar.bz2")
+                  metadata+=("$build_dir/viewer-doxygen.tar.xz")
               fi
               ;;
             *)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5408d03509..a6ae041935 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1804,7 +1804,7 @@ if (WINDOWS)
 
     if (PACKAGE)
       add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
@@ -1848,7 +1848,7 @@ if (WINDOWS)
         )
         # temporarily disable packaging of event_host until hg subrepos get
         # sorted out on the parabuild cluster...
-        #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2)
+        #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz)
 
     endif (PACKAGE)
 elseif (DARWIN)
@@ -1968,7 +1968,7 @@ if (LINUX)
   #endif (NOT USE_BUGSPLAT)
 
   add_custom_command(
-      OUTPUT ${product}.tar.bz2
+      OUTPUT ${product}.tar.xz
       COMMAND ${PYTHON_EXECUTABLE}
       ARGS
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -2022,7 +2022,7 @@ if (LINUX)
   add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched)
 
   if (PACKAGE)
-    add_custom_target(llpackage ALL DEPENDS ${product}.tar.bz2)
+    add_custom_target(llpackage ALL DEPENDS ${product}.tar.xz)
     # Make sure we don't run two instances of viewer_manifest.py at the same time.
     add_dependencies(llpackage copy_l_viewer_manifest)
     check_message_template(llpackage)
@@ -2153,12 +2153,12 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
         OUTPUT_VARIABLE PARENT_DIRECTORY_CYGWIN
         OUTPUT_STRIP_TRAILING_WHITESPACE)
       add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}"
-        # Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.bz2;
+        # Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.xz;
         # testing a string suffix is painful enough in CMake language that
         # we'll continue assuming it until forced to generalize.
         COMMAND "tar"
         ARGS
-          "cjf"
+          "cJf"
           "${VIEWER_SYMBOL_FILE_CYGWIN}"
           "-C"
           "${PARENT_DIRECTORY_CYGWIN}"
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c7f32d0da9..4de4dc8fc5 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -525,7 +525,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
                                              'secondlife-bin.*',
                                              '*_Setup.exe',
                                              '*.bat',
-                                             '*.tar.bz2')))
+                                             '*.tar.xz')))
 
             with self.prefix(src=os.path.join(pkgdir, "VMP")):
                 # include the compiled launcher scripts so that it gets included in the file_list
@@ -1183,9 +1183,9 @@ class Darwin_x86_64_Manifest(ViewerManifest):
             # causes problems, especially with frameworks: a framework's top
             # level must contain symlinks into its Versions/Current, which
             # must itself be a symlink to some specific Versions subdir.
-            tarpath = os.path.join(RUNNER_TEMP, "viewer.tar.bz2")
+            tarpath = os.path.join(RUNNER_TEMP, "viewer.tar.xz")
             print(f'Creating {tarpath} from {self.get_dst_prefix()}')
-            with tarfile.open(tarpath, mode="w:bz2") as tarball:
+            with tarfile.open(tarpath, mode="w:xz") as tarball:
                 # Store in the tarball as just 'Second Life Mumble.app'
                 # instead of 'Users/someone/.../newview/Release/Second...'
                 # It's at this point that we rename 'Second Life Release.app'
@@ -1272,7 +1272,7 @@ class LinuxManifest(ViewerManifest):
             self.run_command(['find', self.get_dst_prefix(),
                               '-type', 'f', '-perm', old,
                               '-exec', 'chmod', new, '{}', ';'])
-        self.package_file = installer_name + '.tar.bz2'
+        self.package_file = installer_name + '.tar.xz'
 
         # temporarily move directory tree so that it has the right
         # name in the tarfile
@@ -1285,10 +1285,10 @@ class LinuxManifest(ViewerManifest):
                 # --numeric-owner hides the username of the builder for
                 # security etc.
                 self.run_command(['tar', '-C', self.get_build_prefix(),
-                                  '--numeric-owner', '-cjf',
-                                 tempname + '.tar.bz2', installer_name])
+                                  '--numeric-owner', '-cJf',
+                                 tempname + '.tar.xz', installer_name])
             else:
-                print("Skipping %s.tar.bz2 for non-Release build (%s)" % \
+                print("Skipping %s.tar.xz for non-Release build (%s)" % \
                       (installer_name, self.args['buildtype']))
         finally:
             self.run_command(["mv", tempname, realname])
-- 
cgit v1.2.3


From b340042a3f20b516d482e72e423ff4b00e085e1f Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Tue, 16 Apr 2024 12:19:09 -0400
Subject: https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml

---
 .github/workflows/cla.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml
index b4b2565889..3f4bf21864 100644
--- a/.github/workflows/cla.yaml
+++ b/.github/workflows/cla.yaml
@@ -19,7 +19,7 @@ jobs:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.SHARED_CLA_TOKEN }}
         with:
           branch: main
-          path-to-document: https://github.com/secondlife/cla/blob/master/CLA.md
+          path-to-document: https://github.com/secondlife/cla/blob/main/CLA.md
           path-to-signatures: signatures.json
           remote-organization-name: secondlife
           remote-repository-name: cla-signatures
-- 
cgit v1.2.3


From 5e40b5e64433b224be4dc220e4496dcd0a43f3f6 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Mon, 15 Apr 2024 18:39:23 +0300
Subject: Revert "SL-20140 Setting shape hand size to 36 won't save"

This reverts commit 810a3d24c2e3671f926091c062b101bdec6a1517. (secondlife/jira-archive-internal#70482)
---
 indra/newview/character/avatar_lad.xml      | 17 ++++----
 indra/newview/llscrollingpanelparam.cpp     | 63 ++++++++++++++++++++---------
 indra/newview/llscrollingpanelparam.h       |  3 ++
 indra/newview/llscrollingpanelparambase.cpp | 29 +++++++------
 indra/newview/llscrollingpanelparambase.h   |  7 +---
 5 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index aef402d4db..2cdd86267e 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -2021,7 +2021,7 @@
      value_min="-1"
      value_max="1">
       <param_skeleton>
-
+	  
         <bone
          name="mEyeLeft"
          scale="0 0 0"
@@ -2031,8 +2031,9 @@
          name="mEyeRight"
          scale="0 0 0"
          offset="-.005 0 0" />
-
-        <bone
+		 
+	  
+<bone
          name="mFaceEyeAltLeft"
          scale="0 0 0"
          offset="-.005 0 0" />
@@ -2041,7 +2042,7 @@
          name="mFaceEyeAltRight"
          scale="0 0 0"
          offset="-.005 0 0" />
-
+	  
         <bone
          name="mFaceEyeLidLowerRight"
          scale="0 0.3 0.7"
@@ -2052,7 +2053,7 @@
          scale="0 0.3 0.7"
          offset="0 0 0" />
 
-        <bone
+		 <bone
          name="mFaceEyeLidUpperRight"
          scale="0 0.3 0.7"
          offset=" 0 0 0" />
@@ -2061,17 +2062,17 @@
          name="mFaceEyeLidUpperLeft"
          scale="0 0.3 0.7"
          offset=" 0 0 0" />
-
+		 
         <bone
          name="mFaceEyecornerInnerLeft"
          scale="0 0 0"
          offset="-0.005 -0.008 0.0" />
-
+		 
         <bone
          name="mFaceEyecornerInnerRight"
          scale="0 0 0"
          offset="-0.005 0.008 0.0" />
-
+		 
       </param_skeleton>
     </param>
 
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp
index efd84eaa6d..bfa453a0ae 100644
--- a/indra/newview/llscrollingpanelparam.cpp
+++ b/indra/newview/llscrollingpanelparam.cpp
@@ -259,15 +259,19 @@ void LLScrollingPanelParam::onHintHeldDown( LLVisualParamHint* hint )
 
 		// Make sure we're not taking the slider out of bounds
 		// (this is where some simple UI limits are stored)
-		F32 new_percent = weightToSlider(new_weight);
-		if (mSlider->getMinValue() < new_percent
-			&& new_percent < mSlider->getMaxValue())
+		F32 new_percent = weightToPercent(new_weight);
+		LLSliderCtrl* slider = getChild<LLSliderCtrl>("param slider");
+		if (slider)
 		{
-			mWearable->setVisualParamWeight( hint->getVisualParam()->getID(), new_weight);
-			mWearable->writeToAvatar(gAgentAvatarp);
-			gAgentAvatarp->updateVisualParams();
+			if (slider->getMinValue() < new_percent
+				&& new_percent < slider->getMaxValue())
+			{
+				mWearable->setVisualParamWeight( hint->getVisualParam()->getID(), new_weight);
+				mWearable->writeToAvatar(gAgentAvatarp);
+				gAgentAvatarp->updateVisualParams();
 
-			mSlider->setValue( weightToSlider( new_weight ) );
+				slider->setValue( weightToPercent( new_weight ) );
+			}
 		}
 	}
 }
@@ -288,13 +292,17 @@ void LLScrollingPanelParam::onHintMinMouseUp( void* userdata )
 		F32 range = self->mHintMax->getVisualParamWeight() - self->mHintMin->getVisualParamWeight();
 		// step a fraction in the negative directiona
 		F32 new_weight = current_weight - (range / 10.f);
-		F32 new_percent = self->weightToSlider(new_weight);
-		if (self->mSlider->getMinValue() < new_percent
-			&& new_percent < self->mSlider->getMaxValue())
+		F32 new_percent = self->weightToPercent(new_weight);
+		LLSliderCtrl* slider = self->getChild<LLSliderCtrl>("param slider");
+		if (slider)
 		{
-			self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
-			self->mWearable->writeToAvatar(gAgentAvatarp);
-			self->mSlider->setValue( self->weightToSlider( new_weight ) );
+			if (slider->getMinValue() < new_percent
+				&& new_percent < slider->getMaxValue())
+			{
+				self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
+				self->mWearable->writeToAvatar(gAgentAvatarp);
+				slider->setValue( self->weightToPercent( new_weight ) );
+			}
 		}
 	}
 
@@ -318,16 +326,33 @@ void LLScrollingPanelParam::onHintMaxMouseUp( void* userdata )
 			F32 range = self->mHintMax->getVisualParamWeight() - self->mHintMin->getVisualParamWeight();
 			// step a fraction in the negative direction
 			F32 new_weight = current_weight + (range / 10.f);
-			F32 new_percent = self->weightToSlider(new_weight);
-			if (self->mSlider->getMinValue() < new_percent
-				&& new_percent < self->mSlider->getMaxValue())
+			F32 new_percent = self->weightToPercent(new_weight);
+			LLSliderCtrl* slider = self->getChild<LLSliderCtrl>("param slider");
+			if (slider)
 			{
-				self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
-				self->mWearable->writeToAvatar(gAgentAvatarp);
-				self->mSlider->setValue( self->weightToSlider( new_weight ) );
+				if (slider->getMinValue() < new_percent
+					&& new_percent < slider->getMaxValue())
+				{
+					self->mWearable->setVisualParamWeight(hint->getVisualParam()->getID(), new_weight);
+					self->mWearable->writeToAvatar(gAgentAvatarp);
+					slider->setValue( self->weightToPercent( new_weight ) );
+				}
 			}
 		}
 	}
 
 	LLVisualParamHint::requestHintUpdates( self->mHintMin, self->mHintMax );
 }
+
+
+F32 LLScrollingPanelParam::weightToPercent( F32 weight )
+{
+	LLViewerVisualParam* param = mParam;
+	return (weight - param->getMinWeight()) /  (param->getMaxWeight() - param->getMinWeight()) * 100.f;
+}
+
+F32 LLScrollingPanelParam::percentToWeight( F32 percent )
+{
+	LLViewerVisualParam* param = mParam;
+	return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
+}
diff --git a/indra/newview/llscrollingpanelparam.h b/indra/newview/llscrollingpanelparam.h
index dc344486fc..c7a47d5c7a 100644
--- a/indra/newview/llscrollingpanelparam.h
+++ b/indra/newview/llscrollingpanelparam.h
@@ -61,6 +61,9 @@ public:
 	void				onHintMouseDown( LLVisualParamHint* hint );
 	void				onHintHeldDown( LLVisualParamHint* hint );
 
+	F32					weightToPercent( F32 weight );
+	F32					percentToWeight( F32 percent );
+
 public:
 	// Constants for LLPanelVisualParam
 	const static F32 PARAM_STEP_TIME_THRESHOLD;
diff --git a/indra/newview/llscrollingpanelparambase.cpp b/indra/newview/llscrollingpanelparambase.cpp
index 2a6c25235d..fe7a362723 100644
--- a/indra/newview/llscrollingpanelparambase.cpp
+++ b/indra/newview/llscrollingpanelparambase.cpp
@@ -43,7 +43,6 @@ LLScrollingPanelParamBase::LLScrollingPanelParamBase( const LLPanel::Params& pan
 						      LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints)
 	: LLScrollingPanel( panel_params ),
 	  mParam(param),
-	  mSlider(nullptr),
 	  mAllowModify(allow_modify),
 	  mWearable(wearable)
 {
@@ -51,15 +50,13 @@ LLScrollingPanelParamBase::LLScrollingPanelParamBase( const LLPanel::Params& pan
 		buildFromFile( "panel_scrolling_param.xml");
 	else
 		buildFromFile( "panel_scrolling_param_base.xml");
-
-	mSlider = getChild<LLSliderCtrl>("param slider");
-	mSlider->setMaxValue(100.f * (mParam->getMaxWeight() - mParam->getMinWeight()));
-	mSlider->setValue(weightToSlider(param->getWeight()));
+	
+	getChild<LLUICtrl>("param slider")->setValue(weightToPercent(param->getWeight()));
 
 	std::string display_name = LLTrans::getString(param->getDisplayName());
-	mSlider->setLabelArg("[DESC]", display_name);
-	mSlider->setEnabled(mAllowModify);
-	mSlider->setCommitCallback(boost::bind(LLScrollingPanelParamBase::onSliderMoved, mSlider, this));
+	getChild<LLUICtrl>("param slider")->setLabelArg("[DESC]", display_name);
+	getChildView("param slider")->setEnabled(mAllowModify);
+	childSetCommitCallback("param slider", LLScrollingPanelParamBase::onSliderMoved, this);
 
 	setVisible(FALSE);
 	setBorderVisible( FALSE );
@@ -80,9 +77,9 @@ void LLScrollingPanelParamBase::updatePanel(BOOL allow_modify)
 	}
 
 	F32 current_weight = mWearable->getVisualParamWeight( param->getID() );
-	mSlider->setValue(weightToSlider( current_weight ) );
+	getChild<LLUICtrl>("param slider")->setValue(weightToPercent( current_weight ) );
 	mAllowModify = allow_modify;
-	mSlider->setEnabled(mAllowModify);
+	getChildView("param slider")->setEnabled(mAllowModify);
 }
 
 // static
@@ -93,7 +90,7 @@ void LLScrollingPanelParamBase::onSliderMoved(LLUICtrl* ctrl, void* userdata)
 	LLViewerVisualParam* param = self->mParam;
 	
 	F32 current_weight = self->mWearable->getVisualParamWeight( param->getID() );
-	F32 new_weight = self->sliderToWeight( (F32)slider->getValue().asReal() );
+	F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
 	if (current_weight != new_weight )
 	{
 		self->mWearable->setVisualParamWeight( param->getID(), new_weight);
@@ -102,12 +99,14 @@ void LLScrollingPanelParamBase::onSliderMoved(LLUICtrl* ctrl, void* userdata)
 	}
 }
 
-F32 LLScrollingPanelParamBase::weightToSlider(F32 weight)
+F32 LLScrollingPanelParamBase::weightToPercent( F32 weight )
 {
-	return (weight - mParam->getMinWeight()) * 100.f;
+	LLViewerVisualParam* param = mParam;
+	return (weight - param->getMinWeight()) /  (param->getMaxWeight() - param->getMinWeight()) * 100.f;
 }
 
-F32 LLScrollingPanelParamBase::sliderToWeight(F32 slider)
+F32 LLScrollingPanelParamBase::percentToWeight( F32 percent )
 {
-	return slider / 100.f + mParam->getMinWeight();
+	LLViewerVisualParam* param = mParam;
+	return percent / 100.f * (param->getMaxWeight() - param->getMinWeight()) + param->getMinWeight();
 }
diff --git a/indra/newview/llscrollingpanelparambase.h b/indra/newview/llscrollingpanelparambase.h
index e7f88a21bd..9538826251 100644
--- a/indra/newview/llscrollingpanelparambase.h
+++ b/indra/newview/llscrollingpanelparambase.h
@@ -36,7 +36,6 @@ class LLViewerVisualParam;
 class LLWearable;
 class LLVisualParamHint;
 class LLViewerVisualParam;
-class LLSliderCtrl;
 class LLJoint;
 
 class LLScrollingPanelParamBase : public LLScrollingPanel
@@ -50,13 +49,11 @@ public:
 
 	static void			onSliderMoved(LLUICtrl* ctrl, void* userdata);
 
-	F32					weightToSlider(F32 weight);
-	F32					sliderToWeight(F32 slider);
+	F32					weightToPercent( F32 weight );
+	F32					percentToWeight( F32 percent );
 
 public:
 	LLViewerVisualParam* mParam;
-	LLSliderCtrl* mSlider;
-
 protected:
 	BOOL mAllowModify;
 	LLWearable *mWearable;
-- 
cgit v1.2.3


From d98fc504a1d4bc292ba86acdda053c8b4598a193 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 24 Apr 2024 09:43:07 -0400
Subject: Increment viewer version to 7.1.7 following promotion of
 secondlife/viewer #736

---
 indra/newview/VIEWER_VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 14627a7c8c..2380dcfd47 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.6
+7.1.7
-- 
cgit v1.2.3