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

Fix Beware's issue with SinguReplaceLinks being partially broken recently

Browse Source
This commit is contained in:
Liru Færs
2019-11-06 06:42:13 -05:00
parent 79bafbb943
commit cfa2c4e424
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterchat.cpp
View File

@@ -225,12 +225,13 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
style->setColor(color); style->setColor(color);
style->mItalic = is_irc; style->mItalic = is_irc;
style->mBold = chat.mChatType == CHAT_TYPE_SHOUT; style->mBold = chat.mChatType == CHAT_TYPE_SHOUT;
edit->appendText(line, false, prepend_newline, style, false); edit->appendText(line, false, prepend_newline, style, chat.mSourceType == CHAT_SOURCE_SYSTEM);
} }
void LLFloaterChat::addChatHistory(const std::string& str, bool log_to_file) void LLFloaterChat::addChatHistory(const std::string& str, bool log_to_file)
{ {
LLChat chat(str); LLChat chat(str);
chat.mSourceType = CHAT_SOURCE_SYSTEM;
addChatHistory(chat, log_to_file); addChatHistory(chat, log_to_file);
} }
@@ -344,6 +345,7 @@ void LLFloaterChat::onClickToggleShowMute(bool show_mute, LLTextEditor* history_
void LLFloaterChat::addChat(const std::string& str, BOOL from_im, BOOL local_agent) void LLFloaterChat::addChat(const std::string& str, BOOL from_im, BOOL local_agent)
{ {
LLChat chat(str); LLChat chat(str);
chat.mSourceType = CHAT_SOURCE_SYSTEM;
addChat(chat, from_im, local_agent); addChat(chat, from_im, local_agent);
} }

2
indra/newview/llviewermessage.cpp
View File

@@ -1419,6 +1419,8 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
return false; return false;
} }
chat.mSourceType = CHAT_SOURCE_SYSTEM; // There's a slim potential of a user-editable field being a url here?
LLViewerInventoryCategory* catp = NULL; LLViewerInventoryCategory* catp = NULL;
catp = gInventory.getCategory(mObjectID); catp = gInventory.getCategory(mObjectID);
LLViewerInventoryItem* itemp = NULL; LLViewerInventoryItem* itemp = NULL;