summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-11 11:29:32 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-11 11:29:32 +0000
commit4a46fb0f86a043714ef54d302d790b069f888653 (patch)
tree20e63f586bbf7380c3c08be2fc9e6044b8e41c66 /indra/newview/lltexlayer.cpp
parent3298ab474e5e95d0016dff0e219f882ee0fa5c3a (diff)
parenta618a3913af506878adf59a2c5b5fb12e665e35b (diff)
merge from viewer-2-0
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++)