diff options
| author | coyot <none@none> | 2017-06-27 13:33:08 -0700 |
|---|---|---|
| committer | coyot <none@none> | 2017-06-27 13:33:08 -0700 |
| commit | deaca2715581ceda3d505bdcd9261e145be5e599 (patch) | |
| tree | a4c110829814d45c4e53716ccbc30213879feb94 /indra | |
| parent | 6eae3c6f4f875bd33835a885700fa3bede53e103 (diff) | |
| parent | 3fd2ac14ea6dcbe2a8b6025dac37f6311c5cc319 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 2 | ||||
| -rw-r--r-- | indra/newview/installers/windows/lang_en-us.nsi | bin | 9096 -> 8734 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 809f7367d7..aeb92eb15b 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -300,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" \
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi Binary files differindex aa403a961c..00aa47de69 100644 --- a/indra/newview/installers/windows/lang_en-us.nsi +++ b/indra/newview/installers/windows/lang_en-us.nsi |