diff options
author | leyla_linden <none@none> | 2011-02-02 14:46:54 -0800 |
---|---|---|
committer | leyla_linden <none@none> | 2011-02-02 14:46:54 -0800 |
commit | 33f82d788502a036953b676bfcb709d968b2a569 (patch) | |
tree | 308ff09063497ecf326e7ed485088c1d8eb82a07 /indra/newview/llvovolume.cpp | |
parent | 40f38c13a81fec9fcf1b0f98575d558801b33c0a (diff) | |
parent | ba4afc4a303121a6dd618da420c8aa8c2accb367 (diff) |
Merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index fe48bf5493..55e68d61f9 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2287,7 +2287,7 @@ void LLVOVolume::removeMediaImpl(S32 texture_index) }
//make the face referencing to mMediaImplList[texture_index] to point back to the old texture.
- if(mDrawable)
+ if(mDrawable && texture_index < mDrawable->getNumFaces())
{
LLFace* facep = mDrawable->getFace(texture_index) ;
if(facep)
|