summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-03-16 15:02:58 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-03-16 15:02:58 +0200
commit3874823bd8a388979bad2d882d5d52bffb8d78da (patch)
treecb9713a19e8b9670cda7a5ec16b93f1e92b39584 /indra/newview/lltexlayer.cpp
parent2fed8d5182813e2077522bb5bbb2cc565b5c283d (diff)
parenta872814de964ebcbf40e812f79319a13a54e2336 (diff)
Merge from viewer-2-0
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 6ed95f2cbf..386b636367 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1883,6 +1883,11 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i)
/*virtual*/ BOOL LLTexLayerTemplate::render(S32 x, S32 y, S32 width, S32 height)
{
+ if(!mInfo)
+ {
+ return FALSE ;
+ }
+
BOOL success = TRUE;
updateWearableCache();
for (wearable_cache_t::const_iterator iter = mWearableCache.begin(); iter!= mWearableCache.end(); iter++)