diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-19 13:51:12 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 13:51:12 -0700 |
| commit | db803e193efee4a54fc0ca3a7fe1a6d4e089c06a (patch) | |
| tree | de7443b566c0a59c950663120dc892e00ac421dd /indra/newview | |
| parent | b3c010ea7130331d454c480b82d1309bac712004 (diff) | |
Merge conflict mixup, use noaction instead of none for user preference
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 6ca94436c6..09f47c136f 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -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()) { |