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

Properly pass-through is_announcement parameter for incoming IMs again

meow-7.2.2
Ansariel 2013-07-12 18:50:19 +02:00
parent 2cde6432f9
commit 4a85090d8f
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llimview.cpp
View File

@ -1097,6 +1097,8 @@ void LLIMModel::sendNoUnreadMessages(const LLUUID& session_id)
mNoUnreadMsgsSignal(arg);
}
// <FS:Ansariel> Added is_announcement parameter
//bool LLIMModel::addToHistory(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text) {
bool LLIMModel::addToHistory(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text, BOOL is_announcement /* = FALSE */) {
LLIMSession* session = findIMSession(session_id);
@ -1107,7 +1109,7 @@ bool LLIMModel::addToHistory(const LLUUID& session_id, const std::string& from,
return false;
}
// <Ansariel> Forward IM to nearby chat if wanted
// <FS:Ansariel> Forward IM to nearby chat if wanted
std::string timestr = LLLogChat::timestamp(false);
session->addMessage(from, from_id, utf8_text, timestr); //might want to add date separately
@ -1144,7 +1146,7 @@ bool LLIMModel::addToHistory(const LLUUID& session_id, const std::string& from,
// </FS:Ansariel> [FS communication UI]
nearby_chat->addMessage(chat, true, LLSD());
}
// </Ansariel>
// </FS:Ansariel>
return true;
}
@ -1218,6 +1220,9 @@ bool LLIMModel::proccessOnlineOfflineNotification(
return addMessage(session_id, SYSTEM_FROM, LLUUID::null, utf8_text);
}
// <FS:Ansariel> Added is_announcement parameter
//bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& from_id,
// const std::string& utf8_text, bool log2file /* = true */) {
bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& from_id,
const std::string& utf8_text, bool log2file /* = true */, BOOL is_announcement /* = FALSE */) {
@ -1246,6 +1251,9 @@ bool LLIMModel::addMessage(const LLUUID& session_id, const std::string& from, co
return true;
}
// <FS:Ansariel> Added is_announcement parameter
//LLIMModel::LLIMSession* LLIMModel::addMessageSilently(const LLUUID& session_id, const std::string& from, const LLUUID& from_id,
// const std::string& utf8_text, bool log2file /* = true */)
LLIMModel::LLIMSession* LLIMModel::addMessageSilently(const LLUUID& session_id, const std::string& from, const LLUUID& from_id,
const std::string& utf8_text, bool log2file /* = true */, BOOL is_announcement /* = FALSE */)
{
@ -2890,7 +2898,7 @@ void LLIMMgr::addMessage(
const LLUUID& region_id,
const LLVector3& position,
bool link_name, // If this is true, then we insert the name and link it to a profile
BOOL is_announcement) // Ansariel: Special parameter indicating announcements
BOOL is_announcement) // <FS:Ansariel> Special parameter indicating announcements
{
LLUUID other_participant_id = target_id;
@ -3038,8 +3046,9 @@ void LLIMMgr::addMessage(
if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
{
//LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg, true, is_announcement); <FS:TM> CHUI Merge this got clobbered above
LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
// <FS:Ansariel> Added is_announcement parameter
//LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg, true, is_announcement);
}
// Open conversation floater if offline messages are present

12
indra/newview/llimview.h
View File

@ -225,13 +225,16 @@ public:
* and also saved into a file if log2file is specified.
* It sends new message signal for each added message.
*/
// Ansariel: Added is_announcement parameter
// <FS:Ansariel> Added is_announcement parameter
//bool addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true);
bool addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true, BOOL is_announcement = FALSE);
/**
* Similar to addMessage(...) above but won't send a signal about a new message added
*/
// Ansariel: Added is_announcement parameter
// <FS:Ansariel> Added is_announcement parameter
//LLIMModel::LLIMSession* addMessageSilently(const LLUUID& session_id, const std::string& from, const LLUUID& from_id,
// const std::string& utf8_text, bool log2file = true);
LLIMModel::LLIMSession* addMessageSilently(const LLUUID& session_id, const std::string& from, const LLUUID& from_id,
const std::string& utf8_text, bool log2file = true, BOOL is_announcement = FALSE);
@ -320,7 +323,8 @@ private:
/**
* Add message to a list of message associated with session specified by session_id
*/
// Ansariel: Added is_announcement parameter
// <FS:Ansariel> Added is_announcement parameter
//bool addToHistory(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text);
bool addToHistory(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text, BOOL is_announcement = FALSE);
};
@ -364,7 +368,7 @@ public:
const LLUUID& region_id = LLUUID::null,
const LLVector3& position = LLVector3::zero,
bool link_name = false,
BOOL is_announcement = FALSE // Ansariel: Special parameter indicating announcement
BOOL is_announcement = FALSE // <FS:Ansariel> Special parameter indicating announcement
);
void addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args);