summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-12-25 13:17:53 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-12-25 13:17:53 +0200
commit0d0f10441b26206da2941d5e1f58f0e8207fc757 (patch)
treea59792f6535f65388a60e1f3ea8fdfaf114da20f /indra/newview/llimview.cpp
parent8f81b5dbe4ff0a0d6486e5325250650986f6a81e (diff)
moved to base class LLCallDialog method draw();
added check to draw LLCallDialog if floater has dock control; --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp16
1 files changed, 6 insertions, 10 deletions
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()
{