diff options
| author | Richard Linden <none@none> | 2010-04-08 16:43:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-04-08 16:43:48 -0700 |
| commit | b69a454aab29a837664760c4034dcaa837ed627a (patch) | |
| tree | 3bcb64aad644c2b8022fb77ad5d3c25c4fbeaaf8 /indra | |
| parent | 02d31068858bd39a836985fc4c7ef01d758da1ee (diff) | |
| parent | 70bbcf7c2d14e7e6e97e0297e01e0dae3565af13 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llview.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index ab14c08948..6b436bc0cd 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -563,6 +563,7 @@ void LLFloater::handleVisibilityChange ( BOOL new_visibility ) void LLFloater::openFloater(const LLSD& key) { + llinfos << "Opening floater " << getName() << llendl; mKey = key; // in case we need to open ourselves again if (getSoundFlags() != SILENT @@ -603,6 +604,7 @@ void LLFloater::openFloater(const LLSD& key) void LLFloater::closeFloater(bool app_quitting) { + llinfos << "Closing floater " << getName() << llendl; if (app_quitting) { LLFloater::sQuitting = true; diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 781c111474..e67f0ec3fc 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1321,6 +1321,8 @@ void LLView::drawChildren() if (viewp->getVisible() && viewp->getRect().isValid()) { + // check for bad data + llassert_always(viewp->getVisible() == TRUE); // Only draw views that are within the root view localRectToScreen(viewp->getRect(),&screenRect); if ( rootRect.overlaps(screenRect) && LLUI::sDirtyRect.overlaps(screenRect)) |