summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-09-04 09:20:33 +0300
committermberezhnoy <mberezhnoy@productengine.com>2013-09-04 09:20:33 +0300
commita0244eb6f9b4b9de5c7831f770ac508f9c0f378a (patch)
tree5feaa1a721c3ae86ca393dbe6d6860864d7665dd /indra/newview
parentf37023a060fcf3d4b094028bf6244c1dc749aa1a (diff)
MAINT-3073 ([CHUIBUG](You) feature is irritating, especially for emotes)
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llchathistory.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index af3c6eff11..43a733f918 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -898,20 +898,10 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
LLStyle::Params link_params(body_message_params);
link_params.overwriteFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
- if (from_me)
- { std::string localized_name;
- bool is_localized = LLTrans::findString(localized_name, "AgentNameSubst");
- mEditor->appendText((is_localized? localized_name:"(You)") + delimiter,
- prependNewLineState, link_params);
- prependNewLineState = false;
- }
- else
- {
// Add link to avatar's inspector and delimiter to message.
- mEditor->appendText(std::string(link_params.link_href) + delimiter,
- prependNewLineState, link_params);
- prependNewLineState = false;
- }
+ mEditor->appendText(std::string(link_params.link_href) + delimiter,
+ prependNewLineState, link_params);
+ prependNewLineState = false;
}
else
{