From 8e6751efced8d9f5ede5ec5d954ff809d56d1162 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 15 Aug 2017 17:19:44 -0700 Subject: Fix MAINT-7312 External web links opened in profile window --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d131e78d40..f6490b4fba 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 95a6d7d1ff2ffc8679601d9408533663 + ec71ffd68af829bf77fb03fdf39c2461 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6185/21567/dullahan-1.1.800_3.3071.1637.gcb6cf75-darwin64-506174.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7820/30257/dullahan-1.1.813_3.3071.1637.gcb6cf75-darwin64-507809.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - c14caa52a6ab343c35e6e76af840257f + 234547cab68748f82e429237d5a46783 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6187/21579/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows-506174.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7822/30267/dullahan-1.1.813_3.3071.1634.g9cc59c8-windows-507809.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - ff4d59eb23011198ccd0aa4f5875bbd1 + c3bcb52276cb115577e8c0cd053b8fc7 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/6186/21573/dullahan-1.1.800_3.3071.1634.g9cc59c8-windows64-506174.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7821/30264/dullahan-1.1.813_3.3071.1634.g9cc59c8-windows64-507809.tar.bz2 name windows64 version - 1.1.800_3.3071.1634.g9cc59c8 + 1.1.813_3.3071.1634.g9cc59c8 elfio -- cgit v1.2.3 From 1d2ded8c5f1893a246fb1b7d7b5f12f451750827 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 17 Aug 2017 18:48:41 -0400 Subject: MAINT-7661: Make NSIS installer place .winstall marker file. This reduces a timing hole in which one instance of SL_Launcher might place a .winstall marker file in the download directory and run the downloaded installer, but another SL_Launcher instance might discover that marker and try to delete the directory before the NSIS install completes. --- indra/newview/installers/windows/installer_template.nsi | 7 +++++++ 1 file changed, 7 insertions(+) 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 -- cgit v1.2.3 From 5482890cd1a9aaa9869dbcd9e3f58e85c0854be0 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 18 Aug 2017 14:59:23 -0400 Subject: MAINT-7661: Update VMP to new build 507880. --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d131e78d40..ea85c7dc1f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - 333a679f0a492e060b4586eaa1a38a56 + a3f2dc87b579842bc5f693959abc2ecb url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7692/29540/viewer_manager-1.0.507681-darwin64-507681.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7891/30766/viewer_manager-1.0.507880-darwin64-507880.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - bf4672af39013418d721327d337ba1a0 + 71bb4d83c08928d02fb014bab9e67d82 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7694/29546/viewer_manager-1.0.507681-windows-507681.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7892/30772/viewer_manager-1.0.507880-windows-507880.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507681 + 1.0.507880 vlc-bin -- cgit v1.2.3 From cb789b2a572f145e2671171b81ad6c1a99e01c4b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 18 Aug 2017 21:18:54 -0400 Subject: MAINT-7661: Update to viewer-manager build 507905 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index ea85c7dc1f..07613cf870 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - a3f2dc87b579842bc5f693959abc2ecb + 12c2441ac37ff41776d8399183b60dad url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7891/30766/viewer_manager-1.0.507880-darwin64-507880.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7916/30853/viewer_manager-1.0.507905-darwin64-507905.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - 71bb4d83c08928d02fb014bab9e67d82 + dad69df0a9c19f42ce43871879316df5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7892/30772/viewer_manager-1.0.507880-windows-507880.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7917/30859/viewer_manager-1.0.507905-windows-507905.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507880 + 1.0.507905 vlc-bin -- cgit v1.2.3 From 90c01387212d45a26571706c572359681f3321ea Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 21 Aug 2017 12:43:04 -0400 Subject: MAINT-7661: Update to viewer-manager build 507912. --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 07613cf870..b8829514b7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - 12c2441ac37ff41776d8399183b60dad + 4bcf14967862b2bc6fb5e21a98b3f1c3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7916/30853/viewer_manager-1.0.507905-darwin64-507905.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7923/30899/viewer_manager-1.0.507912-darwin64-507912.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - dad69df0a9c19f42ce43871879316df5 + e8f724af97da15a5f0bf279b517702b0 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7917/30859/viewer_manager-1.0.507905-windows-507905.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7924/30905/viewer_manager-1.0.507912-windows-507912.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507905 + 1.0.507912 vlc-bin -- cgit v1.2.3 From 8d9241be77dfd2e8abc7e20d23d3570024dc1136 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 22 Aug 2017 21:13:32 -0400 Subject: MAINT-7661: Update to viewer-manager build 507954 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 6a99ff3990..2c4677e462 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - 4bcf14967862b2bc6fb5e21a98b3f1c3 + 79e6daa59a9ef6445ea123830ad1bd09 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7923/30899/viewer_manager-1.0.507912-darwin64-507912.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7968/31169/viewer_manager-1.0.507954-darwin64-507954.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - e8f724af97da15a5f0bf279b517702b0 + 3cd9e1d23a59445e0f1fab3eb81be744 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7924/30905/viewer_manager-1.0.507912-windows-507912.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7965/31141/viewer_manager-1.0.507954-windows-507954.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507912 + 1.0.507954 vlc-bin -- cgit v1.2.3 From 40b4cbf2c7601cbc652a14a8973f88f06fca6805 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 24 Aug 2017 07:21:23 -0400 Subject: DRTVWR-418: Trivial change to bump the TeamCity build. --- indra/llappearance/llavatarappearancedefines.cpp | 1 - 1 file changed, 1 deletion(-) 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; } - -- cgit v1.2.3