diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-25 18:27:07 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-25 18:27:07 -0500 |
| commit | 41ca92c67c75d86e8053ae45725d36ca3ac7e742 (patch) | |
| tree | 92d15cb41a3ae1add912bb134581530d48a8b776 /indra/newview/lllocalbitmaps.cpp | |
| parent | 6620c1f824f2034d432662a84174019a26ed9a78 (diff) | |
NORSPEC-54 Potential fix for crashing on all sorts of random operations.
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
| -rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 97ba5b634a..6f213e018a 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -372,10 +372,12 @@ std::vector<LLViewerObject*> LLLocalBitmap::prepUpdateObjects(LLUUID old_id) std::vector<LLViewerObject*> obj_list; LLViewerFetchedTexture* old_texture = gTextureList.findImage(old_id); - for(U32 face_iterator = 0; face_iterator < old_texture->getNumFaces(); face_iterator++) + U32 ch = LLRender::DIFFUSE_MAP; + + for(U32 face_iterator = 0; face_iterator < old_texture->getNumFaces(ch); face_iterator++) { // getting an object from a face - LLFace* face_to_object = (*old_texture->getFaceList())[face_iterator]; + LLFace* face_to_object = (*old_texture->getFaceList(ch))[face_iterator]; if(face_to_object) { |