Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update instant message stuff

Browse Source 
Fixes auto response chats not showing the name, anymore; switches to using 25% more font color transparency to indicate autoresponse
Cleans up and reorganizes im codestuffs~
This commit is contained in:
Inusaito Sayori
2014-12-27 10:20:57 -05:00
parent a805d15797
commit f26d7c7bf2
3 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
indra/newview/llimpanel.cpp
View File

@@ -703,38 +703,38 @@ bool LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incolor, bool log_to_file, const LLUUID& source, const std::string& name) void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incolor, bool log_to_file, const LLUUID& source, const std::string& name)
{ {
static const LLCachedControl<bool> mKeywordsChangeColor(gSavedPerAccountSettings, "KeywordsChangeColor", false); bool is_agent(gAgentID == source), from_user(source.notNull());
static const LLCachedControl<LLColor4> mKeywordsColor(gSavedPerAccountSettings, "KeywordsColor", LLColor4(1.f, 1.f, 1.f, 1.f)); if (!is_agent)
if (gAgentID != source)
{ {
static const LLCachedControl<bool> mKeywordsChangeColor(gSavedPerAccountSettings, "KeywordsChangeColor", false);
if (mKeywordsChangeColor) if (mKeywordsChangeColor)
{ {
if (AscentKeyword::hasKeyword(utf8msg, 2)) if (AscentKeyword::hasKeyword(utf8msg, 2))
{ {
static const LLCachedControl<LLColor4> mKeywordsColor(gSavedPerAccountSettings, "KeywordsColor", LLColor4(1.f, 1.f, 1.f, 1.f));
incolor = mKeywordsColor; incolor = mKeywordsColor;
} }
} }
if (mDing && (!hasFocus() || !gFocusMgr.getAppHasFocus())) bool focused(hasFocus());
if (mDing && (!focused || !gFocusMgr.getAppHasFocus()))
{ {
static const LLCachedControl<std::string> ding("LiruNewMessageSound"); static const LLCachedControl<std::string> ding("LiruNewMessageSound");
static const LLCachedControl<std::string> dong("LiruNewMessageSoundForSystemMessages"); static const LLCachedControl<std::string> dong("LiruNewMessageSoundForSystemMessages");
LLUI::sAudioCallback(LLUUID(source.notNull() ? ding : dong)); LLUI::sAudioCallback(LLUUID(from_user ? ding : dong));
} }
}
const LLColor4& color = incolor; // start tab flashing when receiving im for background session from user
// start tab flashing when receiving im for background session from user if (from_user)
if (source.notNull())
{
LLMultiFloater* hostp = getHost();
if( !isInVisibleChain()
&& hostp
&& source != gAgentID)
{ {
hostp->setFloaterFlashing(this, TRUE); bool invisible(!isInVisibleChain());
LLMultiFloater* host = getHost();
if (invisible && host)
host->setFloaterFlashing(this, true);
if (invisible || (!host && focused))
++mNumUnreadMessages;
} }
} }
// Now we're adding the actual line of text, so erase the // Now we're adding the actual line of text, so erase the
@@ -758,14 +758,14 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
// Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text. // Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text.
if (name == SYSTEM_FROM) if (name == SYSTEM_FROM)
{ {
mHistoryEditor->appendColoredText(name,false,prepend_newline,color); mHistoryEditor->appendColoredText(name,false,prepend_newline,incolor);
} }
else else
{ {
// IRC style text starts with a colon here; empty names and system messages aren't irc style. // IRC style text starts with a colon here; empty names and system messages aren't irc style.
static const LLCachedControl<bool> italicize("LiruItalicizeActions"); static const LLCachedControl<bool> italicize("LiruItalicizeActions");
is_irc = italicize && utf8msg[0] != ':'; is_irc = italicize && utf8msg[0] != ':';
if (source.notNull()) if (from_user)
LLAvatarNameCache::getNSName(source, show_name); LLAvatarNameCache::getNSName(source, show_name);
// Convert the name to a hotlink and add to message. // Convert the name to a hotlink and add to message.
LLStyleSP source_style = LLStyleMap::instance().lookupAgent(source); LLStyleSP source_style = LLStyleMap::instance().lookupAgent(source);
@@ -778,9 +778,9 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
// Append the chat message in style // Append the chat message in style
{ {
LLStyleSP style(new LLStyle); LLStyleSP style(new LLStyle);
style->setColor(color); style->setColor(incolor);
style->mItalic = is_irc; style->mItalic = is_irc;
style->mBold = gSavedSettings.getBOOL("SingularityBoldGroupModerator") && isModerator(source); style->mBold = from_user && gSavedSettings.getBOOL("SingularityBoldGroupModerator") && isModerator(source);
mHistoryEditor->appendStyledText(utf8msg, false, prepend_newline, style); mHistoryEditor->appendStyledText(utf8msg, false, prepend_newline, style);
} }
@@ -801,13 +801,8 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
// [/Ansariel: Display name support] // [/Ansariel: Display name support]
} }
if (source.notNull()) if (from_user)
{ {
if (!isInVisibleChain() || (!hasFocus() && getParent() == gFloaterView))
{
mNumUnreadMessages++;
}
mSpeakers->speakerChatted(source); mSpeakers->speakerChatted(source);
mSpeakers->setSpeakerTyping(source, FALSE); mSpeakers->setSpeakerTyping(source, FALSE);
} }

8
indra/newview/llimview.cpp
View File

@@ -480,7 +480,13 @@ void LLIMMgr::addMessage(
} }
// now add message to floater // now add message to floater
const LLColor4& color = agent_chat_color(other_participant_id, from, false); LLColor4 color = agent_chat_color(other_participant_id, from, false);
if (dialog == IM_BUSY_AUTO_RESPONSE)
{
color *= .75f;
color += LLColor4::transparent*.25f;
}
if ( !link_name ) if ( !link_name )
{ {
floater->addHistoryLine(msg,color); // No name to prepend, so just add the message normally floater->addHistoryLine(msg,color); // No name to prepend, so just add the message normally

2
indra/newview/llviewermessage.cpp
View File

@@ -3124,7 +3124,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
} }
else else
{ {
gIMMgr->addMessage(session_id, from_id, name, message); gIMMgr->addMessage(session_id, from_id, name, separator_string + message.substr(message_offset), name, dialog, parent_estate_id, region_id, position, true);
} }
break; break;