From 3fd2ac14ea6dcbe2a8b6025dac37f6311c5cc319 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Tue, 27 Jun 2017 12:20:55 -0700
Subject: [PATCH] upgrade to VMP package 506923
---
autobuild.xml | 10 +++++-----
.../installers/windows/installer_template.nsi | 2 +-
.../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 69e7e06243..1020702945 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -299,7 +299,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
index aa403a961cbdd0e39122c9273140346bb67a715f..00aa47de690a2a066ab023bccfe05a7559c3c938 100644
GIT binary patch
delta 12
TcmeBhpXainMQHOo;aU6uBt!*O
delta 180
zcmbQ|(&4_LMMyrAA&nuCA%~%eAr(lcFjO)mGn4{(AbuW0$>fhBvXc|IIru$+>YNcW
zll4WlC$HmX6HR0&078)7B8FlH1%?ua42HzXAK7Im_sA<uo+KeQnMFxNU4<bAXc~kJ
zXUGSdlLNF%0cabDtpMa@GGsHPPQK47DVPZ~Ljh=BIuK_9b=gne&nvmPMQ9d30FOQ^
AA^-pY
--
GitLab