diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-09 16:31:46 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-09 16:31:46 +0200 |
| commit | ac5bd9d50410106549e1aad922e609707f08deab (patch) | |
| tree | 0c99d2474520dcc2981f4debe151d9de8dff5bb7 /indra | |
| parent | 99aad90f63f0bf58f71a283447959e55833905db (diff) | |
Fixed normal bug EXT-5116 ( Voice notification should display on top of IM window, not under.)
- added moving notifications floaters to front in the floater view while opening.
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llimview.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b6032f4dfa..32482a065c 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1517,6 +1517,15 @@ void LLCallDialog::draw() } } +// virtual +void LLCallDialog::onOpen(const LLSD& key) +{ + LLDockableFloater::onOpen(key); + + // it should be over the all floaters. EXT-5116 + gFloaterView->bringToFront(this); +} + void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id) { // *NOTE: 12/28/2009: check avaline calls: LLVoiceClient::isParticipantAvatar returns false for them diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 1c7aaa3f1b..21c7626109 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -472,6 +472,7 @@ public: // check timer state /*virtual*/ void draw(); + /*virtual*/ void onOpen(const LLSD& key); protected: // lifetime timer for a notification |