diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 12:57:03 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 12:57:03 -0800 |
| commit | 705e31f16ad2e9b530bc083db13d29cbc8613f82 (patch) | |
| tree | bbf7a443c649f4561e7f70a787b83e6555afe0d0 /indra/newview/llvoiceclient.cpp | |
| parent | cd5cd11ccbd1ad13afd43c045735f01dbc994a80 (diff) | |
| parent | 85c97cab02b0f2ba89b7af05c14a69ff90ffa25e (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 30f00f04af..51a75b5825 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -70,7 +70,6 @@ #include "llvoicechannel.h" #include "llfloaterfriends.h" //VIVOX, inorder to refresh communicate panel -#include "llfloaterchat.h" // for LLFloaterChat::addChat() // for base64 decoding #include "apr_base64.h" @@ -4709,10 +4708,6 @@ void LLVoiceClient::messageEvent( LLUUID::null, // default arg LLVector3::zero, // default arg true); // prepend name and make it a link to the user's profile - - chat.mText = std::string("IM: ") + session->mName + std::string(": ") + message; - // If the chat should come in quietly (i.e. we're in busy mode), pretend it's from a local agent. - LLFloaterChat::addChat( chat, TRUE, quiet_chat ); } } } |