Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/newview/llviewermedia_streamingaudio.h b/indra/newview/llviewermedia_streamingaudio.h
index 1e7f771e17..bf4d92c29e 100644
--- a/indra/newview/llviewermedia_streamingaudio.h
+++ b/indra/newview/llviewermedia_streamingaudio.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llviewermedia_streamingaudio.h
  * @author Tofu Linden
  * @brief Definition of LLStreamingAudio_MediaPlugins implementation - an implementation of the streaming audio interface which is implemented as a client of the media plugins API.
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2009&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -38,25 +38,25 @@ class LLPluginClassMedia;
 class LLStreamingAudio_MediaPlugins : public LLStreamingAudioInterface
 {
  public:
-	LLStreamingAudio_MediaPlugins();
-	/*virtual*/ ~LLStreamingAudio_MediaPlugins();
-
-	/*virtual*/ void start(const std::string& url);
-	/*virtual*/ void stop();
-	/*virtual*/ void pause(int pause);
-	/*virtual*/ void update();
-	/*virtual*/ int isPlaying();
-	/*virtual*/ void setGain(F32 vol);
-	/*virtual*/ F32 getGain();
-	/*virtual*/ std::string getURL();
+    LLStreamingAudio_MediaPlugins();
+    /*virtual*/ ~LLStreamingAudio_MediaPlugins();
+
+    /*virtual*/ void start(const std::string& url);
+    /*virtual*/ void stop();
+    /*virtual*/ void pause(int pause);
+    /*virtual*/ void update();
+    /*virtual*/ int isPlaying();
+    /*virtual*/ void setGain(F32 vol);
+    /*virtual*/ F32 getGain();
+    /*virtual*/ std::string getURL();
 
 private:
-	LLPluginClassMedia* initializeMedia(const std::string& media_type);
+    LLPluginClassMedia* initializeMedia(const std::string& media_type);
 
-	LLPluginClassMedia *mMediaPlugin;
+    LLPluginClassMedia *mMediaPlugin;
 
-	std::string mURL;
-	F32 mGain;
+    std::string mURL;
+    F32 mGain;
 };