diff options
author | Oz Linden <oz@lindenlab.com> | 2017-07-11 14:24:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-07-11 14:24:29 -0400 |
commit | dd64b8ea041a672933a1625ba0bac38744de8def (patch) | |
tree | 181ba1df2552f93d3e5a497596b8d01ea018cb60 /indra/newview/installers/windows/installer_template.nsi | |
parent | ffb5a17a011968f2ec868bd88821b84ed6d4461e (diff) | |
parent | 663e920fc3b8aff5dc3b1eb330f55473eac8f5be (diff) |
merge latest VMP updates
Diffstat (limited to 'indra/newview/installers/windows/installer_template.nsi')
-rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index aeb92eb15b..6fbbf1f1c6 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -404,6 +404,8 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"
# BUG-2707 Remove entry that disabled SEHOP
DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\$INSTEXE"
+DeleteRegKey HKEY_CLASSES_ROOT "Applications\$INSTEXE"
+DeleteRegKey HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}"
# Clean up shortcuts
Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"
|