summaryrefslogtreecommitdiff
path: root/indra/newview/llchatbar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-19 15:15:15 -0400
committerOz Linden <oz@lindenlab.com>2013-08-19 15:15:15 -0400
commit82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (patch)
tree7f44a97fdf51222e743e18464d1b2d0ccb5b830e /indra/newview/llchatbar.cpp
parent731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (diff)
parent86b4019684af96a64a1d439851f177d7c18e4c24 (diff)
merge changes for DRTVWR-285
Diffstat (limited to 'indra/newview/llchatbar.cpp')
-rwxr-xr-xindra/newview/llchatbar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 7d0331757b..b3bc0ba966 100755
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -381,7 +381,7 @@ void LLChatBar::sendChat( EChatType type )
if (!utf8_revised_text.empty())
{
// Chat with animation
- sendChatFromViewer(utf8_revised_text, type, TRUE);
+ sendChatFromViewer(utf8_revised_text, type, gSavedSettings.getBOOL("PlayChatAnim"));
}
}
}