diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-05-08 22:23:20 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-05-08 22:23:20 +0000 |
| commit | 1bad68eb4b7d712b02cbd4b74639fcf265983c8d (patch) | |
| tree | a292dbb5bf0d2f18938f3cfc732debc53986787d /indra/newview | |
| parent | 63e7894148fdc7064b422bf65a0b75ffcf293496 (diff) | |
svn merge -r 86553:86607 svn+ssh://svn.lindenlab.com/svn/linden/branches/secure-im --> release
QAR-564 - constrained fix for SEC-71
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e09af2ea45..577e76b957 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1959,6 +1959,8 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id) { if (gAgent.getBusy()) { + std::string my_name; + gAgent.buildFullname(my_name); LLString response = gSavedPerAccountSettings.getText("BusyModeResponse"); pack_instant_message( gMessageSystem, @@ -1966,10 +1968,10 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id) FALSE, gAgent.getSessionID(), from_id, - SYSTEM_FROM, + my_name.c_str(), response.c_str(), IM_ONLINE, - IM_CONSOLE_AND_CHAT_HISTORY); + IM_BUSY_AUTO_RESPONSE); gAgent.sendReliableMessage(); } } |