diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-03-26 17:08:32 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-03-26 17:08:32 +0200 |
| commit | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (patch) | |
| tree | 38714163d973d7b74dccdfc8045aac6db1bc66fc /indra/newview | |
| parent | be66b520571aa89feefc8e1dad6dbc622521f124 (diff) | |
Fixed normal bug EXT-5116 (Voice notification should display on top of IM window, not under.)
Replaced sending voice notifications to front (in floater view) with adding them to popup view.
In this case Voice Notifications are shown on top even IM window has focus. And Resident can continue enter the text when Voice notification is shown.
Reviewad by Vadim at https://codereview.productengine.com/secondlife/r/120/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llimview.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 288895be8c..389917a6f7 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1559,6 +1559,11 @@ LLCallDialog::LLCallDialog(const LLSD& payload) setDocked(true); } +LLCallDialog::~LLCallDialog() +{ + LLUI::removePopup(this); +} + void LLCallDialog::getAllowedRect(LLRect& rect) { rect = gViewerWindow->getWorldViewRectScaled(); @@ -1612,7 +1617,7 @@ void LLCallDialog::onOpen(const LLSD& key) LLDockableFloater::onOpen(key); // it should be over the all floaters. EXT-5116 - gFloaterView->bringToFront(this, FALSE); + LLUI::addPopup(this); } void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id) diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 475d407bea..fac8f4954c 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -495,7 +495,7 @@ class LLCallDialog : public LLDockableFloater { public: LLCallDialog(const LLSD& payload); - ~LLCallDialog() {} + ~LLCallDialog(); virtual BOOL postBuild(); |