summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-17 15:23:01 -0500
committerOz Linden <oz@lindenlab.com>2010-11-17 15:23:01 -0500
commit4ecf93fda2f2a30def5197b4f141b3abdbdc8b4e (patch)
treec11c51aed31c8372b5c59d4006337414b870cb92 /indra/newview/llimfloater.cpp
parentd0de833d947b219eabae01abbb5750ad05e5e305 (diff)
parent3b86582fb8fd809273d152197f72de2c59a29f24 (diff)
merge fix for STORM-563
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;