diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-03 13:28:55 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-03 13:28:55 +0200 |
| commit | 032675b5dd3306b523d9fdc3795e82edf6271561 (patch) | |
| tree | e9565b120e79f0245b640d90eee051c9a8895098 | |
| parent | 62feea50c2f430f65ad7ab16cfa5e66b2b2e2b63 (diff) | |
a bit more for (EXT-3077) [BSI] Object chat of objects without a name bork nearby chat toasts and log
revert name changes since this may break some functionality...
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 04e206fb99..281d76bef3 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -352,12 +352,16 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg) if (tmp_chat.mChatStyle == CHAT_STYLE_IRC) { - tmp_chat.mText = tmp_chat.mFromName + " " + tmp_chat.mText.substr(3); + if(!tmp_chat.mFromName.empty()) + tmp_chat.mText = tmp_chat.mFromName + " " + tmp_chat.mText.substr(3); + else + tmp_chat.mText = tmp_chat.mText.substr(3); } { - if(tmp_chat.mFromName.empty() && tmp_chat.mFromID!= LLUUID::null) - tmp_chat.mFromName = tmp_chat.mFromID.asString(); + //sometimes its usefull to have no name at all... + //if(tmp_chat.mFromName.empty() && tmp_chat.mFromID!= LLUUID::null) + // tmp_chat.mFromName = tmp_chat.mFromID.asString(); } LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); |