diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-01 17:55:33 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-01 17:55:33 -0700 |
| commit | 0edcdc42f2b4b1370d75d0b78fc3f9834b218449 (patch) | |
| tree | 53c6f438ec4ffaddcc61f29c0fde66d5d33e3133 /indra/newview | |
| parent | 105872b94e09502220a2ec0d5e9a2f54929ba232 (diff) | |
| parent | 436fe6a4125ac0fb4be29e7e3530dc5200e18cd5 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview')
| -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 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) |