summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-24 11:12:11 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-24 11:12:11 -0400
commit9d9ecb2462e559057a2fc226bd6e7c90f5eb6c61 (patch)
tree2e31025a7b9299e473e80599d96ab5ec1c5f6739 /indra/newview/llviewermessage.cpp
parente2f179b9edebca1557ce3f774781bb9b9350b781 (diff)
parent30da8853c88e755ac5c0836f3952d16d501d3502 (diff)
Merge branch 'release/luau-scripting' into lua-timers
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5399301218..01d4695eda 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2600,8 +2600,11 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
BOOL ircstyle = FALSE;
+ auto [message, is_script] = LLStringUtil::withoutPrefix(mesg, LUA_PREFIX);
+ chat.mIsScript = is_script;
+
// Look for IRC-style emotes here so chatbubbles work
- std::string prefix = mesg.substr(0, 4);
+ std::string prefix = message.substr(0, 4);
if (prefix == "/me " || prefix == "/me'")
{
ircstyle = TRUE;