diff options
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.cpp')
| -rw-r--r-- | indra/llprimitive/llprimtexturelist.cpp | 11 | 
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index 68f3f5ffac..7f60d8025a 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 (size_t(index) >= mEntryList.size())      { @@ -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;  }  | 
