Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 17 insertions, 17 deletions

diff --git a/indra/llaudio/llstreamingaudio.h b/indra/llaudio/llstreamingaudio.h
index 93479f9d59..3a024d8db8 100644
--- a/indra/llaudio/llstreamingaudio.h
+++ b/indra/llaudio/llstreamingaudio.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file streamingaudio.h
  * @author Tofu Linden
  * @brief Definition of LLStreamingAudioInterface base class abstracting the streaming audio interface
@@ -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$
  */
@@ -34,19 +34,19 @@
 class LLStreamingAudioInterface
 {
  public:
-	virtual ~LLStreamingAudioInterface() {}
+    virtual ~LLStreamingAudioInterface() {}
 
-	virtual void start(const std::string& url) = 0;
-	virtual void stop() = 0;
-	virtual void pause(int pause) = 0;
-	virtual void update() = 0;
-	virtual int isPlaying() = 0;
-	// use a value from 0.0 to 1.0, inclusive
-	virtual void setGain(F32 vol) = 0;
-	virtual F32 getGain() = 0;
-	virtual std::string getURL() = 0;
-	virtual bool supportsAdjustableBufferSizes(){return false;}
-	virtual void setBufferSizes(U32 streambuffertime, U32 decodebuffertime){};
+    virtual void start(const std::string& url) = 0;
+    virtual void stop() = 0;
+    virtual void pause(int pause) = 0;
+    virtual void update() = 0;
+    virtual int isPlaying() = 0;
+    // use a value from 0.0 to 1.0, inclusive
+    virtual void setGain(F32 vol) = 0;
+    virtual F32 getGain() = 0;
+    virtual std::string getURL() = 0;
+    virtual bool supportsAdjustableBufferSizes(){return false;}
+    virtual void setBufferSizes(U32 streambuffertime, U32 decodebuffertime){};
 };
 
 #endif // LL_STREAMINGAUDIO_H