From 032675b5dd3306b523d9fdc3795e82edf6271561 Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Thu, 3 Dec 2009 13:28:55 +0200 Subject: 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 --- indra/newview/llnearbychathandler.cpp | 10 +++++++--- 1 file 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("nearby_chat", LLSD()); -- cgit v1.2.3