From 9e95301be5e0466f4dbfec40abffadeb9f14e9fc Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 9 Oct 2017 16:46:22 -0400
Subject: [PATCH] MAINT-7809: Add secondlife.ico to viewer's vmp_icons install
dir.
---
indra/newview/viewer_manifest.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d021e5b9f36..0e6c98f2301 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -368,6 +368,9 @@ def construct(self):
#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 @@ def construct(self):
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")
--
GitLab