diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:37:46 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:37:46 -0400 |
| commit | d7f123ab526df7dbef153e0de71f325ab1b69571 (patch) | |
| tree | e307c301de331633543a6710d2d220b18e2bd930 /indra | |
| parent | 3fe27c61b85545d22188baf5050207f13f4985b2 (diff) | |
CHOP-397 WIP - removed windows updater.exe, no longer used
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/settings.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8804c40aff..1b539fe0db 100644..100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5655,7 +5655,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>MemProfiling</key> <map> 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" |