diff options
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 8c33c94bbe..70f15e0057 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1482,13 +1482,17 @@ LLCallDialog(payload) } } -void LLOutgoingCallDialog::draw() +void LLCallDialog::draw() { if (lifetimeHasExpired()) { onLifetimeExpired(); } - LLDockableFloater::draw(); + + if (getDockControl() != NULL) + { + LLDockableFloater::draw(); + } } bool LLOutgoingCallDialog::lifetimeHasExpired() @@ -1633,14 +1637,6 @@ LLIncomingCallDialog::LLIncomingCallDialog(const LLSD& payload) : LLCallDialog(payload) { } -void LLIncomingCallDialog::draw() -{ - if (lifetimeHasExpired()) - { - onLifetimeExpired(); - } - LLDockableFloater::draw(); -} bool LLIncomingCallDialog::lifetimeHasExpired() { |