diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-07 11:36:22 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-07 11:36:22 -0500 |
| commit | 27bd65129b6f78aa2a7b75e7ef6c3fd33455c766 (patch) | |
| tree | b53a32dbc47a071809caec0a2b836111adb0aa78 | |
| parent | 3b32253d31aaede1093833cebd47e3e74a410af4 (diff) | |
| parent | 80db39181685f05cbf33b1ea9d24f3d2e99dbcbc (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 70bfc67523..55609621b3 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2689,13 +2689,16 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const const LLTextureEntry* te = face->getTextureEntry(); const LLViewerTexture* img = face->getTexture(); - textures.insert(img->getID()); + if (img) + { + textures.insert(img->getID()); + } if (face->getPoolType() == LLDrawPool::POOL_ALPHA) { alpha++; } - else if (img->getPrimaryFormat() == GL_ALPHA) + else if (img && img->getPrimaryFormat() == GL_ALPHA) { invisi = 1; } |