summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autobuild.xml10
-rw-r--r--indra/newview/installers/windows/installer_template.nsi4
2 files changed, 7 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 7ae2adde21..4e72b9a51b 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3150,9 +3150,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e80a1e54cd419f96fed84f52f4803b0f</string>
+ <string>949a1c69fd476dc76bd001318c8082fc</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6836/24610/viewer_manager-1.0.506825-darwin64-506825.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6865/24782/viewer_manager-1.0.506854-darwin64-506854.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -3174,9 +3174,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>528d82bb5299c31f95a10af594f757d7</string>
+ <string>6ec8e5444c70ce3fede77bb113b0fb5d</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6837/24616/viewer_manager-1.0.506825-windows-506825.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6866/24788/viewer_manager-1.0.506854-windows-506854.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.506825</string>
+ <string>1.0.506854</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 f5b2de4fdc..4dc4d05589 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -318,9 +318,9 @@ CreateShortCut "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
# Other shortcuts
SetOutPath "$INSTDIR"
CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" \
- "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "%%SOURCE%%\icons\release\secondlife.ico"
+ "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$INSTEXE"
CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" \
- "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "%%SOURCE%%\icons\release\secondlife.ico"
+ "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM" "$INSTDIR\$INSTEXE"
CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
'"$INSTDIR\uninst.exe"' ''