From 234d55f0c52cb87c60bbe04249711668f3707612 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 9 Dec 2023 23:10:02 -0500
Subject: [PATCH] Small cleanups and bug fixes to various places
---
indra/newview/app_settings/settings.xml | 13 +------------
.../shaders/class1/deferred/materialV.glsl | 7 -------
indra/newview/featuretable.txt | 1 -
.../llfloaterpreferencesgraphicsadvanced.cpp | 7 -------
indra/newview/llviewerpartsource.cpp | 3 ---
indra/newview/llviewershadermgr.h | 1 -
.../skins/default/xui/en/panel_landmark_info.xml | 2 +-
7 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a1c020ac649..5b1444ac6bc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -471,17 +471,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>AISCommandFilterMask</key>
- <map>
- <key>Comment</key>
- <string>AIS command filter (death by Kitty if you change this)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>65247</integer>
- </map>
<key>AlertedUnsupportedHardware</key>
<map>
<key>Comment</key>
@@ -12701,7 +12690,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <boolean>1</boolean>
+ <integer>1</integer>
</map>
<key>NearbyListShowIcons</key>
<map>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl
index 20e635c6e78..7cdddfe8db4 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialV.glsl
@@ -39,10 +39,6 @@ uniform mat4 modelview_projection_matrix;
#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND)
-// forwards
-void setAtmosAttenuation(vec3 c);
-void setAdditiveColor(vec3 c);
-
#if !defined(HAS_SKIN)
uniform mat4 modelview_matrix;
#endif
@@ -138,9 +134,6 @@ void main()
vertex_color = diffuse_color;
#if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND)
- // appease OSX GLSL compiler/linker by touching all the varyings we said we would
- setAtmosAttenuation(vec3(1));
- setAdditiveColor(vec3(0));
#if !defined(HAS_SKIN)
vary_position = (modelview_matrix*vec4(position.xyz, 1.0)).xyz;
#endif
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 736fbc19e26..25d55e676a3 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -306,7 +306,6 @@ RenderShadowDetail 0 0
RenderReflectionProbeDetail 0 -1
list Intel
-RenderAnisotropicLevel 1 0
RenderFSAASamples 1 0
RenderGLContextCoreProfile 1 0
RenderGLMultiThreadedMedia 1 0
diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
index 584d3bfc241..9578fa53b1f 100644
--- a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
+++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
@@ -67,13 +67,6 @@ BOOL LLFloaterPreferenceGraphicsAdvanced::postBuild()
// sets this when 8x and 16x are indeed available
//
#if !LL_DARWIN
- if (gGLManager.mIsIntel || gGLManager.mGLVersion < 3.f)
- { //remove FSAA settings above "4x"
- LLComboBox* combo = getChild<LLComboBox>("fsaa");
- combo->remove("8x");
- combo->remove("16x");
- }
-
LLCheckBoxCtrl *use_HiDPI = getChild<LLCheckBoxCtrl>("use HiDPI");
use_HiDPI->setVisible(FALSE);
#endif
diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp
index 3eaca1969f8..129edb8b01c 100644
--- a/indra/newview/llviewerpartsource.cpp
+++ b/indra/newview/llviewerpartsource.cpp
@@ -305,9 +305,6 @@ void LLViewerPartSourceScript::update(const F32 dt)
continue;
}
- if (mPartSysData.mPartData.mFlags & LLPartData::LL_PART_RIBBON_MASK && mLastPart && (mLastPart->mPosAgent-mPosAgent).magVec() <= .005f)
- continue; //Skip if parent isn't far enough away.
-
LLViewerPart* part = new LLViewerPart();
part->init(this, mImagep, NULL);
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index 4e1fe28d0bf..1bf38fdd690 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -259,7 +259,6 @@ extern LLGLSLShader gHUDFullbrightAlphaMaskAlphaProgram;
extern LLGLSLShader gDeferredEmissiveProgram;
extern LLGLSLShader gDeferredAvatarEyesProgram;
extern LLGLSLShader gDeferredAvatarAlphaProgram;
-//extern LLGLSLShader gDeferredAvatarAlphaWaterProgram;
extern LLGLSLShader gDeferredWLSkyProgram;
extern LLGLSLShader gDeferredWLCloudProgram;
extern LLGLSLShader gDeferredWLSunProgram;
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 41b6a2dc501..f036b43f122 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -167,7 +167,7 @@
<icon
follows="top|left"
height="16"
- image_name="unknown"
+ image_name="Unknown_Icon"
layout="topleft"
left="10"
name="maturity_icon"
--
GitLab