summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-12-10 10:40:38 -0800
committerAndrew Meadows <andrew@lindenlab.com>2010-12-10 10:40:38 -0800
commite040f16a4f2e50592a125a04185fd9f06ac49522 (patch)
tree60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/newview/llimfloater.cpp
parentc320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff)
parent02701073ce70fc2e2043adf0ed7e0d6879669215 (diff)
merge
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;