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(+) 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 From 41f350cee9acfc108eba68f83bf44bf5861814df Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 9 Feb 2010 17:13:54 +0200 Subject: Fixed normal bug EXT-5244 ( There is no "i" button for Name fields from nearby chat) - reason: changes in c91e724d4f15 related to EXT-4547. Also multiple warnings appeared in log: LLView::getChild: Found child named user_name but of wrong type class L LTextBox, expecting class LLViewerTextEditor * - fix: changed template class from LLViewerTextEditor to LLTextBase in getChild. --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 929457046c..c125f84c58 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -116,7 +116,7 @@ public: //*TODO remake it using mouse enter/leave and static LLHandle to add/remove as a child BOOL handleToolTip(S32 x, S32 y, MASK mask) { - LLViewerTextEditor* name = getChild("user_name"); + LLTextBase* name = getChild("user_name"); if (name && name->parentPointInView(x, y) && mAvatarID.notNull() && SYSTEM_FROM != mFrom) { -- cgit v1.2.3 From 1d5df49d6abf2f22c84b77a40118ff239e7d11ac Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 9 Feb 2010 17:48:35 +0200 Subject: Fixed normal bug EXT-5119 (Voice Control Panel should open only after call is connected, so it's not overlapped by voice notifications.) - updated condition when VCP should be shown to check voice channel state (CONNECTED) --HG-- branch : product-engine --- indra/newview/llcallfloater.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 97a5c3b8e2..0aaaa8e705 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -303,8 +303,8 @@ void LLCallFloater::updateSession() refreshParticipantList(); updateAgentModeratorState(); - //show floater for voice calls - if (!is_local_chat) + //show floater for voice calls & only in CONNECTED to voice channel state + if (!is_local_chat && LLVoiceChannel::STATE_CONNECTED == voice_channel->getState()) { LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); bool show_me = !(im_floater && im_floater->getVisible()); -- cgit v1.2.3 From 33d1d5bc4df2eaef6ca8f9e4111d8a437763766c Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Tue, 9 Feb 2010 19:18:17 +0200 Subject: Fixed normal bug EXT-651 (Upload Image shortcut (Ctrl-U / Cmd-U) does not work) --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 22f4d277a4..4e9073bea5 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1594,6 +1594,16 @@ name="Shortcuts" tear_off="true" visible="false"> + + + Date: Tue, 9 Feb 2010 19:18:17 +0200 Subject: Update of major bug EXT-5022 (streaming media first use dialog should be removed) --HG-- branch : product-engine --- indra/newview/app_settings/ignorable_dialogs.xml | 11 ----------- indra/newview/llappviewer.cpp | 1 - 2 files changed, 12 deletions(-) diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml index e825f13e82..d0e1f62a84 100644 --- a/indra/newview/app_settings/ignorable_dialogs.xml +++ b/indra/newview/app_settings/ignorable_dialogs.xml @@ -177,17 +177,6 @@ Value 1 - FirstStreamingMedia - - Comment - Enables FirstStreamingMedia warning dialog - Persist - 1 - Type - Boolean - Value - 1 - FirstTeleport Comment diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5349ccabec..9f5c6cc441 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1933,7 +1933,6 @@ bool LLAppViewer::initConfiguration() // LLFirstUse::addConfigVariable("FirstSandbox"); // LLFirstUse::addConfigVariable("FirstFlexible"); // LLFirstUse::addConfigVariable("FirstDebugMenus"); -// LLFirstUse::addConfigVariable("FirstStreamingMedia"); // LLFirstUse::addConfigVariable("FirstSculptedPrim"); // LLFirstUse::addConfigVariable("FirstVoice"); // LLFirstUse::addConfigVariable("FirstMedia"); -- cgit v1.2.3