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

Maint X -> Materials Featurette merge

1 files changed, 47 insertions, 47 deletions

diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h
index 562c96c794..9aadc84ddf 100644
--- a/indra/llaudio/llaudioengine_openal.h
+++ b/indra/llaudio/llaudioengine_openal.h
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -36,73 +36,73 @@
 
 class LLAudioEngine_OpenAL : public LLAudioEngine
 {
-	public:
-		LLAudioEngine_OpenAL();
-		virtual ~LLAudioEngine_OpenAL();
+    public:
+        LLAudioEngine_OpenAL();
+        virtual ~LLAudioEngine_OpenAL();
 
         virtual bool init(void *user_data, const std::string &app_title);
         virtual std::string getDriverName(bool verbose);
         virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const { return nullptr; }
-		virtual void allocateListener();
+        virtual void allocateListener();
 
-		virtual void shutdown();
+        virtual void shutdown();
 
-		void setInternalGain(F32 gain);
+        void setInternalGain(F32 gain);
 
-		LLAudioBuffer* createBuffer();
-		LLAudioChannel* createChannel();
+        LLAudioBuffer* createBuffer();
+        LLAudioChannel* createChannel();
 
-		/*virtual*/ bool initWind();
-		/*virtual*/ void cleanupWind();
-		/*virtual*/ void updateWind(LLVector3 direction, F32 camera_altitude);
+        /*virtual*/ bool initWind();
+        /*virtual*/ void cleanupWind();
+        /*virtual*/ void updateWind(LLVector3 direction, F32 camera_altitude);
 
-	private:
+    private:
         typedef S16 WIND_SAMPLE_T;
-    	LLWindGen<WIND_SAMPLE_T> *mWindGen;
-    	S16 *mWindBuf;
-    	U32 mWindBufFreq;
-    	U32 mWindBufSamples;
-    	U32 mWindBufBytes;
-    	ALuint mWindSource;
+        LLWindGen<WIND_SAMPLE_T> *mWindGen;
+        S16 *mWindBuf;
+        U32 mWindBufFreq;
+        U32 mWindBufSamples;
+        U32 mWindBufBytes;
+        ALuint mWindSource;
         int mNumEmptyWindALBuffers;
 
-    	static const int MAX_NUM_WIND_BUFFERS = 80;
-    	static const float WIND_BUFFER_SIZE_SEC; // 1/20th sec
+        static const int MAX_NUM_WIND_BUFFERS = 80;
+        static const float WIND_BUFFER_SIZE_SEC; // 1/20th sec
 };
 
 class LLAudioChannelOpenAL : public LLAudioChannel
 {
-	public:
-		LLAudioChannelOpenAL();
-		virtual ~LLAudioChannelOpenAL();
-	protected:
-		/*virtual*/ void play();
-		/*virtual*/ void playSynced(LLAudioChannel *channelp);
-		/*virtual*/ void cleanup();
-		/*virtual*/ bool isPlaying();
+    public:
+        LLAudioChannelOpenAL();
+        virtual ~LLAudioChannelOpenAL();
+    protected:
+        /*virtual*/ void play();
+        /*virtual*/ void playSynced(LLAudioChannel *channelp);
+        /*virtual*/ void cleanup();
+        /*virtual*/ bool isPlaying();
 
-		/*virtual*/ bool updateBuffer();
-		/*virtual*/ void update3DPosition();
-		/*virtual*/ void updateLoop();
+        /*virtual*/ bool updateBuffer();
+        /*virtual*/ void update3DPosition();
+        /*virtual*/ void updateLoop();
 
-		ALuint mALSource;
-	        ALint mLastSamplePos;
+        ALuint mALSource;
+            ALint mLastSamplePos;
 };
 
 class LLAudioBufferOpenAL : public LLAudioBuffer{
-	public:
-		LLAudioBufferOpenAL();
-		virtual ~LLAudioBufferOpenAL();
+    public:
+        LLAudioBufferOpenAL();
+        virtual ~LLAudioBufferOpenAL();
 
-		bool loadWAV(const std::string& filename);
-		U32 getLength();
+        bool loadWAV(const std::string& filename);
+        U32 getLength();
 
-		friend class LLAudioChannelOpenAL;
-	protected:
-		void cleanup();
-		ALuint getBuffer() {return mALBuffer;}
+        friend class LLAudioChannelOpenAL;
+    protected:
+        void cleanup();
+        ALuint getBuffer() {return mALBuffer;}
 
-		ALuint mALBuffer;
+        ALuint mALBuffer;
 };
 
 #endif