diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
| commit | e2612effbe463cd89853d3d6a047b3aa7e275975 (patch) | |
| tree | 148fb7fb1bdbf84c148d8ccb6496a6fba7ef9afb /indra/newview/llvoiceclient.cpp | |
| parent | 5a34cf1af83314774f11b0d24279794794bc9147 (diff) | |
| parent | fab60b8c05a89498bd8efeafdea8acfa5f94f06c (diff) | |
merge from viewer2
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index a0d42d9b5f..560c2ab469 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -72,8 +72,6 @@ #include "llvoavatarself.h" #include "llvoicechannel.h" -#include "llfloaterfriends.h" //VIVOX, inorder to refresh communicate panel - // for base64 decoding #include "apr_base64.h" |