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 | |
| parent | 6eae3c6f4f875bd33835a885700fa3bede53e103 (diff) | |
| parent | 3fd2ac14ea6dcbe2a8b6025dac37f6311c5cc319 (diff) | |
merge
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -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 |
3 files changed, 6 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index 4e72b9a51b..df8ca73600 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ <key>archive</key> <map> <key>hash</key> - <string>949a1c69fd476dc76bd001318c8082fc</string> + <string>e4fa9d067379b1800324f7764bb02a6c</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/6934/25239/viewer_manager-1.0.506923-darwin64-506923.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>ff7e089d2e4b16a2a15b04b61d3e03e3</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/6935/25245/viewer_manager-1.0.506923-windows-506923.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.506923</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 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 |