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

FIRE-1949: Echo Autoresponse text into my copy of the IM

meow-7.2.2
Ansariel 2016-02-04 12:11:49 +01:00
parent d58d2e2c20
commit cca57df6f2
8 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llimview.cpp
View File

@ -4052,6 +4052,10 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
{
response = gSavedPerAccountSettings.getString("FSAwayAvatarResponse");
}
else
{
LL_WARNS() << "Unknown auto-response mode" << LL_ENDL;
}
pack_instant_message(
gMessageSystem,
gAgent.getID(),
@ -4065,11 +4069,14 @@ void LLIMMgr::processIMTypingCore(const LLIMInfo* im_info, BOOL typing)
session_id);
gAgent.sendReliableMessage();
LLStringUtil::format_map_t args;
args["MESSAGE"] = response;
gIMMgr->addMessage(
session_id,
gAgentID,
LLStringUtil::null, // Pass null value so no name gets prepended
LLTrans::getString("IM_autoresponse_sent"),
LLTrans::getString("IM_autoresponse_sent", args),
false,
im_info->mName,
IM_NOTHING_SPECIAL,

11
indra/newview/llviewermessage.cpp
View File

@ -2960,6 +2960,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// <FS:Ansariel> Old "do not disturb" message behavior: only send once if session not open
// Session id will be null if avatar answers from offline IM via email
std::string response;
if (!gIMMgr->hasSession(session_id) && session_id.notNull())
{
// </FS:Ansariel>
@ -2967,7 +2968,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
has_session = false;
// <FS:Ansariel> FS autoresponse feature
std::string my_name;
std::string response;
LLAgentUI::buildFullname(my_name);
if (is_do_not_disturb)
{
@ -2987,6 +2987,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
response = gSavedPerAccountSettings.getString("FSAwayAvatarResponse");
}
// </FS:PP>
else
{
LL_WARNS() << "Unknown auto-response mode" << LL_ENDL;
}
pack_instant_message(
gMessageSystem,
gAgent.getID(),
@ -3056,11 +3060,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
if (!has_session)
{
// <FS:LO> Fire-5389 - "Autoresponse Sent" message added to Firestorm as was in Phoenix
LLStringUtil::format_map_t args;
args["MESSAGE"] = response;
gIMMgr->addMessage(
session_id,
gAgentID,
LLStringUtil::null, // Pass null value so no name gets prepended
LLTrans::getString("IM_autoresponse_sent"),
LLTrans::getString("IM_autoresponse_sent", args),
false,
name,
IM_NOTHING_SPECIAL,

2
indra/newview/skins/default/xui/de/strings.xml
View File

@ -4495,7 +4495,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
Ankommende Instant Message von [NAME]
</string>
<string name="IM_autoresponse_sent">
Automatische Antwort gesendet.
Automatische Antwort gesendet: [MESSAGE]
</string>
<string name="IM_autoresponse_item_sent">
Objekt für automatische Antwort gesendet: [ITEM_NAME]

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2011,7 +2011,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<!-- Additional IM messages -->
<string name="IM_announce_incoming">Incoming message from [NAME]</string>
<string name="IM_autoresponse_sent">Autoresponse sent</string>
<string name="IM_autoresponse_sent">Autoresponse sent: [MESSAGE]</string>
<string name="IM_autoresponse_item_sent">Sent auto-response item: [ITEM_NAME]</string>
<!-- voice calls -->

2
indra/newview/skins/default/xui/es/strings.xml
View File

@ -4323,7 +4323,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
Mensaje entrante de [NAME]
</string>
<string name="IM_autoresponse_sent">
Autorrespuesta enviada
Autorrespuesta enviada: [MESSAGE]
</string>
<string name="answered_call">
Han respondido a tu llamada

2
indra/newview/skins/default/xui/fr/strings.xml
View File

@ -1644,7 +1644,7 @@ Extensions autorisées : .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="OnlineStatus">connecté</string>
<string name="OfflineStatus">déconnecté</string>
<string name="IM_announce_incoming">Incoming message from [NAME]</string>
<string name="IM_autoresponse_sent">Autoresponse sent</string>
<string name="IM_autoresponse_sent">Autoresponse sent: [MESSAGE]</string>
<string name="IM_autoresponse_item_sent">Sent auto-response item: [ITEM_NAME]</string>
<string name="answered_call">Your call has been answered</string>
<string name="you_started_call">You started a voice call</string>

2
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -4331,7 +4331,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
Nadchodzi wiadomość od [NAME]
</string>
<string name="IM_autoresponse_sent">
Autoodpowiedź wysłana
Autoodpowiedź wysłana: [MESSAGE]
</string>
<string name="IM_autoresponse_item_sent">
Wysłano przedmiot: [ITEM_NAME]

2
indra/newview/skins/default/xui/ru/strings.xml
View File

@ -4506,7 +4506,7 @@ support@secondlife.com.
Входящее сообщение от [NAME]
</string>
<string name="IM_autoresponse_sent">
Автоответ отправлен
Автоответ отправлен: [MESSAGE]
</string>
<string name="IM_autoresponse_item_sent">
Элемент [ITEM_NAME] отправлен автоответом