From 064d0fec06b49abeef5ddfaec5abd6fae7e0cf03 Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Tue, 9 Jun 2015 20:01:53 +0300 Subject: MAINT-5259 FIXED Login screen displayed on English after installation on other language --- indra/newview/installers/windows/installer_template.nsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/installers/windows/installer_template.nsi') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 8c8b4971cf..95cdf90e99 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -298,6 +298,11 @@ CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \ CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \ '"$INSTDIR\uninst.exe"' '' +# Create *.bat file to specify lang params on first run from installer - see MAINT-5259 +FileOpen $9 "$INSTDIR\autorun.bat" w +FileWrite $9 'start "$INSTDIR\$INSTEXE" "$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM$\r$\n' +FileClose $9 + # Write registry WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR" WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}" @@ -682,7 +687,7 @@ Call CheckWindowsServPack # Warn if not on the latest SP before asking to launc Push $R0 # Option value, unused StrCmp $SKIP_AUTORUN "true" +2; # Assumes SetOutPath $INSTDIR - Exec '"$WINDIR\explorer.exe" "$INSTDIR\$INSTEXE"' + Exec '"$WINDIR\explorer.exe" "$INSTDIR\autorun.bat"' Pop $R0 FunctionEnd -- cgit v1.2.3