summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia_streamingaudio.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-03-02 21:41:37 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-03-02 21:41:37 +0200
commit135d54a4ff46c7e3230b8baeedaee886cb2f11c4 (patch)
tree4f55540281efcc3007d73ff95e6e19aa7ba2390c /indra/newview/llviewermedia_streamingaudio.cpp
parent4add069cae879a626c284ea13aeb1b42b3ca5dfc (diff)
parent2b385841f3031d599bdb226f0f859e51b09870f8 (diff)
Merge branch 'master' into DRTVWR-516-maint
Diffstat (limited to 'indra/newview/llviewermedia_streamingaudio.cpp')
-rw-r--r--indra/newview/llviewermedia_streamingaudio.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp
index 3ccf3070ab..d3e24aece5 100644
--- a/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/indra/newview/llviewermedia_streamingaudio.cpp
@@ -33,10 +33,8 @@
#include "llviewermedia_streamingaudio.h"
#include "llmimetypes.h"
-#include "llvfs.h"
#include "lldir.h"
-
LLStreamingAudio_MediaPlugins::LLStreamingAudio_MediaPlugins() :
mMediaPlugin(NULL),
mGain(1.0)