1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index cda71f97d4..6a9dccf2f4 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -614,7 +614,11 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
         }
         else
         {
+<<<<<<< HEAD
             toast_msg = msg_text;
+=======
+            toast_msg = remove_LUA_PREFIX(chat_msg.mText, chat_msg.mIsScript);
+>>>>>>> release/luau-scripting
         }
 
         bool chat_overlaps = false;