livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed normal bug EXT-4211 (Viewer 2.0 IRC chat style works unlike 1.23) 

--HG--
branch : product-engine
master
Eugene Mutavchi 2010-01-15 20:53:59 +02:00
parent c3c0b5ed47
commit 49f246a4da
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
indra/newview/llchatitemscontainerctrl.cpp
View File

@ -168,27 +168,30 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
msg_text->setText(std::string(""));
std::string str_sender;
str_sender = fromName;
str_sender+=" ";
//append user name
if ( notification["chat_style"].asInteger() != CHAT_STYLE_IRC )
{
LLStyle::Params style_params_name;
std::string str_sender;
LLColor4 userNameColor = LLUIColorTable::instance().getColor("ChatToastAgentNameColor");
str_sender = fromName;
style_params_name.color(userNameColor);
std::string font_name = LLFontGL::nameFromFont(messageFont);
std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
style_params_name.font.name(font_name);
style_params_name.font.size(font_style_size);
msg_text->appendText(str_sender, FALSE, style_params_name);
str_sender+=" ";
//append user name
{
LLStyle::Params style_params_name;
LLColor4 userNameColor = LLUIColorTable::instance().getColor("ChatToastAgentNameColor");
style_params_name.color(userNameColor);
std::string font_name = LLFontGL::nameFromFont(messageFont);
std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
style_params_name.font.name(font_name);
style_params_name.font.size(font_style_size);
msg_text->appendText(str_sender, FALSE, style_params_name);
}
}
//append text

10
indra/newview/llnearbychathandler.cpp
View File

@ -180,11 +180,6 @@ void LLNearbyChatScreenChannel::addNotification(LLSD& notification)
if(panel && panel->messageID() == fromID && panel->canAddText())
{
if (CHAT_STYLE_IRC == notification["chat_style"].asInteger())
{
notification["message"] = notification["from"].asString() + notification["message"].asString();
}
panel->addMessage(notification);
toast->reshapeToPanel();
toast->resetTimer();
@ -349,7 +344,10 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
// Handle irc styled messages for toast panel
if (tmp_chat.mChatStyle == CHAT_STYLE_IRC)
{
tmp_chat.mText = tmp_chat.mText.substr(3);
if(!tmp_chat.mFromName.empty())
tmp_chat.mText = tmp_chat.mFromName + tmp_chat.mText.substr(3);
else
tmp_chat.mText = tmp_chat.mText.substr(3);
}
// arrange a channel on a screen