diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-09 17:24:47 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-09 17:24:47 -0800 |
| commit | 04e84eb826e0f2ea2a8c222d705afc945d3340dc (patch) | |
| tree | 22ddb166dd5ae1b78d64ff08bff856655b8946d2 /indra/newview/llviewermessage.cpp | |
| parent | ff1dab1792f8d8ba6681e59978383304e25dabe2 (diff) | |
| parent | 1786a7150e754ea10dfd5172ec2491dd67e83a9a (diff) | |
Pull merge from viewer-chui
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 47249fad70..56c9f81259 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2941,9 +2941,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } else { - // TODO: after LLTrans hits release, get "busy response" into translatable file - buffer = llformat("%s (%s): %s", name.c_str(), "busy response", message.c_str()); - gIMMgr->addMessage(session_id, from_id, name, buffer); + gIMMgr->addMessage(session_id, from_id, name, message); } break; |