diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-24 16:36:14 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-24 16:36:14 +0200 |
| commit | 9c90822c9d5409f267c5d457489a6fd295dabd2a (patch) | |
| tree | e1e3d01b559727b62382afb25edfa6e541c73f2a /indra/newview/llviewermessage.cpp | |
| parent | 2c7e5b91001a981809803adbe8490c756ab8bfc6 (diff) | |
| parent | ed29d709c8aa308fca8bf84c84b02157f86c66c1 (diff) | |
merge
--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) |