diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 01:34:52 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 01:34:52 -0800 |
| commit | c6163fafaac9c72683b11894ed309d1f55a745c8 (patch) | |
| tree | 612be60185cbea598bdf907f045c9fc29fb40a2c /indra/newview/llvoicevivox.cpp | |
| parent | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (diff) | |
| parent | 82de841c52357642d30b6d89b11da079f9c0f5d1 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 7baa0dda65..9f1fe0c11f 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -63,7 +63,6 @@ #include "llviewercamera.h" #include "llfloaterfriends.h" //VIVOX, inorder to refresh communicate panel -#include "llfloaterchat.h" // for LLFloaterChat::addChat() #include "llviewernetwork.h" #include "llnotificationsutil.h" @@ -3905,9 +3904,6 @@ void LLVivoxVoiceClient::messageEvent( 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 ); } } } |