summaryrefslogtreecommitdiff
path: root/indra/newview/llchatbar.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-08-26 14:57:54 -0700
committerGraham Linden <graham@lindenlab.com>2013-08-26 14:57:54 -0700
commitc50f44e04ed4c14dd19b18421878cc0094cee9b2 (patch)
treebd7418ba39e5aeac26c31df3b5dd7d4e4b676e73 /indra/newview/llchatbar.cpp
parentbf55d287db305907b83909c09bc5842a5a7a709f (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge viewer-release 3.6.5
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"));
}
}
}