fix for texture view widget deletion spam

master
Richard Linden 2010-03-09 16:14:16 -08:00
parent 978ae36b86
commit 22b6436506
1 changed files with 8 additions and 3 deletions

View File

@ -660,8 +660,9 @@ struct compare_decode_pair
struct KillView
{
void operator()(LLView* viewp) const
void operator()(LLView* viewp)
{
viewp->getParent()->removeChild(viewp);
viewp->die();
}
};
@ -676,8 +677,12 @@ void LLTextureView::draw()
for_each(mTextureBars.begin(), mTextureBars.end(), KillView());
mTextureBars.clear();
delete mGLTexMemBar;
mGLTexMemBar = 0;
if (mGLTexMemBar)
{
removeChild(mGLTexMemBar);
mGLTexMemBar->die();
mGLTexMemBar = 0;
}
typedef std::multiset<decode_pair_t, compare_decode_pair > display_list_t;
display_list_t display_image_list;