summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:11:35 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:11:35 +0000
commit1d66e3a1fba1d3ea5b47ae4fc54e752cdba9e540 (patch)
treede3e8c8d49a395833c2d40d01395b67de4f2f677 /indra/newview
parent5afe94fec4f884d9e645da6cff1dd9f78420d290 (diff)
CID-69
Checker: FORWARD_NULL Function: LLFace::switchTexture(LLViewerTexture *) File: /indra/newview/llface.cpp not a bug.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llface.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 4a540fbe58..d12fd48ffb 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -301,7 +301,8 @@ void LLFace::switchTexture(LLViewerTexture* new_texture)
if(!new_texture)
{
- llerrs << "Can not switch to a null texture." << llendl ;
+ llerrs << "Can not switch to a null texture." << llendl;
+ return;
}
new_texture->addTextureStats(mTexture->getMaxVirtualSize()) ;