From ac5bd9d50410106549e1aad922e609707f08deab Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 9 Feb 2010 16:31:46 +0200 Subject: 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 --- indra/newview/llimview.cpp | 9 +++++++++ indra/newview/llimview.h | 1 + 2 files changed, 10 insertions(+) (limited to 'indra/newview') 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 -- cgit v1.2.3