diff options
| author | simon <none@none> | 2015-04-15 15:07:13 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-04-15 15:07:13 -0700 |
| commit | a219cf1c98527faa0e7addeb9660f679208bb0e7 (patch) | |
| tree | 78a14774f7ff79dd92c022caa2d9d68ec85fba85 /indra/newview/llviewertexturelist.cpp | |
| parent | b5324afb6f2e45deefb9b79e7e2192bc686b181a (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge viewer-release
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rwxr-xr-x | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index b98726900f..322a55383a 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -622,7 +622,7 @@ void LLViewerTextureList::addImage(LLViewerFetchedTexture *new_image) { return; } - llassert(new_image); + //llassert(new_image); LLUUID image_id = new_image->getID(); LLViewerFetchedTexture *image = findImage(image_id); |