From d7f123ab526df7dbef153e0de71f325ab1b69571 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 11 Oct 2011 13:37:46 -0400 Subject: CHOP-397 WIP - removed windows updater.exe, no longer used --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/viewer_manifest.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 indra/newview/app_settings/settings.xml diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml old mode 100644 new mode 100755 index 8804c40aff..1b539fe0db --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5655,7 +5655,7 @@ Type Boolean Value - 1 + 0 MemProfiling diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6165292457..0931c4ec9b 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -495,8 +495,9 @@ class WindowsManifest(ViewerManifest): # tag:"crash-logger" here as a cue to the exporter self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], dst="win_crash_logger.exe") - self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'], - dst="updater.exe") +# For CHOP-397, windows updater no longer used. +# self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'], +# dst="updater.exe") if not self.is_packaging_viewer(): self.package_file = "copied_deps" -- cgit v1.2.3