diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index e5878a9a24..d549f372e3 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1265,19 +1265,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL name_params.color(name_color); name_params.readonly_color(name_color); -<<<<<<< variant A auto [message, is_lua] = LLStringUtil::withoutPrefix(chat.mText, LUA_PREFIX); std::string prefix = message.substr(0, 4); ->>>>>>> variant B - bool is_lua = LLStringUtil::startsWith(chat.mText, LUA_PREFIX); - - std::string message = remove_LUA_PREFIX(chat.mText, is_lua); - std::string prefix = message.substr(0, 4); - -####### Ancestor - bool is_lua = (chat.mText.substr(0, LUA_PREFIX.size()) == LUA_PREFIX); - std::string prefix = chat.mText.substr(is_lua ? LUA_PREFIX.size() : 0, 4); -======= end //IRC styled /me messages. bool irc_me = prefix == "/me " || prefix == "/me'"; diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index 6a9dccf2f4..cda71f97d4 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -614,11 +614,7 @@ 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; |