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

Merge conflict mixup, use noaction instead of none for user preference

master
Merov Linden 2013-06-19 13:51:12 -07:00
parent b3c010ea71
commit db803e193e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llimview.cpp
View File

@ -252,7 +252,7 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg)
// actions:
// 0. nothing - exit
if (("none" == user_preferences ||
if (("noaction" == user_preferences ||
ON_TOP_AND_ITEM_IS_SELECTED == conversations_floater_status)
&& session_floater->isMessagePaneExpanded())
{