From 63fccba7745ca8d88b19771ddbba574a30ad440f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Aug 2024 10:37:17 +0200 Subject: [PATCH 1/3] Remove BOOL hack leftovers --- indra/newview/pipeline.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 13b8ba19b2..83f564c6e3 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -103,13 +103,7 @@ #include "llmutelist.h" #include "lltoolpie.h" #include "llnotifications.h" -// hacky BOOL workaround -#ifndef BOOL -#define BOOL bool -#endif -// #include "llpathinglib.h" -#undef BOOL // hacky BOOL workaround #include "llfloaterpathfindingconsole.h" #include "llfloaterpathfindingcharacters.h" #include "llfloatertools.h" From 56e16876805c80f63a70024e00b5dfcc5e4e45d7 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Geenz\" Goodman" Date: Tue, 20 Aug 2024 14:05:40 -0700 Subject: [PATCH 2/3] #2345 Fix for mirrors not being disabled from previous viewer versions. --- indra/newview/featuretable.txt | 2 +- indra/newview/featuretable_linux.txt | 42 ++++++++++++++++++++++++++++ indra/newview/featuretable_mac.txt | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index e11b406094..3b2a298647 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,4 @@ -version 60 +version 61 // The version number above should be incremented IF AND ONLY IF some // change has been made that is sufficiently important to justify // resetting the graphics preferences of all users to the recommended diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 4bcefc1546..4b617fd7f4 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -67,6 +67,7 @@ RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 2 RenderFSAASamples 1 16 RenderMaxTextureIndex 1 16 +RenderMirrors 1 1 // // Low Graphics Settings (fixed function) @@ -97,6 +98,12 @@ RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 0 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 256 +RenderHeroProbeDistance 1 4 +RenderHeroProbeUpdateRate 1 6 +RenderHeroProbeConservativeUpdateMultiplier 1 16 + // // Low Graphics Settings @@ -127,6 +134,11 @@ RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 0 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 256 +RenderHeroProbeDistance 1 4 +RenderHeroProbeUpdateRate 1 6 +RenderHeroProbeConservativeUpdateMultiplier 1 16 // // Medium Low Graphics Settings @@ -156,6 +168,11 @@ RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 0 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 256 +RenderHeroProbeDistance 1 6 +RenderHeroProbeUpdateRate 1 3 +RenderHeroProbeConservativeUpdateMultiplier 1 16 // // Medium Graphics Settings (standard) @@ -185,6 +202,11 @@ RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 2 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 512 +RenderHeroProbeDistance 1 6 +RenderHeroProbeUpdateRate 1 3 +RenderHeroProbeConservativeUpdateMultiplier 1 16 // // Medium High Graphics Settings (deferred enabled) @@ -214,6 +236,11 @@ RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 2 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 512 +RenderHeroProbeDistance 1 6 +RenderHeroProbeUpdateRate 1 2 +RenderHeroProbeConservativeUpdateMultiplier 1 8 // // High Graphics Settings (deferred + SSAO) @@ -243,6 +270,11 @@ RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 0 WLSkyDetail 1 48 RenderFSAASamples 1 2 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 512 +RenderHeroProbeDistance 1 8 +RenderHeroProbeUpdateRate 1 2 +RenderHeroProbeConservativeUpdateMultiplier 1 8 // // High Ultra Graphics Settings (deferred + SSAO + shadows) @@ -272,6 +304,11 @@ RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 2 WLSkyDetail 1 48 RenderFSAASamples 1 2 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 512 +RenderHeroProbeDistance 1 16 +RenderHeroProbeUpdateRate 1 1 +RenderHeroProbeConservativeUpdateMultiplier 1 4 // // Ultra graphics (REALLY PURTY!) @@ -300,6 +337,11 @@ RenderDeferredSSAO 1 1 RenderUseAdvancedAtmospherics 1 0 RenderShadowDetail 1 2 RenderFSAASamples 1 2 +RenderMirrors 1 0 +RenderHeroProbeResolution 1 1024 +RenderHeroProbeDistance 1 16 +RenderHeroProbeUpdateRate 1 1 +RenderHeroProbeConservativeUpdateMultiplier 1 4 // // Class Unknown Hardware (unknown) diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index b984ed217f..f4d24459fc 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 57 +version 58 // The version number above should be incremented IF AND ONLY IF some // change has been made that is sufficiently important to justify // resetting the graphics preferences of all users to the recommended From 3d1d2cc3a26c7e94614b94447e0f12228cded9bd Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Aug 2024 00:48:33 +0200 Subject: [PATCH 3/3] Fixed missing change from 25ede8638209fac8dde5b71bece4bc1dfa30ea16 --- indra/newview/llface.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 0d68f3c300..e4df593c28 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -372,11 +372,6 @@ void LLFace::switchTexture(U32 ch, LLViewerTexture* new_texture) return; } - if (mTexture[ch].notNull()) - { - new_texture->addTextureStats(mTexture[ch]->getMaxVirtualSize()) ; - } - if (ch == LLRender::DIFFUSE_MAP) { if (getViewerObject())