diff options
| -rw-r--r-- | autobuild.xml | 24 | ||||
| -rw-r--r-- | indra/llappearance/llavatarappearancedefines.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 7 |
3 files changed, 19 insertions, 13 deletions
diff --git a/autobuild.xml b/autobuild.xml index d131e78d40..2c4677e462 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ <key>archive</key> <map> <key>hash</key> - <string>95a6d7d1ff2ffc8679601d9408533663</string> + <string>ec71ffd68af829bf77fb03fdf39c2461</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6185/21567/dullahan-1.1.800_3.3071.1637.gcb6cf75-darwin64-506174.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7820/30257/dullahan-1.1.813_3.3071.1637.gcb6cf75-darwin64-507809.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -568,9 +568,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c14caa52a6ab343c35e6e76af840257f</string> + <string>234547cab68748f82e429237d5a46783</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6187/21579/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows-506174.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7822/30267/dullahan-1.1.813_3.3071.1634.g9cc59c8-windows-507809.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -580,16 +580,16 @@ <key>archive</key> <map> <key>hash</key> - <string>ff4d59eb23011198ccd0aa4f5875bbd1</string> + <string>c3bcb52276cb115577e8c0cd053b8fc7</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6186/21573/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows64-506174.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7821/30264/dullahan-1.1.813_3.3071.1634.g9cc59c8-windows64-507809.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.1.800_3.3071.1634.g9cc59c8</string> + <string>1.1.813_3.3071.1634.g9cc59c8</string> </map> <key>elfio</key> <map> @@ -3150,9 +3150,9 @@ <key>archive</key> <map> <key>hash</key> - <string>333a679f0a492e060b4586eaa1a38a56</string> + <string>79e6daa59a9ef6445ea123830ad1bd09</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7692/29540/viewer_manager-1.0.507681-darwin64-507681.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7968/31169/viewer_manager-1.0.507954-darwin64-507954.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3174,9 +3174,9 @@ <key>archive</key> <map> <key>hash</key> - <string>bf4672af39013418d721327d337ba1a0</string> + <string>3cd9e1d23a59445e0f1fab3eb81be744</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7694/29546/viewer_manager-1.0.507681-windows-507681.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7965/31141/viewer_manager-1.0.507954-windows-507954.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.507681</string> + <string>1.0.507954</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp index f1c78946a1..b5282d4f6f 100644 --- a/indra/llappearance/llavatarappearancedefines.cpp +++ b/indra/llappearance/llavatarappearancedefines.cpp @@ -265,4 +265,3 @@ LLWearableType::EType LLAvatarAppearanceDictionary::getTEWearableType(ETextureIn { return getInstance()->getTexture(index)->mWearableType; } - diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 4ca850e30f..ade808e3e2 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -714,6 +714,13 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch.
+ ;; $EXEDIR is where we find the installer file
+ ;; Put a marker file there so VMP will know we're done
+ ;; and it can delete the download directory next time.
+ ;; http://nsis.sourceforge.net/Write_text_to_a_file
+ FileOpen $9 "$EXEDIR\nsis.winstall" w
+ FileWrite $9 "NSIS done$\n"
+ FileClose $9
Push $R0 # Option value, unused#
StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
|