summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-10-09 16:46:22 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-10-09 16:46:22 -0400
commit9e95301be5e0466f4dbfec40abffadeb9f14e9fc (patch)
treecd9a941f1848c6ee8e451e9e21b2811762474167 /indra
parentf7fb6b4a0eed499439f4c41bdce4de3efc94e906 (diff)
MAINT-7809: Add secondlife.ico to viewer's vmp_icons install dir.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/viewer_manifest.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d021e5b9f3..0e6c98f230 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -368,6 +368,9 @@ class WindowsManifest(ViewerManifest):
#IUM is not normally executed directly, just imported. No exe needed.
self.path2basename(vmpdir,"InstallerUserMessage.py")
+ with self.prefix(src=self.icon_path(), dst="vmp_icons"):
+ self.path("secondlife.ico")
+
#VMP Tkinter icons
with self.prefix("vmp_icons"):
self.path("*.png")
@@ -839,6 +842,9 @@ class DarwinManifest(ViewerManifest):
with self.prefix(src=icon_path, dst="") :
self.path("secondlife.icns")
+ with self.prefix(src=icon_path, dst="vmp_icons"):
+ self.path("secondlife.ico")
+
#VMP Tkinter icons
with self.prefix("vmp_icons"):
self.path("*.png")