summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-11-19 13:22:07 -0800
committerDave SIMmONs <simon@lindenlab.com>2010-11-19 13:22:07 -0800
commit2eec4949cc49f3c59cdc278be0e7eed1e092b167 (patch)
treec46a24bf021dccd724ba199bcf48a9b9b6ff0aca /indra/newview/llimfloater.cpp
parent9053aa7d1cb53445f7c7e8d929e3850807b52228 (diff)
parent1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff)
Merge latest from lindenlab/viewer-development
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;