diff options
| author | callum_linden <none@none> | 2013-05-17 09:34:57 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-05-17 09:34:57 -0700 |
| commit | 30fcff121f73cc23e3114b3af56ffbc4ca732fe1 (patch) | |
| tree | f3b34453940a3746145361193f62ef585b0ef428 /indra/newview/llvovolume.cpp | |
| parent | 68c6ad909c4878f5627fa485efaa735c2ea13587 (diff) | |
| parent | 2a3f4dfc458c42101f048d96b8df68ccd23646be (diff) | |
Merge with head
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index a9b540507f..c3c6747e99 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1976,8 +1976,11 @@ S32 LLVOVolume::setTEGlow(const U8 te, const F32 glow) void LLVOVolume::setTEMaterialParamsCallback(const LLMaterialID &pMaterialID, const LLMaterialPtr pMaterialParams, U32 te) { LL_DEBUGS("MaterialTEs") << "materialid " << pMaterialID.asString() << " to TE " << te << LL_ENDL; + if (te >= getNumTEs()) + return; + LLTextureEntry* texture_entry = getTE(te); - if (texture_entry && (texture_entry->getMaterialID().isNull() || (texture_entry->getMaterialID() == pMaterialID))) + if (texture_entry) { setTEMaterialParams(te, pMaterialParams); } |