summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.cpp
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2009-12-22 20:17:47 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2009-12-22 20:17:47 +0200
commit0a98034641267ea57360fdd369acb8b94ff9bc20 (patch)
treeb3b073825fdb2a42560df19805898b547c6156b4 /indra/newview/llcallfloater.cpp
parent81cf50d3d36968095566311d2c1249e23e480912 (diff)
Related to EXT-3628("Connecting to.." popup appears behind voice control panel while calling): Added workaround which sets current call dialog to front most.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r--indra/newview/llcallfloater.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 29f37a04b4..c222ced98f 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -291,6 +291,15 @@ void LLCallFloater::updateSession()
if (show_me)
{
setVisible(true);
+ // Workaround(EM): Set current call dialog to front most because
+ // connect/leaving popups should appear on top of VCP.
+ // See bug EXT-3628.
+ LLOutgoingCallDialog* instance =
+ LLFloaterReg::findTypedInstance<LLOutgoingCallDialog>("outgoing_call", LLOutgoingCallDialog::OCD_KEY);
+ if(instance && instance->getVisible())
+ {
+ instance->setFrontmost();
+ }
}
}
}