diff options
author | Rider Linden <rider@lindenlab.com> | 2024-10-25 16:42:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-25 16:42:42 -0700 |
commit | b573ee45448a70e0f2252e0ed2e41643776c60cc (patch) | |
tree | f87068eb9bd4e75bffc80d492c9e3b1348842b09 /indra/newview/llimprocessing.cpp | |
parent | 927a96688daf1a73deae15c56a7a9c12c42f6a39 (diff) | |
parent | 7ff297ec3fc5f878cc9a916678987c0033b7eb8a (diff) |
Merge pull request #2959 from secondlife/rider/fix_bot_im_session
Fix for IM session name and icon.
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r-- | indra/newview/llimprocessing.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index f5b149335b..e050fb77e0 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -603,12 +603,13 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, } } + std::string real_name; + if (!notice_name.empty()) { // The simulator has injected some sort of notice into the conversation. // findString will only replace the contents of buffer if the notice_id is found. LLTrans::findString(buffer, notice_name, notice_args); - name = SYSTEM_FROM; - from_id = LLUUID::null; + real_name = SYSTEM_FROM; } gIMMgr->addMessage(session_id, @@ -622,8 +623,9 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, region_id, position, region_message, - timestamp); - + timestamp, + LLUUID::null, + real_name); } else { |