diff options
| author | angela <angela@lindenlab.com> | 2009-10-29 18:07:46 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-29 18:07:46 +0800 |
| commit | 53d48741b8b595665d3f9a7f717bd9f8fa3f7601 (patch) | |
| tree | 7abafe6164e10a5295514e69c8f26ad8bc40f62c /indra/newview/llvoiceclient.cpp | |
| parent | 07749af3871420b9f4542e288da4372cdf2d2513 (diff) | |
| parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 02f63a848b..2834284a9b 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -57,13 +57,13 @@ #include "llagent.h" #include "llcachename.h" #include "llimview.h" // for LLIMMgr -#include "llimpanel.h" // for LLVoiceChannel #include "llparcel.h" #include "llviewerparcelmgr.h" #include "llfirstuse.h" #include "llviewerwindow.h" #include "llviewercamera.h" #include "llvoavatarself.h" +#include "llvoicechannel.h" #include "llfloaterfriends.h" //VIVOX, inorder to refresh communicate panel #include "llfloaterchat.h" // for LLFloaterChat::addChat() |