Merge branch release/luau-scripting

1 files changed, 3 insertions, 2 deletions

diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 2b875c708d..0561d56fe1 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -187,6 +187,7 @@ void LLFloaterIMNearbyChatToastPanel::init(LLSD& notification)
 
     int sType = notification["source"].asInteger();
     mSourceType = (EChatSourceType)sType;
+    mIsFromScript = notification["is_lua"].asBoolean();
 
     std::string color_name = notification["text_color"].asString();
 
@@ -214,7 +215,7 @@ void LLFloaterIMNearbyChatToastPanel::init(LLSD& notification)
     {
         std::string str_sender;
 
-        str_sender = fromName;
+        str_sender = mIsFromScript ? LLTrans::getString("ScriptBy") + fromName : fromName;
 
         str_sender+=" ";
 
@@ -401,7 +402,7 @@ void LLFloaterIMNearbyChatToastPanel::draw()
             else if(mSourceType == CHAT_SOURCE_SYSTEM)
                 icon->setValue(LLSD("SL_Logo"));
             else if(mSourceType == CHAT_SOURCE_AGENT)
-                icon->setValue(mFromID);
+                icon->setValue(mIsFromScript ? LLSD("Inv_Script") : LLSD(mFromID));
             else if(!mFromID.isNull())
                 icon->setValue(mFromID);
         }