diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-11 11:34:09 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-11 11:34:09 +0000 |
commit | 39e34dce3ea61cf9824154338beb0a452d720dd4 (patch) | |
tree | 84af006601914d4381a09a83bb7a290371b6bd87 /indra/newview/lltexlayer.cpp | |
parent | 8229fdd4902012c2d87cdd0264ad30de5cd7e0fa (diff) | |
parent | a618a3913af506878adf59a2c5b5fb12e665e35b (diff) |
merge from viewer-2-0
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r-- | indra/newview/lltexlayer.cpp | 5 |
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++) |