merge

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7639fcbe9b..8d2525dd26 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -108,6 +108,12 @@ class ViewerManifest(LLManifest):
                             self.end_prefix("*/html")
                     self.end_prefix("skins")
 
+            # local_assets dir (for pre-cached textures)
+            if self.prefix(src="local_assets"):
+                self.path("*.j2c")
+                self.path("*.tga")
+                self.end_prefix("local_assets")
+
             # Files in the newview/ directory
             self.path("gpu_table.txt")
 
@@ -345,7 +351,6 @@ class WindowsManifest(ViewerManifest):
                 self.path("qtwebkitd4.dll")
                 self.path("qtxmlpatternsd4.dll")
                 self.path("ssleay32.dll")
-                self.path("winmm.dll")
 
                 # For WebKit/Qt plugin runtimes (image format plugins)
                 if self.prefix(src="imageformats", dst="imageformats"):