fix for texture view widget deletion spam

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;