diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-30 20:09:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-30 20:09:05 -0400 |
| commit | 02f8d44c9c9cf7c1996d509c527a13f143b120c0 (patch) | |
| tree | 1cbca40cedfb2df8cf3b2c7f489b8585c7294693 /indra/llprimitive/llprimtexturelist.cpp | |
| parent | fa055104fc66f7b8779b3d3d399cd9cbb4057e76 (diff) | |
| parent | 1a2f73368ee8298cfb68cdeb114cc9b98f95174b (diff) | |
Merge pull request #4827 from RyeMutt/rye/linux64
Linux Support Part 1
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.cpp')
| -rw-r--r-- | indra/llprimitive/llprimtexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index 68f3f5ffac..c70a8f6483 100644 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -137,7 +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) + if (te != LLTextureEntry::null) { mEntryList[index] = te.newCopy(); } |