diff options
| author | Richard Linden <none@none> | 2010-03-05 17:41:02 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-05 17:41:02 -0800 |
| commit | 9412447b4f49e068fc5890821ed4b8686e13d723 (patch) | |
| tree | 91a8b0dbbc9fed2ebad87ebd7a63ac738e04cac7 /indra/llui/llview.cpp | |
| parent | 64b5c53156ce3115652e094be25a3e165512ffca (diff) | |
| parent | 7cea645ba2b77d5bbcba7a7189aa584ac95ff453 (diff) | |
merge
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index db2c460eec..b695731a02 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -73,9 +73,9 @@ S32 LLView::sLastBottomXML = S32_MIN; std::vector<LLViewDrawContext*> LLViewDrawContext::sDrawContextStack; -#if LL_DEBUG +//#if LL_DEBUG BOOL LLView::sIsDrawing = FALSE; -#endif +//#endif // Compiler optimization, generate extern template template class LLView* LLView::getChild<class LLView>( @@ -150,6 +150,10 @@ LLView::~LLView() { dirtyRect(); //llinfos << "Deleting view " << mName << ":" << (void*) this << llendl; + if (LLView::isDrawing) + { + llwarns << "Deleting view " << mName << " during UI draw() phase" << llendl; + } // llassert(LLView::sIsDrawing == FALSE); // llassert_always(sDepth == 0); // avoid deleting views while drawing! It can subtly break list iterators |