diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-24 10:08:35 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-24 10:08:35 -0400 |
| commit | f700ec2e8b16eea8eded72839857c70a081fe478 (patch) | |
| tree | 2959f8f27b5e0cc13b02b373cf5849a13392e84c /indra/newview/llfloaterimnearbychathandler.cpp | |
| parent | b0ef843fe0702482e843379b4975b2dda4d58935 (diff) | |
| parent | 66a8b0ebb7fc1e6acdb0028f7ca8547153e10062 (diff) | |
Merge branch 'release/luau-scripting' into lua-chatplus
Diffstat (limited to 'indra/newview/llfloaterimnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 4 |
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; |