diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-09-30 15:54:20 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-09-30 15:54:20 +0200 |
| commit | ed2d4f02d93459bf114ebeab8727d507b7bfc0ef (patch) | |
| tree | a216907e2c01db7932c83e212319cb7a8c790013 /indra/newview/llviewerchat.cpp | |
| parent | a8d8314cb9af193ea7ce95456fb308217ba28e3c (diff) | |
| parent | a409503653bebacbc498409806f9e1a4b97ed6ac (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/newview/llviewerchat.cpp')
| -rw-r--r-- | indra/newview/llviewerchat.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp index 8b01c4ef88..5daccb6784 100644 --- a/indra/newview/llviewerchat.cpp +++ b/indra/newview/llviewerchat.cpp @@ -30,6 +30,7 @@ // newview includes #include "llagent.h" // gAgent #include "llslurl.h" +#include "lltrans.h" #include "lluicolor.h" #include "lluicolortable.h" #include "llviewercontrol.h" // gSavedSettings @@ -220,8 +221,7 @@ S32 LLViewerChat::getChatFontSize() //static void LLViewerChat::formatChatMsg(const LLChat& chat, std::string& formated_msg) { - std::string tmpmsg = chat.mText; - + std::string tmpmsg = without_LUA_PREFIX(chat.mText, chat.mIsScript); if(chat.mChatStyle == CHAT_STYLE_IRC) { formated_msg = chat.mFromName + tmpmsg.substr(3); @@ -231,6 +231,11 @@ void LLViewerChat::formatChatMsg(const LLChat& chat, std::string& formated_msg) formated_msg = tmpmsg; } + if (chat.mIsScript) + { + formated_msg = LLTrans::getString("ScriptStr") + formated_msg; + } + } //static |