Merge branch 'master' into future

2012-07-20 12:12:07 -05:00
parent 9642780bb8 4e4d554ea4
commit 95abf3dca3
1 changed files with 0 additions and 1 deletions
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -172,7 +172,6 @@ void LLStreamingAudio_FMODEX::update()

 	if(mFMODInternetStreamChannelp)
 	{
-		llinfos << "progress = " << progress << llendl;
 		if(!mMetaData)
 			mMetaData = new LLSD;