From 3cf2d8e9eac215024bc216958b0920e61aa25de1 Mon Sep 17 00:00:00 2001 From: maximbproductengine Date: Wed, 9 Jan 2013 10:41:09 +0200 Subject: CHUI-665 (Change "Open conversation log" to "Conversation log..." in communication floater view/sort menu) --- indra/newview/skins/default/xui/en/menu_participant_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml index 33d7bd7c01..2f2bafb95d 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_view.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml @@ -76,7 +76,7 @@ parameter="privacy_preferences" /> Date: Tue, 8 Jan 2013 19:59:27 +0200 Subject: CHUI-611 Fixed! Text in torn off message panel not wrapping correctly with size of conversation panel --- indra/newview/llfloaterimcontainer.cpp | 2 +- .../skins/default/xui/en/floater_im_container.xml | 30 ++++++---------------- 2 files changed, 9 insertions(+), 23 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 82563b8736..38528f18f0 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -162,7 +162,7 @@ BOOL LLFloaterIMContainer::postBuild() setTabContainer(getChild("im_box_tab_container")); mStubPanel = getChild("stub_panel"); - mStubTextBox = getChild("stub_textbox_2"); + mStubTextBox = getChild("stub_textbox"); mStubTextBox->setURLClickedCallback(boost::bind(&LLFloaterIMContainer::returnFloaterToHost, this)); mConversationsStack = getChild("conversations_stack"); diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 951665552f..12c1676127 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -161,32 +161,18 @@ - This conversation is in a separate window. - - - [secondlife:/// Bring it back.] - + This conversation is in a separate window. [secondlife:/// Bring it back.] + -- cgit v1.2.3 From bb05a29374b2c9691937ccb15cdbff466fd775f1 Mon Sep 17 00:00:00 2001 From: "maxim@mnikolenko" Date: Wed, 9 Jan 2013 15:08:58 +0200 Subject: CHUI-638 FIXED Don't force button and widget to flash if the object is muted. --- indra/newview/llimview.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 0011f54175..0326235d37 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -225,12 +225,17 @@ void on_new_message(const LLSD& msg) //User is not focused on conversation containing the message if(session_floater_not_focused) { - im_box->flashConversationItemWidget(session_id, true); - + if(!LLMuteList::getInstance()->isMuted(participant_id)) + { + im_box->flashConversationItemWidget(session_id, true); + } //The conversation floater isn't focused/open if(conversation_floater_not_focused) { - gToolBarView->flashCommand(LLCommandId("chat"), true); + if(!LLMuteList::getInstance()->isMuted(participant_id)) + { + gToolBarView->flashCommand(LLCommandId("chat"), true); + } //Show IM toasts (upper right toasts) // Skip toasting for system messages and for nearby chat -- cgit v1.2.3 From 6a30c4c3c54f3d70d1a10fb76e7c81cd5e36a524 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Wed, 9 Jan 2013 13:30:14 -0800 Subject: CHUI-669: Upon DND mode exit, no longer flash IM messages that were stored during DND mode. --- indra/newview/llimview.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'indra') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 0326235d37..a3c338831c 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -129,11 +129,7 @@ void process_dnd_im(const LLSD& notification) false); //will need slight refactor to retrieve whether offline message or not (assume online for now) } - //For now always flash conversation line item - LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance("im_container"); - im_box->flashConversationItemWidget(sessionID, true); - - //And flash toolbar button + //Flash toolbar button for now, eventually the user's preference will be taken into account gToolBarView->flashCommand(LLCommandId("chat"), true); } -- cgit v1.2.3 From 41d5f820ea1859493b7f14d9d81b145a6a3b38b6 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Wed, 9 Jan 2013 14:30:10 -0800 Subject: CHUI-670: Prevent flashing of 'Chat' FUI button while in DND mode and receive IM. --- indra/newview/llimview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a3c338831c..067f0d1993 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -228,7 +228,8 @@ void on_new_message(const LLSD& msg) //The conversation floater isn't focused/open if(conversation_floater_not_focused) { - if(!LLMuteList::getInstance()->isMuted(participant_id)) + if(!LLMuteList::getInstance()->isMuted(participant_id) + && !gAgent.isDoNotDisturb()) { gToolBarView->flashCommand(LLCommandId("chat"), true); } -- cgit v1.2.3