diff --git a/autobuild.xml b/autobuild.xml index 4e72b9a51ba0e16536f3071b9cf7c919e2afe55d..6b753aaeae886f017473240892c0b0e62a252676 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ <key>archive</key> <map> <key>hash</key> - <string>949a1c69fd476dc76bd001318c8082fc</string> + <string>77c92cf55936daf788a56d60f59e2faf</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6865/24782/viewer_manager-1.0.506854-darwin64-506854.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6988/25592/viewer_manager-1.0.506977-darwin64-506977.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3174,9 +3174,9 @@ <key>archive</key> <map> <key>hash</key> - <string>6ec8e5444c70ce3fede77bb113b0fb5d</string> + <string>271860ac11066d3037406a6c639ff8fe</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6866/24788/viewer_manager-1.0.506854-windows-506854.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6989/25598/viewer_manager-1.0.506977-windows-506977.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3187,7 +3187,7 @@ <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.0.506854</string> + <string>1.0.506977</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index d82783a7ec63ab4f30066915618b1a09aca5561d..aeb92eb15b747eadf34d486302af920575b754e8 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -277,6 +277,7 @@ SetShellVarContext all # Install for all users (if you change this, change it # Start with some default values. StrCpy $INSTPROG "${INSTNAME}" StrCpy $INSTEXE "${INSTEXE}" +StrCpy $VIEWER_EXE "${VIEWER_EXE}" StrCpy $INSTSHORTCUT "${SHORTCUT}" Call CheckIfAdministrator # Make sure the user can install/uninstall @@ -299,7 +300,7 @@ StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)" CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT" SetOutPath "$INSTDIR" CreateShortCut "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \ - "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "%%SOURCE%%\icons\release\secondlife.ico" + "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE" WriteINIStr "$SMPROGRAMS\$INSTSHORTCUT\SL Create Account.url" \ @@ -317,9 +318,9 @@ CreateShortCut "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \ # Other shortcuts SetOutPath "$INSTDIR" CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \ - "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$INSTEXE" + "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE" CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \ - "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$INSTEXE" + "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$VIEWER_EXE" CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \ '"$INSTDIR\uninst.exe"' '' diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi index aa403a961cbdd0e39122c9273140346bb67a715f..00aa47de690a2a066ab023bccfe05a7559c3c938 100644 Binary files a/indra/newview/installers/windows/lang_en-us.nsi and b/indra/newview/installers/windows/lang_en-us.nsi differ