diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-24 16:30:10 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-24 16:30:10 +0200 |
commit | ed802c19ce958849eeabc1d125e684fb8a0a4caa (patch) | |
tree | 01ba4cac397e7976cc75ac3c089fb4e44296fda4 /indra/newview/llviewermessage.cpp | |
parent | a1528c45594e5fc57eb956c853126f9d9f3fc387 (diff) | |
parent | b518a3a5f0d13a6dedfcd60918369076b48f5ece (diff) |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 737f7a224d..72e3c27bc9 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2526,14 +2526,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) |