diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:33:29 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:33:29 -0700 |
| commit | d6a2c5965e6b0b07014e8fc2dbb16edc463e0566 (patch) | |
| tree | 879d891f1c6a743529d7683db3d322541e5d39f5 /indra/newview/llvoiceclient.cpp | |
| parent | 5db497e398d537a7f3b23c50336e2825006e0907 (diff) | |
| parent | 437449044583d50c8cad694e65e5a4a23a55d768 (diff) | |
merge from remote repo
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() |