diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
| commit | 4cf12a6d223a238ff30f8b334ca91836c7369f88 (patch) | |
| tree | a2bf8fa27e5fff8a1b8a75cdb5d835f4e959f145 /indra/llprimitive/llprimtexturelist.cpp | |
| parent | 13f24f2419edeefbda8bedab01fad21cb97b7445 (diff) | |
| parent | 569d97707459d5f87cb04a0811c0b7eb1b5c2251 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.cpp')
| -rw-r--r-- | indra/llprimitive/llprimtexturelist.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index 1a1d6602ab..6b7e2ecf5b 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; } |