From a12ba6692429642de2ab3349c58c20b3ff59f2b6 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Fri, 30 Jun 2017 08:12:03 -0700 Subject: MAINT-7442: remove old skool check for updates --- indra/newview/skins/default/xui/de/menu_login.xml | 1 - indra/newview/skins/default/xui/de/menu_viewer.xml | 1 - indra/newview/skins/default/xui/en/floater_about.xml | 8 -------- indra/newview/skins/default/xui/en/menu_login.xml | 6 ------ indra/newview/skins/default/xui/en/menu_viewer.xml | 6 ------ indra/newview/skins/default/xui/es/menu_login.xml | 1 - indra/newview/skins/default/xui/es/menu_viewer.xml | 1 - indra/newview/skins/default/xui/fr/menu_login.xml | 1 - indra/newview/skins/default/xui/fr/menu_viewer.xml | 1 - indra/newview/skins/default/xui/it/menu_login.xml | 1 - indra/newview/skins/default/xui/it/menu_viewer.xml | 1 - indra/newview/skins/default/xui/ja/menu_login.xml | 1 - indra/newview/skins/default/xui/ja/menu_viewer.xml | 1 - indra/newview/skins/default/xui/pt/menu_login.xml | 1 - indra/newview/skins/default/xui/pt/menu_viewer.xml | 1 - indra/newview/skins/default/xui/ru/menu_login.xml | 1 - indra/newview/skins/default/xui/ru/menu_viewer.xml | 1 - indra/newview/skins/default/xui/tr/menu_login.xml | 1 - indra/newview/skins/default/xui/tr/menu_viewer.xml | 1 - indra/newview/skins/default/xui/zh/menu_login.xml | 1 - indra/newview/skins/default/xui/zh/menu_viewer.xml | 1 - 21 files changed, 38 deletions(-) diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml index 69856c0852..9d4c49b05d 100644 --- a/indra/newview/skins/default/xui/de/menu_login.xml +++ b/indra/newview/skins/default/xui/de/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index 2a8eaf26ec..c484f11590 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -183,7 +183,6 @@ - diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index ec87b3684e..60f36770bb 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -43,14 +43,6 @@ top_pad="5" height="25" width="180" /> - - - - - diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 99aab42db8..805b24e290 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -183,7 +183,6 @@ - diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml index cbfdcdaf22..498196f602 100644 --- a/indra/newview/skins/default/xui/fr/menu_login.xml +++ b/indra/newview/skins/default/xui/fr/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 98a69aa043..451d45bedd 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -183,7 +183,6 @@ - diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml index 6dafc68f7c..cfb7941ad4 100644 --- a/indra/newview/skins/default/xui/it/menu_login.xml +++ b/indra/newview/skins/default/xui/it/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml index 216af0e458..e010ec1591 100644 --- a/indra/newview/skins/default/xui/it/menu_viewer.xml +++ b/indra/newview/skins/default/xui/it/menu_viewer.xml @@ -183,7 +183,6 @@ - diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml index 1f31971078..d93395725b 100644 --- a/indra/newview/skins/default/xui/ja/menu_login.xml +++ b/indra/newview/skins/default/xui/ja/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index a8be8e7616..f2d989f17f 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -183,7 +183,6 @@ - diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml index 7b45eb1ad3..1001ede4e7 100644 --- a/indra/newview/skins/default/xui/pt/menu_login.xml +++ b/indra/newview/skins/default/xui/pt/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 542734eb22..f4a18cfc2c 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -183,7 +183,6 @@ - diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml index 754803904a..8a086e5c16 100644 --- a/indra/newview/skins/default/xui/ru/menu_login.xml +++ b/indra/newview/skins/default/xui/ru/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml index e0d8861225..b92e266b8d 100644 --- a/indra/newview/skins/default/xui/ru/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml @@ -180,7 +180,6 @@ - diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml index 145fc74508..1a810d58ce 100644 --- a/indra/newview/skins/default/xui/tr/menu_login.xml +++ b/indra/newview/skins/default/xui/tr/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml index ef001a8687..04b05ee2bb 100644 --- a/indra/newview/skins/default/xui/tr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml @@ -181,7 +181,6 @@ - diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml index e3f6ca2690..2cace27eca 100644 --- a/indra/newview/skins/default/xui/zh/menu_login.xml +++ b/indra/newview/skins/default/xui/zh/menu_login.xml @@ -16,7 +16,6 @@ - diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml index a58e1bb0fa..0388b891d6 100644 --- a/indra/newview/skins/default/xui/zh/menu_viewer.xml +++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml @@ -181,7 +181,6 @@ - -- cgit v1.2.3 From 5fd1c47bb45f2fac68bfbd643ed3432ef3245573 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Fri, 30 Jun 2017 08:21:29 -0700 Subject: SL-671: uninstall pinning changes --- indra/newview/installers/windows/installer_template.nsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index aeb92eb15b..6fbbf1f1c6 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -404,6 +404,8 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" # BUG-2707 Remove entry that disabled SEHOP DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\$INSTEXE" +DeleteRegKey HKEY_CLASSES_ROOT "Applications\$INSTEXE" +DeleteRegKey HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}" # Clean up shortcuts Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*" -- cgit v1.2.3 From 61f3366eecb98229ef27e3b9ab51cbefea2195a7 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 6 Jul 2017 11:53:03 -0700 Subject: upgrade to VMP package 507087 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c30b289a2a..bf422af0b6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - 425fc3c3ab386ba39a43e4648f917fc7 + ec55e24d949ba07c7539410c062fdfa6 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7011/25711/viewer_manager-1.0.507000-darwin64-507000.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7098/26128/viewer_manager-1.0.507087-darwin64-507087.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - c448493f1afd7eb93160c4cb3fc9ef57 + e6f9379345e44b7049c9e67758967676 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7012/25717/viewer_manager-1.0.507000-windows-507000.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7099/26138/viewer_manager-1.0.507087-windows-507087.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507000 + 1.0.507087 vlc-bin -- cgit v1.2.3 From 42a8dbbd1629881089d77d23af4b32f2f5e1e658 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 6 Jul 2017 15:44:13 -0700 Subject: upgrade to VMP package 507104 --- autobuild.xml | 10 ++-- indra/newview/llfeaturemanager.cpp | 99 +++++++++++++++++++++----------------- 2 files changed, 59 insertions(+), 50 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index bf422af0b6..70765abbe3 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - ec55e24d949ba07c7539410c062fdfa6 + 818d1703e73f9cc906ee3dd7824a82ac url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7098/26128/viewer_manager-1.0.507087-darwin64-507087.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7115/26245/viewer_manager-1.0.507104-darwin64-507104.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - e6f9379345e44b7049c9e67758967676 + 1c04406ed1b618b5debe384001e2144d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7099/26138/viewer_manager-1.0.507087-windows-507087.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7116/26251/viewer_manager-1.0.507104-windows-507104.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507087 + 1.0.507104 vlc-bin diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index ad048f6668..8aa4505e57 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -403,70 +403,79 @@ F32 gpu_benchmark(); bool LLFeatureManager::loadGPUClass() { - //get memory bandwidth from benchmark - F32 gbps = gpu_benchmark(); - - if (gbps < 0.f) - { //couldn't bench, use GLVersion -#if LL_DARWIN - //GLVersion is misleading on OSX, just default to class 3 if we can't bench + benchmark_flag = gSavedSettings.getBOOL("SkipBenchmark") + if (!benchmark_flag) + { + //get memory bandwidth from benchmark + F32 gbps = gpu_benchmark(); + + if (gbps < 0.f) + { //couldn't bench, use GLVersion + #if LL_DARWIN + //GLVersion is misleading on OSX, just default to class 3 if we can't bench LL_WARNS() << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL; - mGPUClass = GPU_CLASS_3; -#else - if (gGLManager.mGLVersion < 2.f) + mGPUClass = GPU_CLASS_3; + #else + if (gGLManager.mGLVersion < 2.f) + { + mGPUClass = GPU_CLASS_0; + } + else if (gGLManager.mGLVersion < 3.f) + { + mGPUClass = GPU_CLASS_1; + } + else if (gGLManager.mGLVersion < 3.3f) + { + mGPUClass = GPU_CLASS_2; + } + else if (gGLManager.mGLVersion < 4.f) + { + mGPUClass = GPU_CLASS_3; + } + else + { + mGPUClass = GPU_CLASS_4; + } + #endif + } + else if (gGLManager.mGLVersion <= 2.f) + { + mGPUClass = GPU_CLASS_0; + } + else if (gGLManager.mGLVersion <= 3.f) + { + mGPUClass = GPU_CLASS_1; + } + else if (gbps <= 5.f) { mGPUClass = GPU_CLASS_0; } - else if (gGLManager.mGLVersion < 3.f) + else if (gbps <= 8.f) { mGPUClass = GPU_CLASS_1; } - else if (gGLManager.mGLVersion < 3.3f) + else if (gbps <= 16.f) { mGPUClass = GPU_CLASS_2; } - else if (gGLManager.mGLVersion < 4.f) + else if (gbps <= 40.f) { mGPUClass = GPU_CLASS_3; } - else + else if (gbps <= 80.f) { mGPUClass = GPU_CLASS_4; } -#endif - } - else if (gGLManager.mGLVersion <= 2.f) - { - mGPUClass = GPU_CLASS_0; - } - else if (gGLManager.mGLVersion <= 3.f) - { - mGPUClass = GPU_CLASS_1; - } - else if (gbps <= 5.f) - { - mGPUClass = GPU_CLASS_0; - } - else if (gbps <= 8.f) + else + { + mGPUClass = GPU_CLASS_5; + } + } //end if benchmark + else { + //setting says don't benchmark MAINT-7558 mGPUClass = GPU_CLASS_1; } - else if (gbps <= 16.f) - { - mGPUClass = GPU_CLASS_2; - } - else if (gbps <= 40.f) - { - mGPUClass = GPU_CLASS_3; - } - else if (gbps <= 80.f) - { - mGPUClass = GPU_CLASS_4; - } - else - { - mGPUClass = GPU_CLASS_5; - } // defaults mGPUString = gGLManager.getRawGLString(); -- cgit v1.2.3 From 5c1d9d65f65a1fadc00a0a81cf37d6389169b8c0 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 6 Jul 2017 16:09:44 -0700 Subject: fix missing declaration --- indra/newview/llfeaturemanager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 8aa4505e57..9c19bd582c 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -403,8 +403,7 @@ F32 gpu_benchmark(); bool LLFeatureManager::loadGPUClass() { - benchmark_flag = gSavedSettings.getBOOL("SkipBenchmark") - if (!benchmark_flag) + if (!gSavedSettings.getBOOL("SkipBenchmark")) { //get memory bandwidth from benchmark F32 gbps = gpu_benchmark(); -- cgit v1.2.3 From 510202a4e2e9f8c7f1c33b68c9623c917e14fc8b Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Fri, 7 Jul 2017 14:49:36 -0700 Subject: MAINT-7571: detect if all HD cards are bad and addr is forced to 64, then stay at 64 bit --- indra/newview/app_settings/cmd_line.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index a9f6079630..f20c0fb89c 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -81,6 +81,14 @@ map-to PacketDropPercentage + + forceaddresssize + + count + 1 + map-to + CmdLineForceAddrSize + god -- cgit v1.2.3 From b5d61b571996888d720fcf53e3597430ebf52823 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Fri, 7 Jul 2017 15:05:17 -0700 Subject: upgrade to VMP package 507135 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 70765abbe3..ae3b705164 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - 818d1703e73f9cc906ee3dd7824a82ac + 2859976588023c257e8924bf8524dccd url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7115/26245/viewer_manager-1.0.507104-darwin64-507104.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7146/26456/viewer_manager-1.0.507135-darwin64-507135.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - 1c04406ed1b618b5debe384001e2144d + 988a1467275a8a42a15a392fe0bf49fd url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7116/26251/viewer_manager-1.0.507104-windows-507104.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7147/26471/viewer_manager-1.0.507135-windows-507135.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507104 + 1.0.507135 vlc-bin -- cgit v1.2.3 From aaaf4cb4ec2d2211703db23c5d8a920ee0970a2a Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Jul 2017 11:07:29 -0700 Subject: Remove FAS from cmd_line.xml --- indra/newview/app_settings/cmd_line.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index f20c0fb89c..e4e1cdcf44 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -82,14 +82,6 @@ PacketDropPercentage - forceaddresssize - - count - 1 - map-to - CmdLineForceAddrSize - - god desc -- cgit v1.2.3 From 98815fd99ac4709f8138a2a3a54a89fb149d7e37 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Jul 2017 13:10:17 -0700 Subject: upgrade to VMP package 507165 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index ae3b705164..20da24d81b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - 2859976588023c257e8924bf8524dccd + 86644959d0bf188162e5e08c731c0a1f url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7146/26456/viewer_manager-1.0.507135-darwin64-507135.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7176/26636/viewer_manager-1.0.507165-darwin64-507165.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - 988a1467275a8a42a15a392fe0bf49fd + 67ddd1cbc94a8cddcb0415edf1bd2c0d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7147/26471/viewer_manager-1.0.507135-windows-507135.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7177/26642/viewer_manager-1.0.507165-windows-507165.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507135 + 1.0.507165 vlc-bin -- cgit v1.2.3 From 6cb0881aff9eae5f3abb48d556d9a339f41848a7 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Mon, 10 Jul 2017 15:23:15 -0700 Subject: upgrade to VMP package 507182 --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 20da24d81b..7544408277 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ archive hash - 86644959d0bf188162e5e08c731c0a1f + 83237f66d1406285b35a55e3f3691a9e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7176/26636/viewer_manager-1.0.507165-darwin64-507165.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7193/26740/viewer_manager-1.0.507182-darwin64-507182.tar.bz2 name darwin64 @@ -3174,9 +3174,9 @@ archive hash - 67ddd1cbc94a8cddcb0415edf1bd2c0d + ce2aa248510bc233f3b0c35572641957 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7177/26642/viewer_manager-1.0.507165-windows-507165.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7194/26746/viewer_manager-1.0.507182-windows-507182.tar.bz2 name windows @@ -3187,7 +3187,7 @@ source_type hg version - 1.0.507165 + 1.0.507182 vlc-bin -- cgit v1.2.3