From 7c3db82ffa70cb60f7cb09e4f9fe769ee449fe3a Mon Sep 17 00:00:00 2001 From: Arrehn Date: Sun, 5 Jun 2011 19:14:00 -0400 Subject: [PATCH] FIRE-960, Remove overwriting text that conflicts with FS vertical tabs defaults --- indra/newview/llchathistory.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 2627df9b27..accceeb97f 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -760,6 +760,11 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL mEditor->setPlainText(use_plain_text_chat_history); + /* This system in incompatible with vertical tabs, the firestorm default. + * disabling until we can find a way to make it work without overdrawing text + * or requiring a large otherwised unused gap in the XUI. + * + if (!mEditor->scrolledToEnd() && chat.mFromID != gAgent.getID() && !chat.mFromName.empty()) { mUnreadChatSources.insert(chat.mFromName); @@ -788,6 +793,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL S32 height = mMoreChatText->getTextPixelHeight() + 5; mMoreChatPanel->reshape(mMoreChatPanel->getRect().getWidth(), height); } + */ LLColor4 txt_color = LLUIColorTable::instance().getColor("White"); LLColor4 header_name_color = LLUIColorTable::instance().getColor("ChatNameColor");