diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-03-07 22:55:52 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-03-07 22:55:52 -0700 |
| commit | 3ee48a2090a5c009318e2630f38c78e48b556427 (patch) | |
| tree | bf836ee7b822d046e5e0611e3e7ac114b8d59f18 | |
| parent | 6220697f1893bec2d2a4a5fd263dc4f7aa3a6c3f (diff) | |
trival fix to eliminate unnecessary warnings "LLView::~LLView(): Deleting view " << mName << " during UI draw() phase" caused in lltextureview.cpp (from the texture console).
| -rw-r--r-- | indra/newview/lltextureview.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
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; |