diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-20 16:16:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-20 20:52:45 +0800 |
| commit | ad5dec92bcb7d11e6a48b6ec6a220a49de985351 (patch) | |
| tree | 3870c4c7f1c9521c6ad40d1cfe1b1d8fc39882ef /indra/llprimitive/llprimtexturelist.cpp | |
| parent | 16299d3a3631e4c42367cf40410ad6995e585384 (diff) | |
| parent | a65bc46b138b89200586b29fe729cbc7b0f0c8c4 (diff) | |
Merge remote-tracking branch 'secondlife/release/maint-b' into maint-b
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; } |