diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:38:19 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:38:19 -0800 |
| commit | 35bb14951f686da538264db349f4bfbe045b8c82 (patch) | |
| tree | 31d37e3e67863aba03b2c6aef5abc5629a784e65 /indra/newview/llviewermessage.cpp | |
| parent | 95f14d73138a4f0eb9163fdc560a0dcad9564c4c (diff) | |
| parent | e28eac929b8d26d133be5c1953cfdd0b7d0eb9e5 (diff) | |
Merge
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 |