merge Branch_1-19-0-Viewer -r 80279 : 80947 -> release

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 4c16683704..cb732a17c6 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -212,10 +212,16 @@ void LLPanel::draw()
 	}
 
 	updateDefaultBtn();
+
+	LLView::draw();
 }
 
 void LLPanel::updateDefaultBtn()
 {
+	// This method does not call LLView::draw() so callers will need
+	// to take care of that themselves at the appropriate place in
+	// their rendering sequence
+
 	if( mDefaultBtn)
 	{
 		if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
@@ -230,8 +236,6 @@ void LLPanel::updateDefaultBtn()
 			mDefaultBtn->setBorderEnabled(FALSE);
 		}
 	}
-
-	LLView::draw();
 }
 
 void LLPanel::refresh()