summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-19 15:58:53 -0500
committerOz Linden <oz@lindenlab.com>2010-11-19 15:58:53 -0500
commitf6ba55b8ed24246be340d069c64d25bd614194a6 (patch)
tree3475f87a3326be076158597ecc7e96f341080f2f /indra/newview/llimfloater.cpp
parent3b85391839da9077129830258d4a1d1ce6069cb3 (diff)
parent0f72f152e88efd7fc56cf6764f25bd2d0d4bf062 (diff)
merge fix for STORM-138
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index e000abda2a..bdc0dfa7e2 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -680,8 +680,6 @@ void LLIMFloater::updateMessages()
if (messages.size())
{
-// LLUIColor chat_color = LLUIColorTable::instance().getColor("IMChatColor");
-
LLSD chat_args;
chat_args["use_plain_text_chat_history"] = use_plain_text_chat_history;