diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
| commit | 04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch) | |
| tree | b0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/newview/llvoiceclient.cpp | |
| parent | aaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff) | |
| parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) | |
merge.
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" |