livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-566 Flashing and color on Conversations FUI button and conversation line item: 

change behavior for the case "If conversations (container) floater open but not on top"
meow-7.2.2
AlexanderP ProductEngine 2012-12-21 16:28:33 +02:00
parent 6df0377d1d
commit 7549a392cc
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llimview.cpp
View File

@ -160,6 +160,7 @@ void on_new_message(const LLSD& msg)
//session floater not focused (visible or not)
bool session_floater_not_focused = session_floater && !session_floater->hasFocus();
//conv. floater is closed
bool conversation_floater_is_closed =
!( im_box
@ -210,20 +211,16 @@ void on_new_message(const LLSD& msg)
else if ("flash" == action)
{
if (session_floater_not_focused)
if (conversation_floater_not_focused)
{
//User is not focused on conversation containing the message
if(conversation_floater_not_focused)
if(session_floater_not_focused)
{
//User is not focused on conversation containing the message
gToolBarView->flashCommand(LLCommandId("chat"), true);
}
//conversation floater is open but a different conversation is focused
//else
//{
im_box->flashConversationItemWidget(session_id, true);
//}
}
im_box->flashConversationItemWidget(session_id, true);
}
}
else if("openconversations" == action)