From 3ee48a2090a5c009318e2630f38c78e48b556427 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Sun, 7 Mar 2010 22:55:52 -0700
Subject: trival fix to eliminate unnecessary warnings "LLView::~LLView():
 Deleting view " << mName << " during UI draw() phase" caused in
 lltextureview.cpp (from the texture console).

---
 indra/newview/lltextureview.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 1b44063840..a4ca33f10f 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -665,12 +665,18 @@ void LLTextureView::draw()
 // 		LLViewerObject *objectp;
 // 		S32 te;
 
+//#if LL_DEBUG
+		BOOL drawing = LLView::sIsDrawing;
+		LLView::sIsDrawing = FALSE;
+//#endif
 		for_each(mTextureBars.begin(), mTextureBars.end(), DeletePointer());
 		mTextureBars.clear();
-	
-		delete mGLTexMemBar;
+			
+		delete mGLTexMemBar;		
 		mGLTexMemBar = 0;
-	
+//#if LL_DEBUG
+		LLView::sIsDrawing = drawing ;
+//#endif	
 		typedef std::multiset<decode_pair_t, compare_decode_pair > display_list_t;
 		display_list_t display_image_list;
 	
-- 
cgit v1.2.3