diff options
author | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
commit | bd95e64d3da1b90b37e88e31979cc8f227d5cc58 (patch) | |
tree | fff84f4075cb34a3fdd589bf399e47bebb8bc17d /indra/newview/lltextureview.cpp | |
parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) |
Set hotfix build params for Release.
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rw-r--r-- | indra/newview/lltextureview.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 6cd8a78b25..43913f3632 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -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; |