Merge branch 'main' into DRTVWR-588-maint-W

Author: marchcat

.gitignore

@@ -57,6 +57,7 @@ indra/newview/dbghelp.dll
 indra/newview/filters.xml
 indra/newview/fmod.dll
 indra/newview/fmod.log
+indra/newview/fonts
 indra/newview/mozilla-theme
 indra/newview/mozilla-universal-darwin.tgz
 indra/newview/pilot.txt
@@ -68,6 +69,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

autobuild.xml

@@ -239,6 +239,8 @@ Ansariel Hiller
 	SL-15398
 	SL-18432
 	SL-19140
+	SL-19575
+	SL-19623
 	SL-4126
 	SL-20224
 Aralara Rajal
@@ -899,6 +901,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])
     SL-18988
 Kolor Fall
 Komiko Okamoto

doc/contributions.txt

@@ -30,6 +30,7 @@ set(cmake_SOURCE_FILES
         GoogleMock.cmake
         Havok.cmake
         Hunspell.cmake
+        ICU4C.cmake
         JsonCpp.cmake
         LLAddBuildTest.cmake
         LLAppearance.cmake
@@ -64,7 +65,7 @@ set(cmake_SOURCE_FILES
         VisualLeakDetector.cmake
         LibVLCPlugin.cmake
         XmlRpcEpi.cmake
-    xxHash.cmake
+        xxHash.cmake
         ZLIBNG.cmake
         )
 

indra/cmake/CMakeLists.txt

@@ -62,6 +62,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)

indra/cmake/Copy3rdPartyLibs.cmake

@@ -0,0 +1,23 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+include_guard()
+
+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)

indra/cmake/ICU4C.cmake

@@ -18,3 +18,6 @@ endif()
 
 use_prebuilt_binary(slvoice)
 
+use_prebuilt_binary(nanosvg)
+use_prebuilt_binary(viewer-fonts)
+use_prebuilt_binary(emoji_shortcodes)

indra/cmake/ViewerMiscLibs.cmake

@@ -37,7 +37,7 @@ class LLWearableType : public LLParamSingleton<LLWearableType>
 {
 	LLSINGLETON(LLWearableType, LLTranslationBridge::ptr_t &trans);
 	~LLWearableType();
-	void initSingleton();
+	void initSingleton() override;
 public: 
 	enum EType
 	{

indra/llappearance/llwearabletype.h

@@ -3,6 +3,7 @@
 project(llcommon)
 
 include(00-Common)
+include(ICU4C)
 include(LLCommon)
 include(bugsplat)
 include(Linking)
@@ -282,6 +283,7 @@ target_link_libraries(
         ll::uriparser
         ll::oslibraries
         ll::tracy
+        ll::icu4c
     )
 
 target_include_directories(llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

indra/llcommon/CMakeLists.txt

@@ -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