summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-11-09 11:23:44 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-11-09 11:23:44 -0800
commit8c9b707d586150c7562a8bc74934e09894900a27 (patch)
treed9d9d4cd5d1e5e470099e445c6f8397c019389b6 /indra/newview
parent5da253fdde8737361333161517c1173358bd17ff (diff)
parentfdf616c59d87219e2d5ad6e12687cf2793cfba1e (diff)
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/viewer_manifest.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4596938775..f95697adb6 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -575,6 +575,10 @@ class DarwinManifest(ViewerManifest):
# most everything goes in the Resources directory
if self.prefix(src="", dst="Resources"):
super(DarwinManifest, self).construct()
+
+ if self.prefix(src="../viewer_components/updater", dst=""):
+ self.path("update_install")
+ self.end_prefix()
if self.prefix("cursors_mac"):
self.path("*.tif")