From db803e193efee4a54fc0ca3a7fe1a6d4e089c06a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 19 Jun 2013 13:51:12 -0700
Subject: [PATCH] Merge conflict mixup, use noaction instead of none for user
preference
---
indra/newview/llimview.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 6ca94436c69..09f47c136f6 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())
{
--
GitLab