summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-01-29 15:58:36 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-01-29 15:58:36 +0200
commitbed3948c4fbeea6d912eb60ab93a24fb7cd7b7b4 (patch)
tree980c9369b5c39e9d2fdc92f8054766b72c58c3a5 /indra/newview/llvoiceclient.cpp
parent10cbb9ea27e8e47a235efece1b30365b7f00e038 (diff)
parentf8bde94b9f9c83202f32268b57539fbe5c7cf271 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 8ca0fd6ef6..02a2d8c8cf 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"