Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into curlthreading

Browse Source 
Conflicts:
	indra/newview/viewer_manifest.py
This commit is contained in:
Siana Gearz
2012-07-20 00:37:58 +02:00
parent 3d39564605 a8a30ae3b9
commit 8802d5033f
553 changed files with 44979 additions and 14653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerparcelmedia.cpp
View File

@@ -54,6 +54,7 @@
#include "llaudioengine.h"
#include "lloverlaybar.h"
#include "slfloatermediafilter.h"
#include "llstreamingaudio.h"
// Static Variables
@@ -661,6 +662,9 @@ void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
else if (gAudiop)
{
LLStringUtil::trim(music_url);
LLStreamingAudioInterface *stream = gAudiop->getStreamingAudioImpl();
if(stream && stream->supportsAdjustableBufferSizes())
stream->setBufferSizes(gSavedSettings.getU32("SHFMODExStreamBufferSize"),gSavedSettings.getU32("SHFMODExDecodeBufferSize"));
gAudiop->startInternetStream(music_url);
if (music_url.empty())
{