diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-10 18:42:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-10 18:42:56 +0800 |
| commit | a4543cf3cd41a466599de61f02e6d3b3d09700c4 (patch) | |
| tree | 6743beff840669800d4bdc445919bd8f09a06cd5 /indra/llprimitive/llprimtexturelist.cpp | |
| parent | 52d973e95567efcb145ed0de1f4b6f0e19663776 (diff) | |
| parent | 0797257992ee7f88456d3083ebf214485b75c139 (diff) | |
Merge branch 'main' into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.cpp')
| -rw-r--r-- | indra/llprimitive/llprimtexturelist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index f4f08248b8..b50c541488 100644 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -125,7 +125,7 @@ void LLPrimTextureList::take(LLPrimTextureList& other_list) // virtual // copies LLTextureEntry 'te' // returns TEM_CHANGE_TEXTURE if successful, otherwise TEM_CHANGE_NONE -S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te) +S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry* te) { if (S32(index) >= mEntryList.size()) { @@ -137,9 +137,9 @@ S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te) // we're changing an existing entry llassert(mEntryList[index]); delete (mEntryList[index]); - if (&te) + if (te) { - mEntryList[index] = te.newCopy(); + mEntryList[index] = te->newCopy(); } else { |