From 0d0f10441b26206da2941d5e1f58f0e8207fc757 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 25 Dec 2009 13:17:53 +0200 Subject: moved to base class LLCallDialog method draw(); added check to draw LLCallDialog if floater has dock control; --HG-- branch : product-engine --- indra/newview/llimview.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'indra/newview/llimview.cpp') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e2e3524f74..f001bbf123 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1497,13 +1497,17 @@ LLCallDialog(payload) } } -void LLOutgoingCallDialog::draw() +void LLCallDialog::draw() { if (lifetimeHasExpired()) { onLifetimeExpired(); } - LLDockableFloater::draw(); + + if (getDockControl() != NULL) + { + LLDockableFloater::draw(); + } } bool LLOutgoingCallDialog::lifetimeHasExpired() @@ -1648,14 +1652,6 @@ LLIncomingCallDialog::LLIncomingCallDialog(const LLSD& payload) : LLCallDialog(payload) { } -void LLIncomingCallDialog::draw() -{ - if (lifetimeHasExpired()) - { - onLifetimeExpired(); - } - LLDockableFloater::draw(); -} bool LLIncomingCallDialog::lifetimeHasExpired() { -- cgit v1.2.3