diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-07-15 17:55:58 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-07-15 17:55:58 +0000 |
| commit | d025b721e0d39f53ef796f9c9e28e94b6d1cea20 (patch) | |
| tree | e34a77991cae0ded8c0e021392002483057f46e6 /indra/llprimitive | |
| parent | c2e425e5395c1b1b43a2f477565e374d919f10ee (diff) | |
svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
QAR-1691
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llprimtexturelist.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index c1dde32993..b02d4c50bd 100644 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -134,13 +134,12 @@ S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te) { if (S32(index) >= mEntryList.size()) { - // TODO -- assert here S32 current_size = mEntryList.size(); - llerrs << "index = " << S32(index) << " current_size = " << current_size << llendl; + llwarns << "ignore copy of index = " << S32(index) << " into texture entry list of size = " << current_size << llendl; return TEM_CHANGE_NONE; } - // we're changing an existing entry + // we're changing an existing entry llassert(mEntryList[index]); delete (mEntryList[index]); if (&te) |