summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-03-01 02:13:55 +0000
committerDon Kjer <don@lindenlab.com>2011-03-01 02:13:55 +0000
commit627c28da811f00ddd02a5c2af0762f427ac02a1b (patch)
tree13e1deab87b9a3c56595b796bd17347e47a93658 /indra/newview/llvovolume.cpp
parentf2764d24a3b3563d66a683c84af22b61648755cb (diff)
parent0929315ab103433275a71f26a4900ee0615932e9 (diff)
Merge with viewer-headless
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r--indra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index f67e3a9770..a207d3e050 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2165,7 +2165,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)