From 4d6b76f677bbf05b1fe4b6913406526ddded03a9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 22 Feb 2013 12:26:58 +0100 Subject: [PATCH] Make LLNearbyChatBarListener respect FSPlayChatAnimation setting --- indra/newview/llnearbychatbarlistener.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llnearbychatbarlistener.cpp b/indra/newview/llnearbychatbarlistener.cpp index 2249aa594d..3b748caadc 100644 --- a/indra/newview/llnearbychatbarlistener.cpp +++ b/indra/newview/llnearbychatbarlistener.cpp @@ -36,6 +36,7 @@ #include "llagent.h" #include "llchat.h" +#include "llviewercontrol.h" // Remove floating chat bar @@ -104,7 +105,7 @@ void LLNearbyChatBarListener::sendChat(LLSD const & chat_data) const // Send it as if it was typed in // Remove floating chat bar // mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0)); - LLNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0)); + LLNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, ((BOOL)(channel == 0)) && gSavedSettings.getBOOL("FSPlayChatAnimation")); // }