diff options
Diffstat (limited to 'indra/newview/llfloaterimnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
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; |