diff options
author | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
commit | ce526d40638fcc78724913621ee5c12f792f1859 (patch) | |
tree | 735e03596926582d70d1609754d4e91fd6f49b77 /indra/newview/llfloaterimnearbychatlistener.cpp | |
parent | 34f561db55868185f0a946009f41f4f212366484 (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge with voorhees (viewer-release)
Diffstat (limited to 'indra/newview/llfloaterimnearbychatlistener.cpp')
-rwxr-xr-x | indra/newview/llfloaterimnearbychatlistener.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimnearbychatlistener.cpp b/indra/newview/llfloaterimnearbychatlistener.cpp index 14a22bcd84..5a5f6c72c8 100755 --- a/indra/newview/llfloaterimnearbychatlistener.cpp +++ b/indra/newview/llfloaterimnearbychatlistener.cpp @@ -33,7 +33,7 @@ #include "llagent.h" #include "llchat.h" - +#include "llviewercontrol.h" LLFloaterIMNearbyChatListener::LLFloaterIMNearbyChatListener(LLFloaterIMNearbyChat & chatbar) @@ -95,6 +95,6 @@ void LLFloaterIMNearbyChatListener::sendChat(LLSD const & chat_data) const } // Send it as if it was typed in - mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0)); + mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, ((BOOL)(channel == 0)) && gSavedSettings.getBOOL("PlayChatAnim")); } |