From d5e558fffc0722398a9b4c2df681f2a6ce247b7f Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 28 Feb 2023 08:49:15 -0600
Subject: [PATCH] SL-19277 Fix for fallback probe sometimes getting occluded
and making void water dark after teleport. Never default to having
reflections off.
---
indra/newview/featuretable.txt | 4 ++--
indra/newview/featuretable_mac.txt | 4 ++--
indra/newview/llfeaturemanager.cpp | 8 ++------
indra/newview/llreflectionmapmanager.cpp | 2 +-
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index af72d48db98..b24244c188e 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 49
+version 50
// 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
@@ -117,7 +117,7 @@ RenderGlowResolutionPow 1 8
RenderMaxPartCount 1 2048
RenderLocalLights 1 1
RenderTransparentWater 1 0
-RenderReflectionsEnabled 1 0
+RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 0
RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 1.0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index afe95c86d98..2eb80e0355e 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 44
+version 45
// 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
@@ -123,7 +123,7 @@ RenderUseAdvancedAtmospherics 1 0
RenderShadowDetail 1 0
WLSkyDetail 1 48
RenderFSAASamples 1 0
-RenderReflectionsEnabled 1 0
+RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 0
RenderScreenSpaceReflections 1 0
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 3b1bee05af9..81a7aa47c8e 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -425,18 +425,14 @@ bool LLFeatureManager::loadGPUClass()
}
if (gbps < 0.f)
- { //couldn't bench, use GLVersion
+ { //couldn't bench, default to Low
#if LL_DARWIN
//GLVersion is misleading on OSX, just default to class 3 if we can't bench
LL_WARNS("RenderInit") << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL;
mGPUClass = GPU_CLASS_3;
#else
- mGPUClass = GPU_CLASS_2;
- #endif
- }
- else if (gbps <= 5.f)
- {
mGPUClass = GPU_CLASS_0;
+ #endif
}
else if (gbps <= 8.f)
{
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index 77168983762..9962d0c10cb 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -1076,7 +1076,7 @@ void LLReflectionMapManager::doOcclusion()
for (auto& probe : mProbes)
{
- if (probe != nullptr)
+ if (probe != nullptr && probe != mDefaultProbe)
{
probe->doOcclusion(eye);
}
--
GitLab