diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
| commit | 60c4621500e478d66a8bdc3a1c80573be2860fee (patch) | |
| tree | fa10b52caf3a54e03502058cd52d77952370cb34 /indra/newview/lltexlayer.cpp | |
| parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
| parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) | |
Automated merge from viewer/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++) |