diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-10-03 00:23:01 +0000 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-10-03 00:23:01 +0000 |
| commit | b1a280841e1823a19658923a8eefeb67d1d70735 (patch) | |
| tree | 46fe90cf2f37fc21d86fd7a599e6120d7de396ea /indra/newview/llface.cpp | |
| parent | a6db5fa24e99a4cca00c67708621a3ceffcec8a6 (diff) | |
fix for DEV-40559: viewer crash when media texture appears while parcel media is loading.
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index a5b0b05603..b0ae13348b 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -272,12 +272,12 @@ void LLFace::setTexture(LLViewerTexture* tex) removeAtlas() ; } - mTexture = tex ; - - if(mTexture.notNull()) + if(tex) { - mTexture->addFace(this) ; - } + tex->addFace(this) ; + } + + mTexture = tex ; } void LLFace::switchTexture(LLViewerTexture* new_texture) |