summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-12-23 13:47:05 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2009-12-23 13:47:05 -0800
commit7561bbc87068dfee1283eda757f4cca92c4e5b4c (patch)
treeab29ad4d15421d6ded827f4b56804df2a949eec3 /indra/newview/llviewermessage.cpp
parent6b984521c302067e806e9228cb6abb6c9a58a834 (diff)
DEV-44631 local chat / chat history emote formatting is wrong
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6a31bbfa1e..1676cc782c 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2514,14 +2514,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
std::string prefix = mesg.substr(0, 4);
if (prefix == "/me " || prefix == "/me'")
{
-// chat.mText = from_name;
-// chat.mText += mesg.substr(3);
ircstyle = TRUE;
}
-// else
-// {
- chat.mText = mesg;
-// }
+ chat.mText = mesg;
// Look for the start of typing so we can put "..." in the bubbles.
if (CHAT_TYPE_START == chat.mChatType)