diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-16 17:45:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-16 17:45:34 -0500 |
| commit | fb32d211ec22bb9170fa14cb7d0ef9249bae2b7d (patch) | |
| tree | b6224652a8d4c5fb5fa2e80f08c4c5b6d1e54853 /indra/newview/llimfloater.cpp | |
| parent | 0670e889f93ffaee1ea103fcd4a54d1217b67bfd (diff) | |
| parent | eb2bd410333417d04bac787056e2850110497880 (diff) | |
merging up to tip of viewer-development
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
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; |