Merge branch 'release/maint-b' into marchcat/b-merge

# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
#	indra/newview/llfilepicker.cpp

1 files changed, 1 insertions, 8 deletions

diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index ce4df843ea..011e5d5ce6 100644
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -137,14 +137,7 @@ S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te)
         // we're changing an existing entry
     llassert(mEntryList[index]);
     delete (mEntryList[index]);
-    if  (&te)
-    {
-        mEntryList[index] = te.newCopy();
-    }
-    else
-    {
-        mEntryList[index] = LLPrimTextureList::newTextureEntry();
-    }
+    mEntryList[index] = te.newCopy();
     return TEM_CHANGE_TEXTURE;
 }