Issue #2907: When passing the injected notification message into addMessage on behalf of the system, optionally specify the agent id and name that should be used.

(cherry picked from commit 7ff297ec3fc5f878cc9a916678987c0033b7eb8a)

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
                 {