diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:29:26 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-01-06 14:29:26 -0500 |
| commit | 657cbc3b74f0005290faf852e97d697296374566 (patch) | |
| tree | c37c60962641816531e3d735a79df60b5b067e9b /indra/newview/llviewermessage.cpp | |
| parent | 0f89155e295f632187704999d8ecc01f464a88d8 (diff) | |
| parent | af61dd45b3afe8b62dceeb55a2ded7a9cfa34117 (diff) | |
Merge previously-unmerged product-engine commit
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6f9e551649..3362142807 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2644,9 +2644,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) LLNotificationsUI::LLNotificationManager::instance().onChat( chat, LLNotificationsUI::NT_NEARBYCHAT); - // adding temporarily so that communications window chat bar - // works until the new chat window is ready - chat.mText = from_name + ": " + chat.mText; LLFloaterChat::addChat(chat, FALSE, FALSE); } else |