diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-08 11:56:14 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-08 11:56:14 +0300 |
| commit | 9a13f4270b502036de01be531b17ba3a0e82e548 (patch) | |
| tree | a5093509b9aa2ca5841cb314f3a37b81f6de0759 /indra | |
| parent | a2bd04ca244f55fe807c9e9d74311580f12e6d0f (diff) | |
MAINT-14 FIXED Treat region message like a system message, but also show sender name.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llchathistory.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index b81b95462e..df6fe99fdb 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -376,6 +376,10 @@ public: || mSourceType == CHAT_SOURCE_SYSTEM) { mFrom = LLTrans::getString("SECOND_LIFE"); + if(!chat.mFromName.empty()) + { + mFrom += " (" + chat.mFromName + ")"; + } user_name->setValue(mFrom); updateMinUserNameWidth(); } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f5350a0b30..3f22dc9b59 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2347,7 +2347,8 @@ static void god_message_name_cb(const LLAvatarName& av_name, LLChat chat, std::s LLNotificationsUtil::add("GodMessage", args); // Treat like a system message and put in chat history. - chat.mText = av_name.getCompleteName() + ": " + message; + chat.mSourceType = CHAT_SOURCE_SYSTEM; + chat.mText = message; LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"); if (nearby_chat) |