From bea3e75d706d625266bd5b9b378f68a366b3c8ef Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 22 Apr 2023 14:27:00 +0200
Subject: [PATCH] Don't inject files into the source tree

---
 indra/llfilesystem/lldir.cpp     |  8 ++++++++
 indra/newview/CMakeLists.txt     | 28 +++++++++++++++-------------
 indra/newview/viewer_manifest.py |  5 +++++
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
index 75ce6aa478..c95db90340 100644
--- a/indra/llfilesystem/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
@@ -1108,6 +1108,14 @@ void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& the
 	addSearchSkinDir(mUserDefaultSkinDir);
 	// then user-defined skins.
 	addSearchSkinDir(mUserSkinDir);
+
+	// <FS:Ansariel> If working directory is different from executable directory, add executable subdirs as searchable folders
+	if (mExecutableDir != mWorkingDir)
+	{
+		addSearchSkinDir(add(mExecutableDir, "skins"));
+		addSearchSkinDir(add(mExecutableDir, "skins", "default"));
+	}
+	// </FS:Ansariel>
 }
 
 void LLDir::addSearchSkinDir(const std::string& skindir)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 33195a4875..0ac1f63ea1 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2432,21 +2432,23 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
 #file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
 # </FS:Ansariel>
 
+# <FS:Ansariel> Don't copy emoji characters into source folder
 # 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()
+#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()
+# </FS:Ansariel>
 
 if (LINUX)
   set(product Firestorm-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index eba5e5f50a..1bea1786fa 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -87,6 +87,11 @@ class ViewerManifest(LLManifest,FSViewerManifest):
             self.path("fonts")
         # </FS:Ansariel>
 
+        # <FS:Ansariel> Copy emoji characters to build output
+        with self.prefix(src=pkgdir, dst="skins/default"):
+            self.path("xui")
+        # </FS:Ansariel>
+
         if self.is_packaging_viewer():
             with self.prefix(src_dst="app_settings"):
                 self.exclude("logcontrol.xml")