Merge branch 'main' into marchcat/yz-merge

# Conflicts:
#	indra/newview/llinventorygallery.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1fa4df1682..c7f32d0da9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -141,7 +141,7 @@ class ViewerManifest(LLManifest):
                 self.path("*.tga")
 
             # Include our fonts
-            with self.prefix(src_dst="fonts"):
+            with self.prefix(src="../packages/fonts",src_dst="fonts"):
                 self.path("*.ttf")
                 self.path("*.txt")
 
@@ -559,6 +559,10 @@ class Windows_x86_64_Manifest(ViewerManifest):
                 self.path("OpenAL32.dll")
                 self.path("alut.dll")
 
+            # For ICU4C
+            self.path("icudt48.dll")
+            self.path("icuuc48.dll")
+
             # For textures
             self.path("openjp2.dll")